添加钥匙归还确认弹框

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

@@ -45,6 +45,11 @@ import pub.devrel.easypermissions.AfterPermissionGranted
  */
 object BusinessManager {
 
+    /**
+     * 下发工作票还是读取工作票完成状态
+     */
+    var isSendTicket = true
+
     /****************************************** ModBus ******************************************/
 
     fun connectDock(count: Int, isNeedInit: Boolean = false) {
@@ -261,11 +266,7 @@ object BusinessManager {
                     loadingCallBack.invoke(false, CommonUtils.getStr(R.string.ble_connect_fail))
                 }
 
-                override fun onConnectSuccess(
-                    bleDevice: BleDevice?,
-                    gatt: BluetoothGatt?,
-                    status: Int
-                ) {
+                override fun onConnectSuccess(bleDevice: BleDevice?, gatt: BluetoothGatt?, status: Int) {
                     loadingCallBack.invoke(false, null)
                     LogUtil.i("onConnectSuccess : $bleDevice")
                     bleDevice?.let {
@@ -281,15 +282,9 @@ object BusinessManager {
                             indicate(bleBean, loadingCallBack)
                         }
                     }
-
                 }
 
-                override fun onDisConnected(
-                    isActiveDisConnected: Boolean,
-                    device: BleDevice?,
-                    gatt: BluetoothGatt?,
-                    status: Int
-                ) {
+                override fun onDisConnected(isActiveDisConnected: Boolean, device: BleDevice?, gatt: BluetoothGatt?, status: Int) {
                     loadingCallBack.invoke(false, null)
                     ToastUtils.tip(CommonUtils.getStr(R.string.ble_disconnect))
                     BleUtil.instance?.getBleDeviceByMac(device?.mac)?.let {
@@ -558,10 +553,6 @@ object BusinessManager {
         }
     }
 
-
-
-
-
     /**
      * 读取工作票完成情况
      */
@@ -592,9 +583,4 @@ object BusinessManager {
                 println("getTicketStatus fail")}
         })
     }
-
-    /**
-     * 下发工作票还是读取工作票完成状态
-     */
-    var isSendTicket = true
 }

app/src/main/java/com/grkj/iscs/dialog/KeyReturnConfirmDialog.kt

@@ -0,0 +1,30 @@
+package com.grkj.iscs.dialog
+
+import android.content.Context
+import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.databinding.DialogKeyReturnConfirmBinding
+
+/**
+ * 钥匙归还工作票未完成提示弹框
+ */
+class KeyReturnConfirmDialog(ctx: Context): BaseDialog<DialogKeyReturnConfirmBinding>(ctx) {
+
+    override val viewBinding: DialogKeyReturnConfirmBinding
+        get() = DialogKeyReturnConfirmBinding.inflate(layoutInflater)
+
+    override fun initView() {
+        mBinding?.tvCancel?.setOnClickListener {
+            // TODO 打开钥匙卡扣
+            dismiss()
+        }
+
+        mBinding?.tvConfirm?.setOnClickListener {
+            // TODO 设置待机模式
+            dismiss()
+        }
+    }
+
+    override fun showDialog() {
+
+    }
+}

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -16,4 +16,5 @@ object Constants {
     const val TICKET_STATUS_PROCESSING = "2"          // 进行中
     const val TICKET_STATUS_READY_TO_UNLOCK = "3"     // 待解锁
     const val TICKET_STATUS_FINISHED = "4"            // 已结束
+    const val TICKET_STATUS_EXPIRED = "5"             // 已失效
 }

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/CommonTextView"
+        android:textColor="@color/main_color"
+        android:text="@string/key_return_confirm_tip" />
+
+    <TextView
+        android:id="@+id/tv_cancel"
+        style="@style/CommonBtn"
+        android:textColor="@color/main_color"
+        android:text="@string/cancel"/>
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        style="@style/CommonBtn"
+        android:textColor="@color/main_color"
+        android:text="@string/confirm"/>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -54,6 +54,8 @@
     <string name="on_process">进行中</string>
     <string name="ready_to_unlock">待解锁</string>
     <string name="finished">已结束</string>
+    <string name="key_return_confirm_tip">工作票尚未完成，是否确认归还钥匙？</string>
+    <string name="cancel">取消</string>
 
 
     <!--  演示页  -->