Преглед изворни кода

升级okhttps:4.0.3->4.1.0;测试模式下,拿走钥匙不进行重连,且退出时候不改变模式,防止拿走钥匙不关机导致超距离断连

Frankensteinly пре 8 месеци
родитељ
комит
855623988d

+ 7 - 0
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -100,6 +100,9 @@ object BusinessManager {
     // 设备待取列表(需要报给后台的列表,等实际取完再上报)
     val mDeviceTakeList = mutableListOf<DeviceTakeUpdateBO>()
 
+    // 是否是测试人员登录的
+    var isTestMode = false
+
     /**
      * 初始化消息总线
      */
@@ -656,6 +659,10 @@ object BusinessManager {
                         unregisterConnectListener(itMac)
                     }
                     if (!isActiveDisConnected) {
+                        // 测试模式下不重连
+                        if (isTestMode) {
+                            return
+                        }
                         // 断开和重连之间最好间隔一段时间,否则可能会出现长时间连接不上的情况
                         Executor.delayOnMain(300) {
                             registerConnectListener(bleDevice.mac)

+ 4 - 0
app/src/main/java/com/grkj/iscs/view/activity/HomeActivity.kt

@@ -4,6 +4,7 @@ import android.view.InputDevice
 import android.view.KeyEvent
 import android.widget.ImageView
 import androidx.lifecycle.MutableLiveData
+import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityHomeBinding
 import com.grkj.iscs.extentions.toByteArrays
@@ -44,6 +45,8 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
         presenter?.registerStatusListener()
 
         val userInfo = intent.getSerializableExtra("userInfo")
+
+        BusinessManager.isTestMode = false
         if (userInfo != null && (userInfo as UserInfoRespVO).roles != null) {
             if (userInfo.roles?.any { it == USER_ROLE_DRAWER || it == USER_ROLE_LOCKER || it == USER_ROLE_COLOCKER || it == USER_ROLE_GUARD } == true) {
                 mMenuList.addAll(mutableListOf(
@@ -51,6 +54,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
                 ))
             }
             if (userInfo.roles?.any { it == USER_ROLE_ADMHDWTESTER } == true) {
+                BusinessManager.isTestMode = true
                 mMenuList.add(Menu(getString(R.string.test), R.mipmap.menu_icon_test, DockTestFragment()))
             }
             if (userInfo.roles?.any { it == USER_ROLE_ADMHDWSETTER } == true) {

+ 1 - 1
gradle/libs.versions.toml

@@ -10,7 +10,7 @@ material = "1.10.0"
 activity = "1.8.0"
 constraintlayout = "2.1.4"
 mvvmhabit = "4.0.0"
-okhttps = "4.0.3"
+okhttps = "4.1.0"
 log-interceptor = "3.14.9"
 autosize = "v1.2.1"
 fastble = "2.4.0"