添加退出登录接口，完善退出机制；精简蓝牙写入回调

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

@@ -35,6 +35,8 @@ class MyApplication : Application() {
 
     override fun onTerminate() {
         super.onTerminate()
+        NetApi.logout()
         SPUtils.clearLoginUser(this)
+        Token.clear(this)
     }
 }

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

@@ -11,6 +11,7 @@ import com.grkj.iscs.model.Constants.USER_ROLE_GUARD
 import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.vo.card.CardInfoRespVO
 import com.grkj.iscs.presenter.HomePresenter
+import com.grkj.iscs.util.NetApi
 
 class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBinding>() {
 
@@ -19,7 +20,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
 
     override fun initView() {
         mBinding?.tvExit?.setOnClickListener {
-            // TODO 退出登录，清除token
+            NetApi.logout()
             finish()
         }
 

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

@@ -20,6 +20,8 @@ import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
 import com.grkj.iscs.ble.BleConst.INDICATE_UUID
 import com.grkj.iscs.ble.BleConst.SERVICE_UUID
 import com.grkj.iscs.ble.BleCmdManager
+import com.grkj.iscs.ble.BleConst.STATUS_READY
+import com.grkj.iscs.ble.BleConst.STATUS_WORK
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.ble.BleUtil
@@ -109,12 +111,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
                     holder.setOnClickListener(R.id.token) {
                         BleCmdManager.getToken(item?.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")
                             }
@@ -127,12 +123,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
                     holder.setOnClickListener(R.id.version) {
                         BleCmdManager.getVersion(item?.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")
                             }
@@ -145,12 +135,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
                     holder.setOnClickListener(R.id.power) {
                         BleCmdManager.getPower(item?.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")
                             }
@@ -163,12 +147,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
                     holder.setOnClickListener(R.id.device) {
                         BleCmdManager.getCurrentStatus(item?.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")
                             }
@@ -178,13 +156,7 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     }
 
                     holder.setOnClickListener(R.id.work_mode) {
-                        BleCmdManager.switchMode(byteArrayOf(0x01), item?.bleDevice!!, object : CustomBleWriteCallback() {
-                            override fun onPrompt(promptStr: String?) {}
-
-                            override fun onConnectPrompt(promptStr: String?) {}
-
-                            override fun onDisConnectPrompt(promptStr: String?) {}
-
+                        BleCmdManager.switchMode(STATUS_WORK, item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                                 println("switch mode 1 success")}
                             override fun onWriteFailure(exception: BleException?) {
@@ -193,13 +165,7 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     }
 
                     holder.setOnClickListener(R.id.standby_mode) {
-                        BleCmdManager.switchMode(byteArrayOf(0x02), item?.bleDevice!!, object : CustomBleWriteCallback() {
-                            override fun onPrompt(promptStr: String?) {}
-
-                            override fun onConnectPrompt(promptStr: String?) {}
-
-                            override fun onDisConnectPrompt(promptStr: String?) {}
-
+                        BleCmdManager.switchMode(STATUS_READY, item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                                 println("switch mode 2 success")}
                             override fun onWriteFailure(exception: BleException?) {
@@ -209,12 +175,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
                     holder.setOnClickListener(R.id.ticketStatus) {
                         BleCmdManager.getTicketStatus(item?.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("getTicketStatus success")}
                             override fun onWriteFailure(exception: BleException?) {
@@ -227,12 +187,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 //                        val testStr = "{\"cardNo\":\"80A8C0F4EA\",\"password\":\"12345678\",\"effectiveTime\":24,\"data\":[{\"taskCode\":\"202401020001\",\"taskId\":\"71b49baa49b343bc84d7e6b829ac1bdc\",\"codeId\":1,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"049648B2E31690\",\"infoRfidNo\":\"04E3BCCA201290\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"0405982414C563\",\"target\":0,\"prevId\":1}]},{\"taskCode\":\"202401020002\",\"taskId\":\"145b5a4cc38c41e19943f4c8b48d12b0\",\"codeId\":2,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"045460F7F4F438\",\"infoRfidNo\":\"04BC6584C65009\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"042B99E449E795\",\"target\":0,\"prevId\":1},{\"dataId\":3,\"equipRfidNo\":\"04A312EE848B62\",\"infoRfidNo\":\"04220E86831289\",\"target\":1,\"prevId\":2}]}],\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"040E21443010E9\"},{\"lockId\":\"2\",\"rfid\":\"0457505E5861C2\"}]}"
                         val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":0,\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"prevId\":0,\"target\":0}],\"taskCode\":\"202410290918\",\"taskId\":\"123456\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"706BD295\"},{\"lockId\":\"2\",\"rfid\":\"6CD295\"}]}"
                         BleCmdManager.sendWorkTicket(testStr, bleDevice = item?.bleDevice!!, callback = 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("sendTicket success")
                             }
@@ -271,12 +225,6 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                         return
                     }
                     BleCmdManager.sendFile(2, File(list[0]), mac = fileMac, callback = 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("sendFile success")
                         }

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -12,6 +12,11 @@ object UrlConsts {
      */
     const val SIGN_IN = "/login"
 
+    /**
+     * 退出登录
+     */
+    const val LOGOUT = "/mobile/login/logout"
+
     /**
      * 查询SOP信息-分页
      */

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

@@ -36,6 +36,21 @@ object NetApi {
             }, isGet = false, isAuth = false)
     }
 
+    /**
+     * 退出登录
+     */
+    fun logout() {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.LOGOUT,
+            false,
+            mapOf<String, String>(),
+            { res, _, _ ->
+                SPUtils.clearLoginUser(MyApplication.instance!!.applicationContext)
+                Token.clear(MyApplication.instance!!.applicationContext)
+            }, isGet = true, isAuth = false
+        )
+    }
+
     /**
      * 刷卡登录
      */