调试配置改为普通机柜

app/src/main/java/com/grkj/iscs/activity/LoginActivity.kt

@@ -1,11 +1,14 @@
 package com.grkj.iscs.activity
 
 import android.content.Intent
+import com.grkj.iscs.BusinessManager
+import com.grkj.iscs.R
 import com.grkj.iscs.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityLoginBinding
 import com.grkj.iscs.dialog.CardLoginDialog
 import com.grkj.iscs.iview.ILoginView
 import com.grkj.iscs.presenter.LoginPresenter
+import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.passwordStyle
 
 class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginBinding>() {
@@ -32,11 +35,11 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
         }
 
         // TODO 只适配armeabi-v7a
-//        handleLoading(true, resources.getString(R.string.device_is_initializing))
-//        BusinessManager.connectDock(1, true)
-//        Executor.delayOnMain(2000) {
-//            handleLoading(false)
-//        }
+        handleLoading(true, resources.getString(R.string.device_is_initializing))
+        BusinessManager.connectDock(2, true)
+        Executor.delayOnMain(2000) {
+            handleLoading(false)
+        }
 
 
         cardLoginDialog = CardLoginDialog(this) {

app/src/main/java/com/grkj/iscs/activity/test/ModbusActivity.kt

@@ -17,7 +17,7 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
         get() = ActivityModbusBinding.inflate(layoutInflater)
 
     override fun initView() {
-        BusinessManager.connectDock(1)
+        BusinessManager.connectDock(2)
 
         BusinessManager.registerStatusListener(this) {
 

app/src/main/java/com/grkj/iscs/modbus/PortManager.kt

@@ -123,7 +123,7 @@ class PortManager private constructor(
         @WorkerThread
         fun openCtrlBord(ctx: Context) : PortManager? {
             // TODO 端口号待定：大屏调试设备-1，小屏调试设备-0
-            val port = 0
+            val port = 1
             val bps = 115200
             val usb = false
             LogUtil.i("主控板 port = ${port}, bps = ${bps}, usb = $usb")