version:2.6

fix:更新retrofit,优化请求次数
update:

app/src/main/java/com/aoleyun/sn/base/BaseActivity.java

@@ -2,13 +2,28 @@ package com.aoleyun.sn.base;
 
 import android.os.Bundle;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.CheckResult;
+import androidx.annotation.ContentView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.aoleyun.sn.R;
-import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
+import com.trello.rxlifecycle4.LifecycleProvider;
+import com.trello.rxlifecycle4.LifecycleTransformer;
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
 import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
-public abstract class BaseActivity extends RxAppCompatActivity {
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public abstract class BaseActivity extends AppCompatActivity implements LifecycleProvider<ActivityEvent> {
+    public final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,11 +47,6 @@ public abstract class BaseActivity extends RxAppCompatActivity {
                 .apply();
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
     /**
      * 设置布局
      */
@@ -52,4 +62,70 @@ public abstract class BaseActivity extends RxAppCompatActivity {
      * 初始化数据
      */
     public abstract void initData();
+
+
+    public BaseActivity() {
+        super();
+    }
+
+    @ContentView
+    public BaseActivity(@LayoutRes int contentLayoutId) {
+        super(contentLayoutId);
+    }
+
+    @Override
+    @NonNull
+    @CheckResult
+    public final Observable<ActivityEvent> lifecycle() {
+        return lifecycleSubject.hide();
+    }
+
+    @Override
+    @NonNull
+    @CheckResult
+    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ActivityEvent event) {
+        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
+    }
+
+    @Override
+    @NonNull
+    @CheckResult
+    public final <T> LifecycleTransformer<T> bindToLifecycle() {
+        return RxLifecycleAndroid.bindActivity(lifecycleSubject);
+    }
+
+    @Override
+    @CallSuper
+    protected void onStart() {
+        super.onStart();
+        lifecycleSubject.onNext(ActivityEvent.START);
+    }
+
+    @Override
+    @CallSuper
+    protected void onResume() {
+        super.onResume();
+        lifecycleSubject.onNext(ActivityEvent.RESUME);
+    }
+
+    @Override
+    @CallSuper
+    protected void onPause() {
+        lifecycleSubject.onNext(ActivityEvent.PAUSE);
+        super.onPause();
+    }
+
+    @Override
+    @CallSuper
+    protected void onStop() {
+        lifecycleSubject.onNext(ActivityEvent.STOP);
+        super.onStop();
+    }
+
+    @Override
+    @CallSuper
+    protected void onDestroy() {
+        lifecycleSubject.onNext(ActivityEvent.DESTROY);
+        super.onDestroy();
+    }
 }

app/src/main/java/com/aoleyun/sn/base/BaseApplication.java

@@ -11,17 +11,15 @@ import androidx.multidex.MultiDexApplication;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.rlog.LogDBManager;
-import com.aoleyun.sn.utils.WiFiUtils;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadEntity;
 import com.aoleyun.sn.BuildConfig;
+import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.manager.AmapManager;
+import com.aoleyun.sn.manager.ConnectManager;
 import com.aoleyun.sn.manager.FileManager;
-import com.aoleyun.sn.network.NetInterfaceManager;
 import com.aoleyun.sn.network.HTTPInterface;
+import com.aoleyun.sn.network.NetInterfaceManager;
 import com.aoleyun.sn.network.UrlAddress;
+import com.aoleyun.sn.rlog.LogDBManager;
 import com.aoleyun.sn.statistics.AppInformation;
 import com.aoleyun.sn.statistics.StatisticsInfo;
 import com.aoleyun.sn.utils.ApkUtils;
@@ -29,7 +27,10 @@ import com.aoleyun.sn.utils.JGYUtils;
 import com.aoleyun.sn.utils.SystemUtils;
 import com.aoleyun.sn.utils.ToastUtil;
 import com.aoleyun.sn.utils.Utils;
+import com.aoleyun.sn.utils.WiFiUtils;
 import com.aoleyun.sn.utils.XAPKUtils;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadEntity;
 import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGPushConfig;
 import com.tencent.android.tpush.XGPushManager;
@@ -42,13 +43,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
@@ -97,6 +98,7 @@ public class BaseApplication extends MultiDexApplication {
         XAPKUtils.init(this);
         LogDBManager.init(this);
         FileManager.init(this);
+        ConnectManager.init(this);
         AmapManager.init(this);
         AmapManager.getInstance().initAmap();