删除冗余代码；补充部分TODO事项

app/src/main/AndroidManifest.xml

@@ -20,19 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ISCS"
         tools:targetApi="31" >
-        <activity
-            android:name=".activity.ModbusActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.BleActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.WebActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.ScreenAdaptActivity"
-            android:exported="false" />
-
         <meta-data
             android:name="design_width_in_dp"
             android:value="640" />
@@ -40,6 +27,13 @@
             android:name="design_height_in_dp"
             android:value="360" />
 
+        <activity
+            android:name=".activity.ModbusActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.BleActivity"
+            android:exported="false" />
+
         <activity
             android:name=".activity.MainActivity"
             android:exported="true" >

app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt

@@ -37,7 +37,6 @@ object BleCmdManager {
      */
     private fun assembleData(bleBean: BleBean, byteArray: ByteArray): ByteArray? {
         bleBean.token?.let {
-            // TODO 封装assembleTimeStamp
             return assembleTimeStamp(byteArray) + it
         } ?: run {
             // TODO 有问题，一直循环

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

@@ -59,13 +59,6 @@ object ModBusController {
                 interruptReadTrashBinStatus
             }, { res ->
 //                // Logger.d("ModbusController", "res: ${res.map { it.toHexString() }}")
-                LogUtil.i("haha : ModbusController : ${res.size} : $res")
-                res.forEach { data ->
-                    if (data.isNotEmpty()) {
-                        println("xixi : ${data.toHexStrings()}")
-                    }
-                }
-                println()
                 // 第 0 个字节是 从机地址，第 1 个字节是 功能码，第 2 个字节是 字节数
                 // 瓶类计数
                 val bottles = res.map { bytes ->

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

@@ -246,9 +246,7 @@ class ModBusManager(
         done: ((res: List<ByteArray>) -> Unit)?,
         resList: ArrayList<ByteArray>
     ) {
-        // TODO 临时禁止重发
-        sendTo(index, frame, false) { res ->
-//        sendTo(index, frame) { res ->
+        sendTo(index, frame) { res ->
             resList.add(res)
             if (index >= slaveCount - 1) {
                 // 已经发送完

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

@@ -123,7 +123,7 @@ class PortManager private constructor(
         @WorkerThread
         fun openCtrlBord(ctx: Context) : PortManager? {
             val port = 1
-            val bps = 9600
+            val bps = 115200
             val usb = false
             LogUtil.i("主控板 port = ${port}, bps = ${bps}, usb = $usb")
             return open(port, bps, usb)

app/src/main/java/com/grkj/iscs/presenter/ModBusPresenter.kt

@@ -7,7 +7,7 @@ import com.grkj.iscs.modbus.ModBusController
 class ModBusPresenter: BasePresenter<IModbusView>() {
 
     fun initModbus() {
-        ModBusController.setSlaveCount(4)
+        ModBusController.setSlaveCount(2)
         ModBusController.interruptReadTrashBinStatus(false)
         ModBusController.start(mContext!!)
         ModBusController.unregisterListener(mContext!!)

app/src/main/java/com/grkj/iscs/research/UnixTime.java

@@ -1,8 +0,0 @@
-package com.grkj.iscs.research;
-
-public class UnixTime {
-
-    public String getUnixTimeHexStr() {
-        return String.format("%02x", System.currentTimeMillis() / 1000);
-    }
-}

app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -34,7 +34,7 @@ class NetHttpManager {
             .addMsgConvertor(GsonMsgConvertor())
 //            .baseUrl("${UrlConsts.BASE_URL_PROD}$DEFAULT_DOMAIN")
 //            .baseUrl(Environment.baseUrl(ctx))
-            .baseUrl("http://192.168.1.2:48080")
+            .baseUrl("http://192.168.1.3:48080")
             .responseListener { task: HttpTask<*>?, result: HttpResult? ->
                 if (result?.status != 200) {
 //                    LogUtil.d(