Bläddra i källkod

Simple Demo根据实测反馈调整

Frankensteinly 10 månader sedan
förälder
incheckning
4bcf19494b

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

@@ -549,6 +549,7 @@ object BusinessManager {
                     }
                     // 单bleBean json赋值
                     bleBean?.ticketSend = PresentationManager.getSimpleTicketJson()
+        LogUtil.i("Simple Json : ${PresentationManager.getSimpleTicketJson()}")
                     bleBean?.ticketSend?.let { itJson ->
                         sendTicket(itJson, bleBean.bleDevice, loadingCallBack)
                     }

+ 1 - 1
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleProcessActivity.kt

@@ -154,7 +154,7 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         val sharedCount = PresentationManager.mSimpleTicket?.lockerTogetherList?.filter { it.status == 1 }?.size ?: 0
         println("updateSharedStatus : $doneCount")
         mBinding?.tvShared1?.text = "${getString(R.string.simple_shared)} $sharedCount/2"
-        mBinding?.tvShared2?.text = "${getString(R.string.simple_shared)} $doneCount/2"
+        mBinding?.tvShared2?.text = "${getString(R.string.simple_shared)} ${2 - doneCount}/2"
         if (doneCount == 2) {
             PresentationManager.mSimpleTicket?.status = 3
             PresentationManager.mStep = 5

+ 5 - 5
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleSettingActivity.kt

@@ -26,27 +26,27 @@ class SimpleSettingActivity : BaseActivity<ActivitySimpleSettingBinding>() {
 
         mBinding?.llFinishTicket?.debounce {
             PresentationManager.initTicket()
-            ToastUtils.tip(R.string.simple_ticket_tip)
+//            ToastUtils.tip(R.string.simple_ticket_tip)
         }
 
         mBinding?.llCloseAllLockBuckles?.debounce {
             ModBusController.controlAllLockBuckles(false)
-            ToastUtils.tip(R.string.simple_close_lock_tip)
+//            ToastUtils.tip(R.string.simple_close_lock_tip)
         }
 
         mBinding?.llOpenAllLockBuckles?.debounce {
             ModBusController.controlAllLockBuckles(true)
-            ToastUtils.tip(R.string.simple_open_lock_tip)
+//            ToastUtils.tip(R.string.simple_open_lock_tip)
         }
 
         mBinding?.llCloseAllKeyBuckles?.debounce {
             ModBusController.controlAllKeyBuckles(false)
-            ToastUtils.tip(R.string.simple_close_key_tip)
+//            ToastUtils.tip(R.string.simple_close_key_tip)
         }
 
         mBinding?.llOpenAllKeyBuckles?.debounce {
             ModBusController.controlAllKeyBuckles(true)
-            ToastUtils.tip(R.string.simple_open_key_tip)
+//            ToastUtils.tip(R.string.simple_open_key_tip)
         }
 
         mBinding?.llHome?.debounce {