1.4.0509 增加mvvm，修改主页

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

@@ -3,39 +3,22 @@ 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.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;
 
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.subjects.BehaviorSubject;
+public abstract class BaseActivity extends BaseRxActivity {
 
-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);
-        lifecycleSubject.onNext(ActivityEvent.CREATE);
-        setBar();
-        //状态栏改变放在setContentView前后有所不同
-        setContentView(this.getLayoutId());
-        initView();
-        initData();
+    public BaseActivity() {
+        super();
     }
 
-    private void setBar() {
+    @Override
+    @CallSuper
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+//        StatusBarUtil.init(this);
         UltimateBarX.statusBar(this)
                 .transparent()
                 .colorRes(R.color.colorPrimaryDark)
@@ -51,82 +34,5 @@ public abstract class BaseActivity extends AppCompatActivity implements Lifecycl
     /**
      * 设置布局
      */
-    public abstract int getLayoutId();
-
-    /**
-     * 初始化视图
-     */
-    public abstract void initView();
-
-
-    /**
-     * 初始化数据
-     */
-    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();
-    }
-}
+    protected abstract int getLayoutId();
+}