部分Simple Demo临时修改

app/build.gradle

@@ -113,4 +113,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
 
     implementation 'com.github.getActivity:XXPermissions:20.0'
+
+    implementation 'com.umeng.umsdk:common:9.4.4' //（必选）
+    implementation 'com.umeng.umsdk:asms:1.4.1' // asms包依赖(必选)
+    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选)
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <!--  蓝牙  -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -40,11 +41,6 @@
             android:launchMode="singleTask"
             android:exported="true" >
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".activity.test.ProcessDemoActivity"
@@ -108,6 +104,12 @@
         <activity
             android:name=".activity.MainActivity"
             android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
     </application>
 

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -447,12 +447,12 @@ object BusinessManager {
                     }
                     println("onDisConnected : $isActiveDisConnected - ${device?.mac}")
                     // 断开和重连之间最好间隔一段时间，否则可能会出现长时间连接不上的情况
-                    if (!isActiveDisConnected && device != null) {
-                        Executor.delayOnMain(300) {
-                            BleUtil.instance?.notConnectedList?.add(device.mac)
-                            ModBusController.connectKey()
-                        }
-                    }
+//                    if (!isActiveDisConnected && device != null) {
+//                        Executor.delayOnMain(300) {
+//                            BleUtil.instance?.notConnectedList?.add(device.mac)
+//                            ModBusController.connectKey()
+//                        }
+//                    }
                 }
             })
     }

app/src/main/java/com/grkj/iscs/MyApplication.kt

@@ -10,6 +10,7 @@ import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.NetHttpManager
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.log.LogUtil
+import com.umeng.commonsdk.UMConfigure
 
 class MyApplication : Application() {
 
@@ -23,7 +24,9 @@ class MyApplication : Application() {
         LogUtil.init(instance!!, FileUtil.ROOT_APP + FileUtil.LOG_DIR)
         BleUtil.instance?.initBle(this)
         NetHttpManager.getInstance().initCtx(this)
+        BusinessManager.registerMainListener()
         Token.clear(this)
+        UMConfigure.init(this, "678a82708f232a05f1fcf402", "Umeng", UMConfigure.DEVICE_TYPE_PHONE, "");
         // TODO 方便调试，待删除
 //        NetApi.login("admin", "grkj8888") {}
     }

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

@@ -19,53 +19,53 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         get() = ActivityMainBinding.inflate(layoutInflater)
 
     override fun initView() {
-        mBinding?.ble?.setOnClickListener {
-            startActivity(Intent(this, BleActivity::class.java))
-        }
+//        mBinding?.ble?.setOnClickListener {
+//            startActivity(Intent(this, BleActivity::class.java))
+//        }
 
         mBinding?.modbus?.setOnClickListener {
             startActivity(Intent(this, ModbusActivity::class.java))
         }
 
-        mBinding?.websocket?.setOnClickListener {
-            startActivity(Intent(this, WebSocketActivity::class.java))
-        }
-
-        mBinding?.rfid?.setOnClickListener {
-            startActivity(Intent(this, RfidActivity::class.java))
-        }
-
-        mBinding?.auth?.setOnClickListener {
-            startActivity(Intent(this, AuthActivity::class.java))
-        }
-
-        mBinding?.home?.setOnClickListener {
-            startActivity(Intent(this, HomeActivity::class.java))
-        }
-
-        mBinding?.sop?.setOnClickListener {
-            startActivity(Intent(this, SopActivity::class.java))
-        }
-
-        mBinding?.presentation?.setOnClickListener {
-            startActivity(Intent(this, PresentationActivity::class.java))
-        }
-
-        mBinding?.presentationLogin?.setOnClickListener {
-            startActivity(Intent(this, PresentationLoginActivity::class.java))
-        }
-
-        mBinding?.login?.setOnClickListener {
-            startActivity(Intent(this, LoginActivity::class.java))
-        }
-
-        mBinding?.createTicket?.setOnClickListener {
-            startActivity(Intent(this, CreateTicketActivity::class.java))
-        }
-
-        mBinding?.processDemo?.setOnClickListener {
-            startActivity(Intent(this, ProcessDemoActivity::class.java))
-        }
+//        mBinding?.websocket?.setOnClickListener {
+//            startActivity(Intent(this, WebSocketActivity::class.java))
+//        }
+//
+//        mBinding?.rfid?.setOnClickListener {
+//            startActivity(Intent(this, RfidActivity::class.java))
+//        }
+//
+//        mBinding?.auth?.setOnClickListener {
+//            startActivity(Intent(this, AuthActivity::class.java))
+//        }
+//
+//        mBinding?.home?.setOnClickListener {
+//            startActivity(Intent(this, HomeActivity::class.java))
+//        }
+//
+//        mBinding?.sop?.setOnClickListener {
+//            startActivity(Intent(this, SopActivity::class.java))
+//        }
+//
+//        mBinding?.presentation?.setOnClickListener {
+//            startActivity(Intent(this, PresentationActivity::class.java))
+//        }
+//
+//        mBinding?.presentationLogin?.setOnClickListener {
+//            startActivity(Intent(this, PresentationLoginActivity::class.java))
+//        }
+//
+//        mBinding?.login?.setOnClickListener {
+//            startActivity(Intent(this, LoginActivity::class.java))
+//        }
+//
+//        mBinding?.createTicket?.setOnClickListener {
+//            startActivity(Intent(this, CreateTicketActivity::class.java))
+//        }
+//
+//        mBinding?.processDemo?.setOnClickListener {
+//            startActivity(Intent(this, ProcessDemoActivity::class.java))
+//        }
 
         mBinding?.simpleDemo?.setOnClickListener {
             startActivity(Intent(this, SimpleLoginActivity::class.java))

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

@@ -3,10 +3,13 @@ package com.grkj.iscs.activity.test
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityModbusBinding
+import com.grkj.iscs.extentions.debounce
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.iview.IModbusView
 import com.grkj.iscs.modbus.ModBusController
+import com.grkj.iscs.modbus.ModBusController.controlKeyBuckle
+import com.grkj.iscs.modbus.ModBusController.controlLockBuckle
 import com.grkj.iscs.presenter.ModBusPresenter
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
@@ -23,9 +26,9 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
 
         }
 
-        mBinding?.init?.setOnClickListener {
-            ModBusController.initDevicesStatus()
-        }
+//        mBinding?.init?.setOnClickListener {
+//            ModBusController.initDevicesStatus()
+//        }
 
         mBinding?.keyBuckleStatus?.setOnClickListener {
             BusinessManager.readKeyBuckleStatus()
@@ -35,9 +38,9 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
             BusinessManager.readLockBuckleStatus()
         }
 
-        mBinding?.deviceType?.setOnClickListener {
-            ModBusController.updateDeviceType()
-        }
+//        mBinding?.deviceType?.setOnClickListener {
+//            ModBusController.updateDeviceType()
+//        }
 
         mBinding?.openLockBuckle?.setOnClickListener {
             if (mBinding?.slaveIdx?.text.toString().isEmpty()) {
@@ -133,20 +136,54 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
             }
         }
 
-        mBinding?.closeAllLockBuckles?.setOnClickListener {
-            ModBusController.controlAllLockBuckles(false)
+        mBinding?.closeAllLockBuckles?.debounce(2000) {
+//            ModBusController.controlAllLockBuckles(false)
+
+            for (i in 0..9) {
+                controlLockBuckle(false, 1 - 1, i) {
+                    LogUtil.i("关闭所有锁卡扣 : ${it.toHexStrings()}")
+                }
+            }
         }
 
-        mBinding?.openAllLockBuckles?.setOnClickListener {
-            ModBusController.controlAllLockBuckles(true)
+        mBinding?.openAllLockBuckles?.debounce(2000) {
+//            ModBusController.controlAllLockBuckles(true)
+            for (i in 0..9) {
+                controlLockBuckle(true, 1 - 1, i) {
+                    LogUtil.i("关闭所有锁卡扣 : ${it.toHexStrings()}")
+                }
+            }
         }
 
-        mBinding?.closeAllKeyBuckles?.setOnClickListener {
-            ModBusController.controlAllKeyBuckles(false)
+        mBinding?.closeAllKeyBuckles?.debounce(2000) {
+//            ModBusController.controlAllKeyBuckles(false)
+            controlKeyBuckle(false, true, 2 - 1) {
+                LogUtil.i("关闭所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(false, false, 2 - 1) {
+                LogUtil.i("关闭所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(false, true, 3 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(false, false, 3 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
         }
 
-        mBinding?.openAllKeyBuckles?.setOnClickListener {
-            ModBusController.controlAllKeyBuckles(true)
+        mBinding?.openAllKeyBuckles?.debounce(2000) {
+            controlKeyBuckle(true, true, 2 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(true, false, 2 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(true, true, 3 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
+            controlKeyBuckle(true, false, 3 - 1) {
+                LogUtil.i("开启所有钥匙卡扣 : ${it.toHexStrings()}")
+            }
         }
 
         mBinding?.deviceList?.setOnClickListener {

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

@@ -23,6 +23,7 @@ class DockBean(
     var deviceList: MutableList<DeviceBean>
 ) {
 
+
     fun parseStatus(byteArray: ByteArray): DockBean? {
         if (byteArray.isEmpty()) {
             return null
@@ -208,6 +209,10 @@ class DockBean(
         return sb.toString()
     }
 
+    override fun toString(): String {
+        return "DockBean(addr=$addr, type=$type, deviceList=$deviceList)"
+    }
+
 
     /**
      * 通用设备信息Bean

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

@@ -220,7 +220,9 @@ object ModBusController {
                 val mac = BleUtil.instance?.notConnectedList?.get(0)
                 println("haha1 : $mac")
                 BusinessManager.prepareBle(mac!!, ActivityUtils.currentActivity() as BaseActivity<*>, { b,s,_ ->
-                    (ActivityUtils.currentActivity() as BaseActivity<*>).handleLoading(b, s)
+                    Executor.runOnMain {
+                        (ActivityUtils.currentActivity() as BaseActivity<*>).handleLoading(b, s)
+                    }
                 }) { isDone, bleBean ->
                     Executor.runOnMain {
                         if (BleUtil.instance!!.deviceList.any { it.bleDevice.mac == mac }) {

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

@@ -10,9 +10,6 @@ import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
-import com.hjq.permissions.OnPermissionCallback
-import com.hjq.permissions.Permission
-import com.hjq.permissions.XXPermissions
 import pub.devrel.easypermissions.EasyPermissions
 import java.text.SimpleDateFormat
 import java.util.Locale

app/src/main/res/layout/activity_main.xml

@@ -9,151 +9,171 @@
     android:gravity="center"
     tools:context=".activity.MainActivity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-        <Button
-            android:id="@+id/ble"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="BLE"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+    <Button
+        android:id="@+id/modbus"
+        android:layout_width="80dp"
+        android:layout_height="50dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="ModBus"
+        android:textSize="10sp"
+        android:layout_margin="5dp"/>
 
-        <Button
-            android:id="@+id/modbus"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="ModBus"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+    <Button
+        android:id="@+id/simple_demo"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="Simple Demo"
+        android:textSize="10sp"
+        android:layout_margin="5dp"/>
 
-        <Button
-            android:id="@+id/websocket"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="WebSocket"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:gravity="center">-->
+<!--        <Button-->
+<!--            android:id="@+id/ble"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="BLE"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/rfid"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="RFID"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/modbus"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="ModBus"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/auth"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Auth Page"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/websocket"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="WebSocket"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/home"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="HomePage"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/rfid"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="RFID"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/sop"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="SOP"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
-    </LinearLayout>
+<!--        <Button-->
+<!--            android:id="@+id/auth"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Auth Page"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-        <Button
-            android:id="@+id/presentation"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Presentation"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/home"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="HomePage"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/presentation_login"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Presentation Login"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/sop"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="SOP"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
+<!--    </LinearLayout>-->
 
-        <Button
-            android:id="@+id/process_demo"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Process Demo"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:gravity="center">-->
+<!--        <Button-->
+<!--            android:id="@+id/presentation"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Presentation"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/simple_demo"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Simple Demo"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
-    </LinearLayout>
+<!--        <Button-->
+<!--            android:id="@+id/presentation_login"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Presentation Login"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-        <Button
-            android:id="@+id/login"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Login"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/process_demo"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Process Demo"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/create_ticket"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Create Ticket"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
-    </LinearLayout>
+<!--        <Button-->
+<!--            android:id="@+id/simple_demo"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Simple Demo"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
+<!--    </LinearLayout>-->
+
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:gravity="center">-->
+<!--        <Button-->
+<!--            android:id="@+id/login"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Login"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
+
+<!--        <Button-->
+<!--            android:id="@+id/create_ticket"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Create Ticket"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
+<!--    </LinearLayout>-->
 </LinearLayout>

app/src/main/res/layout/activity_modbus.xml

@@ -24,31 +24,32 @@
             android:textSize="10sp"
             android:layout_margin="5dp"/>
 
-        <Button
-            android:id="@+id/init"
-            android:layout_width="100dp"
-            android:layout_height="40dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Init"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/init"-->
+<!--            android:layout_width="100dp"-->
+<!--            android:layout_height="40dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Init"-->
+<!--            android:textSize="10sp"-->
+<!--            android:layout_margin="5dp"/>-->
 
-        <Button
-            android:id="@+id/deviceType"
-            android:layout_width="100dp"
-            android:layout_height="40dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Device Type"
-            android:textSize="8sp"
-            android:layout_margin="5dp"/>
+<!--        <Button-->
+<!--            android:id="@+id/deviceType"-->
+<!--            android:layout_width="100dp"-->
+<!--            android:layout_height="40dp"-->
+<!--            android:minWidth="0dp"-->
+<!--            android:minHeight="0dp"-->
+<!--            android:text="Device Type"-->
+<!--            android:textSize="8sp"-->
+<!--            android:layout_margin="5dp"/>-->
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
         <Button
             android:id="@+id/keyBuckleStatus"
             android:layout_width="100dp"
@@ -84,7 +85,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:visibility="gone">
 
         <EditText
             android:id="@+id/slaveIdx"
@@ -144,7 +146,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:visibility="gone">
 
         <EditText
             android:id="@+id/leftLight"
@@ -253,6 +256,7 @@
             android:minHeight="0dp"
             android:text="Print Device List"
             android:textSize="8sp"
-            android:layout_margin="5dp"/>
+            android:layout_margin="5dp"
+            android:visibility="gone"/>
     </LinearLayout>
 </LinearLayout>