优化显示异常；补充日志打印；调整json参数；修正下发工作票判断

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

@@ -793,7 +793,10 @@ object BusinessManager {
      */
     private fun generateTicketSendJson(vo: TicketDetailRespVO, lockList: MutableList<String?>?): String {
         // 用ticketStatus的"待上锁"进行判断
-        val isLock = (vo.ticketStatus == Constants.TICKET_STATUS_NOT_STARTED || vo.ticketStatus == Constants.TICKET_STATUS_READY_TO_LOCK)
+        var isLock = true
+        vo.ticketStatus?.let {
+            isLock = it.toInt() < Constants.TICKET_STATUS_READY_TO_UNLOCK.toInt()
+        }
         val bo = WorkTicketSendBO(
             cardNo = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext)?.cardNfc,
         )
@@ -970,7 +973,7 @@ object BusinessManager {
                 val updateList = mutableListOf<LockPointUpdateReqVO>()
                 data.dataList?.forEach { dataListDTO ->
                     val updateVO = LockPointUpdateReqVO(
-                        data.taskId?.toLong(),
+                        data.taskCode?.toLong(),
                         dataListDTO.infoRfidNo,
                         dataListDTO.equipRfidNo,
                         keyNfc!!,
@@ -986,7 +989,7 @@ object BusinessManager {
                 }
 
                 // 上报钥匙归还
-                NetApi.updateKeyReturn(data.taskId?.toLong()!!, keyNfc!!, MyApplication.instance!!.serialNo()) { isSuccess ->
+                NetApi.updateKeyReturn(data.taskCode?.toLong()!!, keyNfc!!, MyApplication.instance!!.serialNo()) { isSuccess ->
 
                 }
             }

app/src/main/java/com/grkj/iscs/ble/BleUtil.kt

@@ -14,6 +14,8 @@ import com.grkj.iscs.model.Constants.BLE_LOCAL_NAME
 import com.grkj.iscs.ble.BleConst.INDICATE_UUID
 import com.grkj.iscs.ble.BleConst.MTU
 import com.grkj.iscs.ble.BleConst.SERVICE_UUID
+import com.grkj.iscs.extentions.toHexStrings
+import com.grkj.iscs.util.log.LogUtil
 
 /**
  * 蓝牙工具类
@@ -156,6 +158,7 @@ class BleUtil private constructor() {
             writeCallback?.onPrompt("蓝牙已关闭，请打开蓝牙后重试")
             return
         }
+        LogUtil.i("ble_write : ${cmd?.toHexStrings()}")
         if (BleManager.getInstance().isConnected(bleDevice.mac)) {
             BleManager.getInstance().write(bleDevice, serviceUUID, writeUUID, cmd, writeCallback)
         } else {

app/src/main/java/com/grkj/iscs/view/fragment/JobProgressFragment.kt

@@ -101,6 +101,8 @@ class JobProgressFragment(val goBack: () -> Unit) :
                 mBinding?.cbAction?.visibility = View.VISIBLE
                 mBinding?.cbAction?.setIcon(R.mipmap.ticket_unlocked)
                 mBinding?.cbAction?.setText(getString(R.string.go_unlocking))
+            } else {
+                mBinding?.cbAction?.visibility = View.GONE
             }
         }
     }
@@ -124,7 +126,7 @@ class JobProgressFragment(val goBack: () -> Unit) :
             }
             mTipDialog?.setConfirmListener {
                 presenter?.updateColockerStatus(mPageChangeBO?.ticketId!!, cardNo, if (jobStatus < 4) "4" else "5") {
-                    // TODO 刷新界面
+                    refreshPage(mPageChangeBO!!)
                 }
             }
             mTipDialog?.showCancelCountdown(10)

app/src/main/java/com/grkj/iscs/view/presenter/JobProgressPresenter.kt

@@ -88,7 +88,7 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
      */
     fun handleLockProcess(ticketId: Long) {
         getTicketDetail(ticketId) { ticketDetail ->
-            LogUtil.i("getTicketDetail : $ticketDetail")
+            LogUtil.i("getTicketDetail lock: $ticketDetail")
             val role = ticketDetail?.jobTicketUserList?.find { it.userId == SPUtils.getLoginUser(mContext!!)?.userId && it.userType == USER_TYPE_LOCKER }
             if (role == null) {
                 ToastUtils.tip(R.string.you_are_not_locker_tip)
@@ -136,6 +136,7 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
      */
     fun handleUnlockProcess(ticketId: Long) {
         getTicketDetail(ticketId) { ticketDetail ->
+            LogUtil.i("getTicketDetail unlock: $ticketDetail")
             val role = ticketDetail?.jobTicketUserList?.find { it.userId == SPUtils.getLoginUser(mContext!!)?.userId && it.userType == USER_TYPE_LOCKER }
             if (role == null) {
                 ToastUtils.tip(R.string.you_are_not_locker_tip)

app/src/main/res/layout/fragment_step.xml

@@ -31,7 +31,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/cb_action"
+        android:layout_above="@id/cb_back"
         android:layout_marginBottom="@dimen/common_spacing"
         android:background="@drawable/item_rv_technology_sop_bg_normal"
         android:padding="5dp">