Sfoglia il codice sorgente

补充日志信息;修复显示异常

Frankensteinly 9 mesi fa
parent
commit
be37eac08b

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

@@ -533,7 +533,7 @@ object BusinessManager {
 
                 override fun onDisConnected(isActiveDisConnected: Boolean, device: BleDevice?, gatt: BluetoothGatt?, status: Int) {
                     loadingCallBack?.invoke(false, null, false)
-                    LogUtil.i("onDisConnected : $device")
+                    LogUtil.i("onDisConnected : ${device?.mac} - $isActiveDisConnected")
                     getBleDeviceByMac(device?.mac)?.let {
                         deviceList.remove(it)
                     }
@@ -864,9 +864,9 @@ object BusinessManager {
             // TODO 根据工作票完成情况,切换为待机模式
             BleCmdManager.switchMode(STATUS_READY, bleDevice, object : CustomBleWriteCallback() {
                 override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    println("switch mode 1 success")}
+                    LogUtil.i("switch mode ready success")}
                 override fun onWriteFailure(exception: BleException?) {
-                    println("switch mode 1 fail")}
+                    LogUtil.e("switch mode ready fail")}
             })
 
             // TODO 和confirm dialog冲突,待定

+ 4 - 4
app/src/main/java/com/grkj/iscs/view/activity/test/BleActivity.kt

@@ -167,18 +167,18 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.work_mode) {
                         BleCmdManager.switchMode(STATUS_WORK, item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("switch mode 1 success")}
+                                LogUtil.i("switch mode work success")}
                             override fun onWriteFailure(exception: BleException?) {
-                                println("switch mode 1 fail")}
+                                LogUtil.i("switch mode work fail")}
                         })
                     }
 
                     holder.setOnClickListener(R.id.standby_mode) {
                         BleCmdManager.switchMode(STATUS_READY, item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("switch mode 2 success")}
+                                LogUtil.i("switch mode ready success")}
                             override fun onWriteFailure(exception: BleException?) {
-                                println("switch mode 2 fail")}
+                                LogUtil.e("switch mode ready fail")}
                         })
                     }
 

+ 3 - 2
app/src/main/java/com/grkj/iscs/view/dialog/KeyReturnConfirmDialog.kt

@@ -9,6 +9,7 @@ import com.grkj.iscs.ble.BleCmdManager
 import com.grkj.iscs.ble.BleConst.STATUS_READY
 import com.grkj.iscs.ble.CustomBleWriteCallback
 import com.grkj.iscs.databinding.DialogKeyReturnConfirmBinding
+import com.grkj.iscs.util.log.LogUtil
 
 /**
  * 钥匙归还工作票未完成提示弹框
@@ -40,9 +41,9 @@ class KeyReturnConfirmDialog(ctx: Context): BaseDialog<DialogKeyReturnConfirmBin
     fun setKeyModeReady() {
         BleCmdManager.switchMode(STATUS_READY, bleDevice!!, object : CustomBleWriteCallback() {
             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                println("switch mode 1 success")}
+                LogUtil.i("switch mode ready success")}
             override fun onWriteFailure(exception: BleException?) {
-                println("switch mode 1 fail")}
+                LogUtil.e("switch mode ready fail")}
         })
     }
 

+ 1 - 0
app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

@@ -149,6 +149,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
             }
             if (mStep <= 5) {
                 mBinding?.cbAction?.visibility = View.VISIBLE
+                mBinding?.cbAction?.setText(getString(R.string.cancel_the_job))
             } else if (mStep == 8) {
                 mBinding?.cbAction?.visibility = View.VISIBLE
                 mBinding?.cbAction?.setText(getString(R.string.finish_the_job))