ccc 4 viikkoa sitten
vanhempi
commit
24795d7dfa

+ 3 - 0
lib_base/src/main/java/com/quyunshuo/sbm10/base/bean/Global.kt

@@ -1,5 +1,8 @@
 package com.quyunshuo.sbm10.base.bean
 
 object Global {
+    //全局变量
     var isNetWork: Boolean = false //自主检测里面来测试是否有网络
+
+    var isPreheatOpen:Boolean=false//是否需要开启预热
 }

+ 1 - 2
lib_base/src/main/java/com/quyunshuo/sbm10/base/mvvm/v/BaseFrameFragment.kt

@@ -3,7 +3,6 @@ package com.quyunshuo.sbm10.base.mvvm.v
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
@@ -50,7 +49,7 @@ abstract class BaseFrameFragment<VB : ViewBinding, VM : BaseViewModel> : Fragmen
         // ARouter 依赖注入
         ARouter.getInstance().inject(this)
         var className=javaClass.name
-        Log.d("backinfo","类名:"+className)
+        Log.d("backinfo","类名:"+className)//获取当前fragment
         // 根据子类是否有 RegisterEventBus 注解決定是否进行注册 EventBus
         if (javaClass.isAnnotationPresent(RegisterEventBus::class.java)) {
             mHaveRegisterEventBus = true

+ 0 - 1
lib_common/src/main/java/com/quyunshuo/sbm10/common/ui/BaseFragment.kt

@@ -29,7 +29,6 @@ abstract class BaseFragment<VB : ViewBinding, VM : BaseViewModel> : BaseFrameFra
         KeyUtils.init(activity, keyboardView!!)
         super.onViewCreated(view, savedInstanceState)
 
-
     }
 
     fun addAllKeyboardView(view: View?): KeyboardView {

+ 1 - 1
module_backstage/src/main/java/com/module/backstage/activity/setting/SettingActivity.kt

@@ -197,7 +197,7 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun event(messageEvent: VBoxMessage) {
-        XLogUtil.d(messageEvent.cmd + ":settingmessageEvent.data:" + messageEvent.data)
+//        XLogUtil.d(messageEvent.cmd + ":settingmessageEvent.data:" + messageEvent.data)
         Log.d(TAG, "settingdataevent0: " + messageEvent.data)
         Log.d(TAG, "settingdataevent1: " + messageEvent.data.length)
         val data = messageEvent.data.substring(2, 4)

+ 0 - 1
module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/MakeFragment.kt

@@ -308,7 +308,6 @@ class MakeFragment : BaseFragment<HomeFragmentMakeBinding, MakeFragmentVM>(), Li
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun event(messageEvent: VBoxMessage) {
-        XLogUtil.d(messageEvent.cmd + ":messageEvent.data:" + messageEvent.data)
         Log.d(TAG, messageEvent.cmd + "制作页面 :messageEvent.data:" + messageEvent.data)
         val getSign = messageEvent.data.substring(2, 4)
         when (getSign) {

+ 1 - 1
module_home/src/main/java/com/quyunshuo/module/home/service/GlobalService.kt

@@ -104,6 +104,7 @@ class GlobalService : LifecycleService() {
         observeLiveData(globalServiceViewModel.alarmType, ::getAlarmType)
         globalServiceViewModel.sendBackData()//心跳上传
 //        globalServiceViewModel.forceBackToApp()
+
     }
 
     private fun initIsSuccess(initIsSuccess: Boolean) {
@@ -393,7 +394,6 @@ class GlobalService : LifecycleService() {
                 mqttHelper.sendData("response", Gson().toJson(messageEvent.data))
                 Log.d(TAG, "event:MATERIAL ")
             }
-
         }
     }
 

+ 29 - 0
serialport-api/src/main/java/com/hboxs/serialport/sbc/thread/ThreadGlobalParam.kt

@@ -45,6 +45,15 @@ class ThreadGlobalParam: LifecycleObserver {
             field = value
         }
 
+    //读取后台数据
+    var jobPreheatOff: Job? = null
+        get() = field
+    var isActivePreheatOff: Boolean = true
+        get() = field
+        set(value) {
+            field = value
+        }
+
     fun startInit() {
         stopInit()
         isActiveSbcInit=true
@@ -84,6 +93,25 @@ class ThreadGlobalParam: LifecycleObserver {
         jobHeartbeat?.cancel()
     }
 
+    fun startPreheatOff() {
+        stopPreheatOff()
+        isActivePreheatOff=true
+        // 启动协程
+        jobPreheatOff = CoroutineScope(Dispatchers.Main).launch {
+            while (isActivePreheatOff) {
+                VboxSerialPortSendQueue.getInstance()
+                    .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO,
+                        VboxCommand.DEBUG_ID+"0500"))
+                // 执行定时任务的操作
+                Log.d(TAG, "start:startPreheatOff")
+                delay(1000) // 每隔1秒重复执行
+            }
+        }
+    }
+    fun stopPreheatOff() {
+        jobPreheatOff?.cancel()
+    }
+
     fun startBackData() {
         stopBackData()
         // 启动协程
@@ -107,5 +135,6 @@ class ThreadGlobalParam: LifecycleObserver {
         //避免线程池关不掉
         stopInit()
         stopHeartbeat()
+        stopPreheatOff()
     }
 }