1.加上部分Log

app/src/main/AndroidManifest.xml

@@ -74,10 +74,6 @@
             android:name=".main.person.LaboratoryPersonActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
-        <activity
-            android:name=".main.monitor.MonitorListActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-            android:exported="false" />
         <activity
             android:name=".home.lab_info.LabDetailActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -101,7 +97,8 @@
         <activity
             android:name=".HomeActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-            android:exported="false" />
+            android:exported="false"
+            android:hardwareAccelerated="true" />
         <activity
             android:name=".app.InitActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"

app/src/main/java/xn/xxp/HomeActivity.java

@@ -21,6 +21,7 @@ import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
 import com.kongzue.dialogx.dialogs.InputDialog;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -67,7 +68,9 @@ import xn.xxp.widget.NavViewCompat;
 import xn.xxp.widget.WaringDialog;
 
 public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> implements HomeFragmentCallback {
-    private final int MAX_UI_DEFAULT = 60;
+    private final int MAX_UI_DEFAULT = 60;// 中间UI恢复时间
+    private int defaultCdCount = 0;// 用户操作时间倒计时
+    //    private int loadWarnCdCount = 0;// 预案查询倒计时
     private DeviceConfigDao deviceConfigDao;
     private LabConfigDao labConfigDao;
     protected DeviceConfig deviceConfig;
@@ -77,7 +80,6 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
     private HomeActivityHelp help;
     private FragmentManager fragmentManager;
     private CountDownTimer defaultCd;
-    private int defaultCdCount = 0;
     protected PeopleFlipperAdapter personFlipperAdapter;
     protected PeopleFlipperAdapter experimentAdapter;
     protected PeopleFlipperAdapter accessAdapter;
@@ -93,6 +95,7 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
     @Override
     protected void initViews(Bundle savedInstanceState) {
         super.initViews(savedInstanceState);
+        EventBus.getDefault().register(this);
 
         // 值班人员
         personFlipperAdapter = new PeopleFlipperAdapter(1, personList);
@@ -139,7 +142,7 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
         homeBoardAdapter = new HomeBoardAdapter();
         binding.bulletinBoardView.setAdapter(homeBoardAdapter);
 
-        // 倒计时业务 恢复中间UI
+        // 倒计时业务
         defaultCd = new CountDownTimer(1000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
@@ -148,13 +151,21 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
 
             @Override
             public void onFinish() {
+                // Ui恢复间隔
                 if (defaultCdCount >= MAX_UI_DEFAULT) {
                     defaultCdCount = 0;
                     closePersonPanel();
                 } else {
-                    defaultCd.start();
                     defaultCdCount++;
                 }
+//                // 预案间隔
+//                if (loadWarnCdCount >= 10) {
+//                    loadWarnCdCount = 0;
+//                    help.queryWarnList();
+//                } else {
+//                    loadWarnCdCount++;
+//                }
+                defaultCd.start();
             }
         };
         defaultCd.start();
@@ -314,6 +325,7 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
     protected void onDestroy() {
         help.onDestroy();
         super.onDestroy();
+        EventBus.getDefault().unregister(this);
         MqttManager.Companion.getInstance().release();
         if (null != timeTickReceiver) {
             unregisterReceiver(timeTickReceiver);
@@ -344,6 +356,7 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
         homeBoardAdapter.updateSensorValue(event.getData());
     }
 
+
     private WaringDialog waringDialog;
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -369,7 +382,6 @@ public class HomeActivity extends BaseCountDownActivity<ActivityHomeBinding> imp
                     waringDialog.dismiss();
                 }
             }
-
             homeBoardAdapter.updateWaringValue(event.getData());
         }
     }

app/src/main/java/xn/xxp/HomeActivityHelp.java

@@ -5,6 +5,8 @@ import android.util.Log;
 
 import com.blankj.utilcode.util.LogUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,6 +18,7 @@ import http.vo.response.LabWarnVo;
 import io.reactivex.rxjava3.functions.Consumer;
 import xn.xxp.home.adapter.HomeBoardAdapter;
 import xn.xxp.app.LabApp;
+import xn.xxp.mqtt.event.WarningEvent;
 import xn.xxp.room.RoomTool;
 import xn.xxp.room.bean.NoticeSummary;
 import xn.xxp.room.dao.NoticeSummaryDao;
@@ -87,6 +90,20 @@ public class HomeActivityHelp {
         }));
     }
 
+    public void queryWarnList() {
+        activity.addDisposable(ApiRepository.INSTANCE.warnList(String.valueOf(activity.labConfig.getLabId())).subscribe(new Consumer<List<LabWarnVo>>() {
+            @Override
+            public void accept(List<LabWarnVo> labWarnVos) throws Throwable {
+                EventBus.getDefault().post(new WarningEvent(labWarnVos));
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Throwable {
+                LogUtils.e(Log.getStackTraceString(throwable));
+            }
+        }));
+    }
+
     /**
      * 查询通知消息
      */

app/src/main/java/xn/xxp/app/InitActivity.java

@@ -288,7 +288,7 @@ public class InitActivity extends BaseActivity<ActivityInitBinding> {
                 if (null != terminalAuthResp) {
                     if (terminalAuthResp.getCode() == 200) {
                         if (!TextUtils.isEmpty(terminalAuthResp.getData())) {
-                            LogUtils.d(terminalAuthResp.getData());
+                            LogUtils.d("鉴权", terminalAuthResp.getData());
                             deviceConfig.setTerminalAuth("Bearer " + terminalAuthResp.getData());
                             reTryCount = 0;
                             RoomTool.getInstance().deviceConfigDao().insert(deviceConfig);

app/src/main/java/xn/xxp/main/MainActivity.kt

@@ -39,6 +39,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import xn.xxp.R
@@ -132,11 +133,14 @@ class MainActivity :
         // 实验室文化图 > 文化图
         val message = mBannerHandler.obtainMessage(WHAT_WORKBENCH)
         mBannerHandler.sendMessageDelayed(message, BANNER_TIME_WORKBENCH)
+        EventBus.getDefault().register(this)
     }
 
+
     override fun onDestroy() {
         mBannerHandler.removeCallbacksAndMessages(null)
         super.onDestroy()
+        EventBus.getDefault().unregister(this)
     }
 
 

app/src/main/java/xn/xxp/main/things/ThingsActivity.kt

@@ -10,6 +10,7 @@ import core.ui.widget.decoration.GridSpacingItemDecoration
 import http.client.ApiRepository
 import http.vo.request.ControllerCMD
 import http.vo.response.LotDeviceVo
+import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import xn.xxp.R
@@ -48,6 +49,16 @@ open class ThingsActivity :
         queryControllerList()
     }
 
+    override fun onStart() {
+        super.onStart()
+        EventBus.getDefault().register(this)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+    }
+
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
         labConfig = RoomTool.getInstance().labConfigDao().labConfig

app/src/main/java/xn/xxp/mqtt/MqttManager.kt

@@ -166,7 +166,6 @@ class MqttManager private constructor() {
     private fun handleWarning() {
         val disposable = ApiRepository.warnList(labConfig.labId.toString())
             .subscribe({ data ->
-                LogUtils.json("预案", data)
                 EventBus.getDefault().post(WarningEvent(data))
             }, { throwable ->
                 throwable.printStackTrace()