合规修复-扫描二维码处的从相册选择权限的处理，以及修复添加设备页面权限提示消失的bug。

Change-Id: Ic6787a0ae590a2e762d6f5cfd8c7f10d504af40e
tencentyun · Feb 21, 2022 · e707012 · e707012
1 parent 43584ea
commit e707012
Show file tree

Hide file tree

Showing 8 changed files with 484 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -125,6 +125,7 @@
         <activity android:name=".kitlink.activity.AddTimerActivity" />
         <activity android:name=".kitlink.activity.FamilyActivity" />
         <activity android:name=".kitlink.activity.RoomListActivity" />
+        <activity android:name=".kitlink.activity.ScannerActivity" />
         <activity android:name=".kitlink.activity.ControlPermissionActivity" />
         <activity android:name=".kitlink.activity.AddRoomActivity" />
         <activity android:name=".kitlink.activity.AddFamilyActivity" />

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceCategoryActivity.kt b/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceCategoryActivity.kt
@@ -22,7 +22,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.example.qrcode.Constant
-import com.example.qrcode.ScannerActivity
 import com.tencent.iot.explorer.link.App
 import com.tencent.iot.explorer.link.R
 import com.tencent.iot.explorer.link.T
@@ -532,7 +531,7 @@ class DeviceCategoryActivity  : PActivity(), MyCallback, CRecyclerView.RecyclerI
                 return
             }
             requestPermission(blueToothPermissions)
-            permissionDialog = PermissionDialog(App.activity, R.mipmap.permission_location ,getString(R.string.permission_location_lips), getString(R.string.permission_location_ssid_ble))
+            permissionDialog = PermissionDialog(this@DeviceCategoryActivity, R.mipmap.permission_location ,getString(R.string.permission_location_lips), getString(R.string.permission_location_ssid_ble))
             permissionDialog!!.show()
 
             // 记录请求camera权限的时间

diff --git a/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/MainActivity.kt b/app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/MainActivity.kt
@@ -16,7 +16,6 @@ import androidx.fragment.app.Fragment
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.example.qrcode.Constant
-import com.example.qrcode.ScannerActivity
 import com.tencent.android.tpush.XGIOperateCallback
 import com.tencent.android.tpush.XGPushConfig
 import com.tencent.android.tpush.XGPushManager