1. 优化蓝牙通信功能

app/src/main/java/com/iscs/bozzys/ui/pages/vm/VMDetailTask.kt

@@ -330,7 +330,8 @@ class VMDetailTask : VMBase() {
     private fun checkCanShowTakeButton(): Boolean {
         val node = _state.value.node
         LogUtil.d("PointInfo", "points -> ${node.points}, keys -> ${node.keys}, locks -> ${node.locks}")
-        if (node.type == "isolation") { // 隔离
+        if (node.type == "isolation") {
+            // 类型为 隔离
             if (node.points?.all { it.status == "1" } ?: false) return false
             // 如果初始化还未配置钥匙和锁具，这里是要显示取设备的
             if (node.keys.isNullOrEmpty() || node.locks.isNullOrEmpty() || node.points.isNullOrEmpty()) return true
@@ -339,7 +340,8 @@ class VMDetailTask : VMBase() {
             // 未隔离的点位个数
             val unPointsCount = node.points.filter { it.status != "1" }.size
             return unTakeKeyCount != 0 && unPointsCount != 0
-        } else if (node.type == "releaseIsolation") { // 解除隔离
+        } else if (node.type == "releaseIsolation") {
+            // 类型为 解除隔离
             if (node.points?.all { it.status == "2" } ?: false) return false
             // 解除隔离按钮只有所有共锁人都解锁后可进行
             // 是否所有共锁人都已解除共锁

app/src/main/java/com/iscs/bozzys/utils/ble/BleTask.kt

@@ -209,7 +209,7 @@ object BleTask {
                 try {
                     // 处理作业票完成情况
                     val ticket = json.decodeFromString<KeyTicket>(ticketJson)
-                    LogUtil.i("BleTask", "[${device.address}] 解析作业")
+                    // LogUtil.i("BleTask", "[${device.address}] 解析作业")
                     // 先找到蓝牙指定的设备NFC
                     val keys = ApiRequest.getKeyList(mutableMapOf("page" to 1, "pageSize" to -1)).getOrElse { it.getResponse() }
                     keys.data?.list?.find { it.macAddress == device.address }?.let { key ->
@@ -264,11 +264,11 @@ object BleTask {
                     return@forEach
                 }
             }
-            LogUtil.i("BleTask", "[${device.address}] 下发作业 -> $ticketSendOk")
+            LogUtil.i("BleTask", "[${device.address}] 下发作业 -> ${if (ticketSendOk) "成功" else "失败"}")
             // 作业票下发成功，修改设备运行模式为工作模式
             val switch = bm.writeByResponse(token.buildBLESwitchRunModeCMD(BleRunMode.WORK))
                 .getSwitchRunModeResult()
-            LogUtil.i("BleTask", "[${device.address}] 切换模式 -> $switch")
+            LogUtil.i("BleTask", "[${device.address}] 切换模式 -> ${if (switch) "成功" else "失败"}")
             val disRet = bm.writeByResponse(token.buildBLEDisconnectCMD()).getDisconnectResult()
             LogUtil.i("BleTask", "[${device.address}] 设备断开 -> ${if (disRet == 1) "成功" else "失败"}")
             removeDeviceUsed(device.address)

app/src/main/java/com/iscs/bozzys/utils/network/Request.kt

@@ -5,7 +5,6 @@ import com.iscs.bozzys.utils.DateUtil.format
 import com.iscs.bozzys.utils.LogUtil
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.logging.HttpLoggingInterceptor
 import okio.Buffer
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -33,23 +32,23 @@ object Request {
 
     // 构建请求客户端
     private val okClient = OkHttpClient.Builder()
-//        .addInterceptor {
-//            val start = System.currentTimeMillis()
-//            // 请求拦截 处理一些需要处理的数据，或者打印
-//            val request = it.request()
-//            val response: okhttp3.Response
-//            try {
-//                response = it.proceed(request)
-//                val end = System.currentTimeMillis()
-//                printLog(request, response, null, start, end)
-//            } catch (e: Exception) {
-//                val end = System.currentTimeMillis()
-//                printLog(request, null, e, start, end)
-//                throw e
-//            }
-//            return@addInterceptor response
-//        }
-        .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
+        .addInterceptor {
+            val start = System.currentTimeMillis()
+            // 请求拦截 处理一些需要处理的数据，或者打印
+            val request = it.request()
+            val response: okhttp3.Response
+            try {
+                response = it.proceed(request)
+                val end = System.currentTimeMillis()
+                printLog(request, response, null, start, end)
+            } catch (e: Exception) {
+                val end = System.currentTimeMillis()
+                printLog(request, null, e, start, end)
+                throw e
+            }
+            return@addInterceptor response
+        }
+//        .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
         .sslSocketFactory(getSocketFactory(), createTrustManager())
         .hostnameVerifier { _, _ -> true }
         .build()