瀏覽代碼

1.添加新的定位权限

20241218TB223FC(测试jar包)
wangwanlei 11 月之前
父節點
當前提交
9948e1da52

+ 3
- 0
app/src/main/AndroidManifest.xml 查看文件

33
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
33
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
34
     <!--用于申请调用A-GPS模块,卫星定位加速-->
34
     <!--用于申请调用A-GPS模块,卫星定位加速-->
35
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
35
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
36
+    <!--用于获取wifi的获取权限,wifi信息会用来进行网络定位-->
37
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
38
+
36
     <!--护眼模式权限,只有系统app可以使用-->
39
     <!--护眼模式权限,只有系统app可以使用-->
37
     <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"
40
     <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"
38
         tools:ignore="ProtectedPermissions" />
41
         tools:ignore="ProtectedPermissions" />

+ 8
- 4
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt 查看文件

236
             }
236
             }
237
         }
237
         }
238
         onBackPressedDispatcher.addCallback {
238
         onBackPressedDispatcher.addCallback {
239
+            //屏蔽返回键
239
 
240
 
240
         }
241
         }
241
     }
242
     }
243
 
244
 
244
     override fun onResume() {
245
     override fun onResume() {
245
         super.onResume()
246
         super.onResume()
247
+        userBean?.let {
248
+            Const.USERID=it.userid.toString()
249
+            viewModel.postDevicesetDetail(it.schoolid)
250
+        }
246
         viewModel.postWallpaperPad()
251
         viewModel.postWallpaperPad()
247
         viewModel.updateStrategy()
252
         viewModel.updateStrategy()
248
         viewModel.uploadAppStrategy()
253
         viewModel.uploadAppStrategy()
249
         viewModel.getAppList()
254
         viewModel.getAppList()
250
         viewModel.postAppNetWhiteList()
255
         viewModel.postAppNetWhiteList()
251
-        userBean?.let {
252
-            viewModel.postDevicesetDetail(it.schoolid)
253
-        }
254
         useTimeStrategy()
256
         useTimeStrategy()
255
         updatePadInfo()
257
         updatePadInfo()
256
         updateMcApp()
258
         updateMcApp()
323
     private fun getLocation() {
325
     private fun getLocation() {
324
         val rxPermissions = RxPermissions(this)
326
         val rxPermissions = RxPermissions(this)
325
         rxPermissions.request(
327
         rxPermissions.request(
326
-            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION
328
+            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION,
329
+            Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS
327
         ).subscribe({
330
         ).subscribe({
328
             if (it) {
331
             if (it) {
329
                 SystemUtil.getLocation(this)
332
                 SystemUtil.getLocation(this)
715
         data.comm = "退出登录"
718
         data.comm = "退出登录"
716
         data.doEvent = EventLog.ACCOUNTQUITEVENT
719
         data.doEvent = EventLog.ACCOUNTQUITEVENT
717
         viewModel.eventLog(data)
720
         viewModel.eventLog(data)
721
+        Const.USERID="1"
718
         WorkManager.getInstance(this).cancelAllWork()
722
         WorkManager.getInstance(this).cancelAllWork()
719
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
723
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
720
         startIntentActivity(LoginActivity().javaClass)
724
         startIntentActivity(LoginActivity().javaClass)

Loading…
取消
儲存