version:3.6

fix:去点腾讯推送 update:去掉系统节点
2023-08-26 15:27:31 +08:00
parent 66171ac7e5
commit bf183a1dc2
116 changed files with 2566 additions and 1751 deletions
--- a/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
@@ -30,6 +30,7 @@ import com.uiuios.aios.disklrucache.CacheHelper;
 import com.uiuios.aios.gson.GsonUtils;
 import com.uiuios.aios.manager.ConnectManager;
 import com.uiuios.aios.manager.ConnectMode;
+import com.uiuios.aios.manager.RemoteManager;
 import com.uiuios.aios.network.api.ActivityListApi;
 import com.uiuios.aios.network.api.AlarmClockAddApi;
 import com.uiuios.aios.network.api.AlarmClockApi;
@@ -175,91 +176,91 @@ public class NetInterfaceManager {
     */
    public Observable<BaseResponse<SnInfo>> getsnInfoControl() {
        return mRetrofit.create(SNInfoApi.class)
-                .getsninfo(Utils.getSerial())
+                .getsninfo(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<UserAvatarInfo>> getUserAvatarInfoControl() {
        return mRetrofit.create(UserInfoControl.class)
-                .getUserAvatarInfo(Utils.getSerial())
+                .getUserAvatarInfo(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getRunningAppObservable(String json) {
        return mRetrofit.create(RunNewApp.class)
-                .sendRunningInfo(Utils.getSerial(), json)
+                .sendRunningInfo(RemoteManager.getInstance().getSerial(), json)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<SystemSettings>> getsettingControl() {
        return mRetrofit.create(Setting.class)
-                .getSetting(Utils.getSerial())
+                .getSetting(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getSOSRecordObservable(String longitude, String latitude, String address) {
        return mRetrofit.create(SOSRecordApi.class)
-                .sendSOSRecord(Utils.getSerial(), longitude, latitude, address)
+                .sendSOSRecord(RemoteManager.getInstance().getSerial(), longitude, latitude, address)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getUpdateAlarmObservable(int id) {
        return mRetrofit.create(UpdateAlarmClockApi.class)
-                .updateAlarm(Utils.getSerial(), id)
+                .updateAlarm(RemoteManager.getInstance().getSerial(), id)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getUpdateDesktopObservable(String jsonArray) {
        return mRetrofit.create(UpdateDesktopApi.class)
-                .updateLayout(Utils.getSerial(), jsonArray)
+                .updateLayout(RemoteManager.getInstance().getSerial(), jsonArray)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<List<NetDesktopIcon>>> getDesktopLayoutObservable() {
        return mRetrofit.create(GetDesktopApi.class)
-                .getDesktopLayout(Utils.getSerial())
+                .getDesktopLayout(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<List<GoodsInfo>>> getGoodsListObservable() {
        return mRetrofit.create(GoodsListApi.class)
-                .getGoodsList(Utils.getSerial())
+                .getGoodsList(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<List<ArticleInfo>>> getArticleListObservable() {
        return mRetrofit.create(ArticleListApi.class)
-                .getArticleList(Utils.getSerial())
+                .getArticleList(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse<List<Contact>>> getContactListObservable() {
        return mRetrofit.create(GetMailList.class)
-                .getContact(Utils.getSerial())
+                .getContact(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getAdminSnSettingObservable() {
        return mRetrofit.create(GetAdminSnSettingApi.class)
-                .getAdminSnSetting(Utils.getSerial())
+                .getAdminSnSetting(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> getUpdateAppIconObservable(String pkg, String label, int type) {
        return mRetrofit.create(UpdateAppIconApi.class)
-                .appIconUpdate(Utils.getSerial(), pkg, type, label)
+                .appIconUpdate(RemoteManager.getInstance().getSerial(), pkg, type, label)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -278,7 +279,7 @@ public class NetInterfaceManager {
    public Observable<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable() {
        return mRetrofit
                .create(AlarmClockApi.class)
-                .getAlarmClockApiApi(Utils.getSerial())
+                .getAlarmClockApiApi(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -299,14 +300,14 @@ public class NetInterfaceManager {

    public Observable<BaseResponse<AlarmClockData>> getAlarmClockByIdObservable(int id) {
        return mRetrofit.create(AlarmClockQueryApi.class)
-                .getAlarmClockById(Utils.getSerial(), id)
+                .getAlarmClockById(RemoteManager.getInstance().getSerial(), id)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public Observable<BaseResponse> deleteAlarmClockObservable(int id) {
        return mRetrofit.create(AlarmClockDeleteApi.class)
-                .alarmClockDelete(Utils.getSerial(), id)
+                .alarmClockDelete(RemoteManager.getInstance().getSerial(), id)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -317,7 +318,7 @@ public class NetInterfaceManager {

    public Observable<BaseResponse<UserId>> getUserIDObservable() {
        return mRetrofit.create(GetUserIDApi.class)
-                .getUserID(Utils.getSerial())
+                .getUserID(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -384,7 +385,7 @@ public class NetInterfaceManager {

    public Observable<BaseResponse<List<ActivityBean>>> getActivityListObservable() {
        return mRetrofit.create(ActivityListApi.class)
-                .getActivityList(Utils.getSerial(), 1, 1, getUserId())
+                .getActivityList(RemoteManager.getInstance().getSerial(), 1, 1, getUserId())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -494,7 +495,7 @@ public class NetInterfaceManager {

    public Observable<BaseResponse<List<DemandBean>>> getDemandListObservable() {
        return mRetrofit.create(DemandListApi.class)
-                .getDemandList(Utils.getSerial(), 1, 1, getUserId())
+                .getDemandList(RemoteManager.getInstance().getSerial(), 1, 1, getUserId())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -614,7 +615,7 @@ public class NetInterfaceManager {

    public Observable<BaseResponse<List<HealthCode>>> getHealthCodeObservable() {
        return mRetrofit.create(HealthCodeApi.class)
-                .getArticleDetails(Utils.getSerial())
+                .getArticleDetails(RemoteManager.getInstance().getSerial())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
@@ -1134,5 +1135,78 @@ public class NetInterfaceManager {
        };
    }

+    public interface UserAvatarInfoCallback {
+        void setUserAvatarInfo(UserAvatarInfo info);
+    }

+//    public void getUserAvatarInfo(boolean refresh, BehaviorSubject<FragmentEvent> lifecycle, UserAvatarInfoCallback callback) {
+//        ConnectMode connectMode = ConnectMode.ONE_MINUTE;
+//        if (refresh) {
+//            connectMode = ConnectMode.DEFAULT;
+//        }
+//        if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_USER_AVATAR_INFO, connectMode)) {
+//            getUserAvatarInfo(lifecycle, callback);
+//        } else {
+//            String jsonString = mCacheHelper.getAsString(UrlAddress.GET_USER_AVATAR_INFO);
+//            //为 "" 是已经请求成功的
+//            if (jsonString == null) {
+//                getUserAvatarInfo(lifecycle, callback);
+//            } else {
+//                Gson gson = new Gson();
+//                Type type = new TypeToken<UserAvatarInfo>() {
+//                }.getType();
+//                UserAvatarInfo userAvatarInfo = gson.fromJson(jsonString, type);
+//                if (callback != null) {
+//                    callback.setUserAvatarInfo(userAvatarInfo);
+//                }
+//            }
+//        }
+//    }
+
+    public void getUserAvatarInfo(BehaviorSubject<FragmentEvent> lifecycle, UserAvatarInfoCallback callback) {
+        getUserAvatarInfoControl()
+                .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
+                .subscribe(getUserAvatarInfoObserver(callback));
+    }
+
+    public void getUserAvatarInfo(UserAvatarInfoCallback callback) {
+        getUserAvatarInfoControl()
+                .subscribe(getUserAvatarInfoObserver(callback));
+    }
+
+    public void getUserAvatarInfo() {
+        getUserAvatarInfoControl()
+                .subscribe(getUserAvatarInfoObserver(null));
+    }
+
+    public Observer<BaseResponse<UserAvatarInfo>> getUserAvatarInfoObserver(UserAvatarInfoCallback callback) {
+        return new Observer<BaseResponse<UserAvatarInfo>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                Log.e("getUserAvatarInfoControl", "onSubscribe: ");
+            }
+
+            @Override
+            public void onNext(@NonNull BaseResponse<UserAvatarInfo> userAvatarInfoBaseResponse) {
+                Log.e("getUserAvatarInfoControl", "onNext: " + userAvatarInfoBaseResponse);
+                if (callback != null) {
+                    callback.setUserAvatarInfo(userAvatarInfoBaseResponse.data);
+                }
+            }
+
+            @Override
+            public void onError(@NonNull Throwable e) {
+                Log.e("getUserAvatarInfoControl", "onError: " + e.getMessage());
+                if (callback != null) {
+                    callback.setUserAvatarInfo(null);
+                }
+                onComplete();
+            }
+
+            @Override
+            public void onComplete() {
+                Log.e("getUserAvatarInfoControl", "onComplete: ");
+            }
+        };
+    }
 }
--- a/app/src/main/java/com/uiuios/aios/network/interceptor/RepeatRequestInterceptor.java
+++ b/app/src/main/java/com/uiuios/aios/network/interceptor/RepeatRequestInterceptor.java
@@ -39,7 +39,11 @@ public class RepeatRequestInterceptor implements Interceptor {
 //        Response copy = response.newBuilder().body(responseBody).build();
        ResponseBody copy = ResponseBody.create(responseBody.contentType(), content);
        if (BuildConfig.DEBUG) {
-//            Log.e(TAG, "请求体返回：| Response: " + request.url().encodedPath() + "\t body: " + content);
+            if (content.length() < 1024) {
+                Log.e(TAG, "请求体返回：| Response: " + request.url() + "\t body: " + content);
+            }else {
+                Log.e(TAG, "请求体返回：| Response: " + request.url() + "\t body: too long" );
+            }
        }
        //相同的请求
        String requestKey = MD5Util.getUpperMD5Str(request.method() + request.url().toString() + requestBodyToString(request.body()));
@@ -83,7 +87,7 @@ public class RepeatRequestInterceptor implements Interceptor {
            final Request copy = request.newBuilder().build();
            final Buffer buffer = new Buffer();
            copy.body().writeTo(buffer);
-            if (buffer.size() > 4096) {
+            if (buffer.size() > 1024) {
                return "-too long";
            }
            return buffer.readUtf8();
@@ -96,7 +100,7 @@ public class RepeatRequestInterceptor implements Interceptor {
        try {
            final Buffer buffer = new Buffer();
            body.writeTo(buffer);
-            if (buffer.size() > 4096) {
+            if (buffer.size() > 1024) {
                return "-too long";
            }
            return buffer.readUtf8();