删除冗余代码

app/src/main/AndroidManifest.xml

@@ -20,9 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ISCS"
         tools:targetApi="31" >
-        <activity
-            android:name=".activity.CmdActivity"
-            android:exported="false" />
         <activity
             android:name=".activity.ModbusActivity"
             android:exported="false" />

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

@@ -5,6 +5,7 @@ import android.content.Context
 import androidx.multidex.MultiDex
 import com.grkj.iscs.ble.BleUtil
 import com.grkj.iscs.util.FileUtil
+import com.grkj.iscs.util.NetHttpManager
 import com.grkj.iscs.util.log.LogUtil
 
 class MyApplication : Application() {
@@ -18,6 +19,7 @@ class MyApplication : Application() {
         instance = this
         LogUtil.init(instance!!, FileUtil.ROOT_APP + FileUtil.LOG_DIR)
         BleUtil.instance?.initBle(this)
+        NetHttpManager.getInstance().initCtx(this)
     }
 
     override fun attachBaseContext(base: Context?) {

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

@@ -1,128 +0,0 @@
-package com.grkj.iscs.activity
-
-import com.clj.fastble.data.BleDevice
-import com.clj.fastble.exception.BleException
-import com.grkj.iscs.CustomBleIndicateCallback
-import com.grkj.iscs.CustomBleWriteCallback
-import com.grkj.iscs.databinding.ActivityCmdBinding
-import com.grkj.iscs.ble.BleCmdManager
-import com.grkj.iscs.ble.BleUtil
-
-class CmdActivity : BaseBindingActivity<ActivityCmdBinding>() {
-
-    private var bleDevice: BleDevice? = null
-
-    override val viewBinding: ActivityCmdBinding
-        get() = ActivityCmdBinding.inflate(layoutInflater)
-
-    override fun initView() {
-        bleDevice = intent.getParcelableExtra("device")
-
-        mBinding?.exit?.setOnClickListener { finish() }
-
-        mBinding?.indicate?.setOnClickListener {
-            BleUtil.instance?.getBleDeviceByMac(bleDevice?.mac)?.let {
-                BleUtil.instance?.indicate(it.bleDevice, indicateCallback = object : CustomBleIndicateCallback() {
-                    override fun onPrompt(promptStr: String?) {}
-
-                    override fun onConnectPrompt(promptStr: String?) {}
-
-                    override fun onDisConnectPrompt(promptStr: String?) {}
-
-                    override fun onIndicateSuccess() {
-                        println("监听成功")
-                    }
-
-                    override fun onIndicateFailure(exception: BleException?) {
-                        println("监听失败")
-                    }
-
-                    override fun onCharacteristicChanged(data: ByteArray?) {
-                        println("******************* : ${data?.toList()}")
-                        data?.let { itData ->
-                            BleCmdManager.handleRsp(it, itData)
-                        }
-                    }
-
-                })
-            }
-
-        }
-        mBinding?.token?.setOnClickListener {
-            BleCmdManager.getToken(bleDevice?.mac, object : CustomBleWriteCallback() {
-                override fun onPrompt(promptStr: String?) {}
-
-                override fun onConnectPrompt(promptStr: String?) {}
-
-                override fun onDisConnectPrompt(promptStr: String?) {}
-
-                override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    println("getToken success")
-                }
-
-                override fun onWriteFailure(exception: BleException?) {
-                    println("getToken fail")
-                }
-            })
-        }
-        mBinding?.version?.setOnClickListener {
-            BleCmdManager.getVersion(bleDevice?.mac, object : CustomBleWriteCallback() {
-                override fun onPrompt(promptStr: String?) {}
-
-                override fun onConnectPrompt(promptStr: String?) {}
-
-                override fun onDisConnectPrompt(promptStr: String?) {}
-
-                override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    println("getVersion success")
-                }
-
-                override fun onWriteFailure(exception: BleException?) {
-                    println("getVersion fail")
-                }
-            })
-        }
-        mBinding?.power?.setOnClickListener {
-            BleCmdManager.getPower(bleDevice?.mac, object : CustomBleWriteCallback() {
-                override fun onPrompt(promptStr: String?) {}
-
-                override fun onConnectPrompt(promptStr: String?) {}
-
-                override fun onDisConnectPrompt(promptStr: String?) {}
-
-                override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    println("getPower success")
-                }
-
-                override fun onWriteFailure(exception: BleException?) {
-                    println("getPower fail")
-                }
-            })
-        }
-//        mBinding?.status?.setOnClickListener {
-//            BleCmdManager.getCurrentStatus(bleDevice, object : CustomBleWriteCallback() {
-//                override fun onPrompt(promptStr: String?) {}
-//
-//                override fun onConnectPrompt(promptStr: String?) {}
-//
-//                override fun onDisConnectPrompt(promptStr: String?) {}
-//
-//                override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-//                    println("getCurrentStatus success")
-//                }
-//
-//                override fun onWriteFailure(exception: BleException?) {
-//                    println("getCurrentStatus fail")
-//                }
-//            })
-//        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-//        bleDevice?.let { BleManager.getInstance().stopIndicate(it, SERVICE_UUID, INDICATE_UUID) }
-//        BleManager.getInstance().disconnectAllDevice()
-//        BlueToothUtil.instance?.deviceList?.remove(bleDevice)
-    }
-}

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

@@ -9,9 +9,6 @@ class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
         get() = ActivityMainBinding.inflate(layoutInflater)
 
     override fun initView() {
-
-//        NetHttpManager.getInstance().initCtx(this)
-//
 //        NetHttpManager.getInstance()
 //            .doRequestNet("/app-api/system/area/tree", false, emptyMap<String, Objects>(),
 //                { res, errMsg, codeInt ->

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

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".activity.CmdActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <TextView
-            android:id="@+id/indicate"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="Indicate"
-            android:textSize="20sp"
-            android:background="#456789"
-            android:gravity="center"/>
-
-        <TextView
-            android:id="@+id/token"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="Get Token"
-            android:textSize="20sp"
-            android:background="#456789"
-            android:gravity="center"
-            android:layout_marginLeft="20dp"/>
-
-        <TextView
-            android:id="@+id/version"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="Get Version"
-            android:textSize="20sp"
-            android:background="#456789"
-            android:gravity="center"
-            android:layout_marginLeft="20dp"/>
-
-        <TextView
-            android:id="@+id/power"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="Get Power"
-            android:textSize="20sp"
-            android:background="#456789"
-            android:gravity="center"
-            android:layout_marginLeft="20dp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="20dp">
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="Status"
-            android:textSize="20sp"
-            android:background="#456789"
-            android:gravity="center"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/exit"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:text="Exit"
-        android:textSize="20sp"
-        android:background="#456789"
-        android:gravity="center"
-        android:layout_marginTop="20dp"/>
-</LinearLayout>