Browse Source

补充日志打印;修复转换异常;优化日志记录

Frankensteinly 9 months ago
parent
commit
b87624c8fc

+ 4 - 1
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -582,7 +582,7 @@ object BusinessManager {
 
                 override fun onIndicateFailure(exception: BleException?) {
                     loadingCallBack?.invoke(false, null, false)
-                    LogUtil.e("onIndicateFailure : $bleBean - ${exception?.description}")
+                    LogUtil.e("onIndicateFailure : ${bleBean.bleDevice.mac} - ${exception?.description}")
                     prepareDoneCallBack?.invoke(false, null)
                 }
 
@@ -806,10 +806,13 @@ object BusinessManager {
     private fun handleSwitchModeResult(byteArray: ByteArray, loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?) {
         BleCmdManager.handleSwitchModeResult(byteArray) { job, res ->
             if (res == 0x01.toByte() && job == 0x01.toByte()) {
+                LogUtil.i("切换工作模式成功")
                 loadingCallBack?.invoke(false, "切换工作模式成功", null)
             } else if (res == 0x01.toByte() && job == 0x02.toByte()) {
+                LogUtil.i("切换待机模式成功")
                 loadingCallBack?.invoke(false, "切换待机模式成功", null)
             } else {
+                LogUtil.e("切换模式失败 : ${job.toInt()} - ${res.toInt()}")
                 loadingCallBack?.invoke(false, null, null)
             }
         }

+ 4 - 3
app/src/main/java/com/grkj/iscs/view/presenter/HomePresenter.kt

@@ -7,9 +7,10 @@ import com.grkj.iscs.modbus.DockBean
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
+import com.grkj.iscs.util.ActivityUtils
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.activity.HomeActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.view.iview.IHomeView
 
@@ -53,9 +54,9 @@ class HomePresenter : BasePresenter<IHomeView>() {
                 }
                 return@readKeyRfid
             }
-            BusinessManager.getTicketStatusBusiness(keyBean.mac!!, mvpView as HomeActivity) { b, s, rst ->
+            BusinessManager.getTicketStatusBusiness(keyBean.mac!!, ActivityUtils.currentActivity() as BaseActivity<*>) { b, s, rst ->
                 Executor.runOnMain {
-                    (mvpView as HomeActivity).handleLoading(b, s)
+                    (ActivityUtils.currentActivity() as BaseActivity<*>).handleLoading(b, s)
                 }
             }
         }