version:5.1

fix:
update:更改天气闹钟等为竖屏

app/src/main/java/com/uiuios/aios/activity/GoodsActivity.java

@@ -3,10 +3,7 @@ package com.uiuios.aios.activity;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -15,11 +12,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.tabs.TabLayout;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.trello.rxlifecycle4.android.FragmentEvent;
 import com.uiuios.aios.R;
 import com.uiuios.aios.adapter.GoodsListAdapter;
 import com.uiuios.aios.base.BaseDataBindingActivity;
-import com.uiuios.aios.base.DataBindingActivity;
 import com.uiuios.aios.bean.BaseResponse;
 import com.uiuios.aios.bean.GoodsInfo;
 import com.uiuios.aios.bean.GoodsList;
@@ -30,14 +25,13 @@ import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-public class GoodsActivity extends DataBindingActivity {
+public class GoodsActivity extends BaseDataBindingActivity {
     private static final String TAG = GoodsActivity.class.getSimpleName();
 
     private ActivityGoodsBinding mBinding;
@@ -47,16 +41,37 @@ public class GoodsActivity extends DataBindingActivity {
 
     private HashMap<String, GoodsType> mGoodsTypeMap;
 
+    /**
+     * 设置布局
+     */
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_goods;
+    }
+
+    /**
+     * @return 是否是黑色状态栏
+     */
+    @Override
+    protected boolean setNightMode() {
+        return true;
+    }
+
+    @Override
+    protected boolean setfitWindow() {
+        return true;
+    }
+
     /**
      * 初始化视图
      */
     @Override
     public void initView() {
-        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_goods);
+        mBinding = DataBindingUtil.setContentView(this, getLayoutId());
         mBinding.setListener(new Listener());
-        UltimateBarX.statusBarOnly(this)
-                .transparent()
-                .apply();
+//        UltimateBarX.statusBarOnly(this)
+//                .transparent()
+//                .apply();
         UltimateBarX.addStatusBarTopPadding(mBinding.constraintLayout);
         mRecyclerView = mBinding.recyclerView;
         mGoodsAdapter = new GoodsListAdapter();
@@ -105,7 +120,7 @@ public class GoodsActivity extends DataBindingActivity {
     private void getGoodsType() {
         NetInterfaceManager.getInstance()
                 .getGoodsTypeListObservable()
-                .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+                .compose(RxLifecycle.bindUntilEvent(getLifecycleSubject(), ActivityEvent.DESTROY))
                 .subscribe(new Observer<BaseResponse<List<GoodsType>>>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
@@ -155,7 +170,7 @@ public class GoodsActivity extends DataBindingActivity {
     private void getAllGoods(int type) {
         NetInterfaceManager.getInstance()
                 .getGoodsListObservable(type)
-                .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+                .compose(RxLifecycle.bindUntilEvent(getLifecycleSubject(), ActivityEvent.DESTROY))
                 .subscribe(getGoodsListObservable());
     }
 
@@ -163,7 +178,7 @@ public class GoodsActivity extends DataBindingActivity {
     private void getAllGoods() {
         NetInterfaceManager.getInstance()
                 .getGoodsListObservable()
-                .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+                .compose(RxLifecycle.bindUntilEvent(getLifecycleSubject(), ActivityEvent.DESTROY))
                 .subscribe(getGoodsListObservable());
     }