留存代码；补充loading框显示

app/build.gradle

@@ -108,4 +108,6 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
+
+    implementation 'com.github.getActivity:XXPermissions:20.0'
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />

app/src/main/java/com/grkj/iscs/presentation/PresentationManager.kt

@@ -6,6 +6,7 @@ import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.R
 import com.grkj.iscs.activity.TicketDetailActivity
+import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.DockBean
@@ -400,6 +401,7 @@ object PresentationManager {
                     // 更新钥匙信息
                     // TODO 更新钥匙配对
                     BusinessManager.sendTicketBusiness(keyPair.second?.mac!!, ctx) { b, s, rst ->
+                        (ctx as BaseActivity<*>).handleLoading(b, s)
                         if (rst == true) {
                             mSimpleTicket?.status = 2
                             mSimpleTicket?.locker?.status = 1

app/src/main/java/com/grkj/iscs/util/CommonUtils.kt

@@ -10,6 +10,9 @@ import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
+import com.hjq.permissions.OnPermissionCallback
+import com.hjq.permissions.Permission
+import com.hjq.permissions.XXPermissions
 import pub.devrel.easypermissions.EasyPermissions
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -42,6 +45,29 @@ object CommonUtils {
             arrayOf(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION)
         }
         checkPermission(activity, permissions, callBack)
+
+//        XXPermissions
+//            .with(activity)
+//            .permission(Permission.BLUETOOTH_SCAN)
+//            .permission(Permission.BLUETOOTH_ADVERTISE)
+//            .permission(Permission.BLUETOOTH_CONNECT)
+//            .permission(Permission.ACCESS_FINE_LOCATION)
+//            .permission(Permission.ACCESS_COARSE_LOCATION)
+//            .request(object : OnPermissionCallback {
+//                override fun onGranted(permissions: MutableList<String>, allGranted: Boolean) {
+//                    callBack.invoke()
+//                }
+//
+//                override fun onDenied(permissions: MutableList<String>, never: Boolean) {
+//                    if (never) {
+//                        ToastUtils.tip("被永久拒绝授权，请手动授予权限")
+//                        // 如果是被永久拒绝就跳转到应用权限系统设置页面
+//                        XXPermissions.startPermissionActivity(activity, permissions);
+//                    } else {
+//                        ToastUtils.tip("获取蓝牙权限失败")
+//                    }
+//                }
+//            })
     }
 
     fun getStr(textId: Int, ctx: Context? = null): String? {