1.添加新的定位权限

app/src/main/AndroidManifest.xml

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

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -236,6 +236,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
         }
         onBackPressedDispatcher.addCallback {
+            //屏蔽返回键
 
         }
     }
@@ -243,14 +244,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     override fun onResume() {
         super.onResume()
+        userBean?.let {
+            Const.USERID=it.userid.toString()
+            viewModel.postDevicesetDetail(it.schoolid)
+        }
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
         viewModel.getAppList()
         viewModel.postAppNetWhiteList()
-        userBean?.let {
-            viewModel.postDevicesetDetail(it.schoolid)
-        }
         useTimeStrategy()
         updatePadInfo()
         updateMcApp()
@@ -323,7 +325,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun getLocation() {
         val rxPermissions = RxPermissions(this)
         rxPermissions.request(
-            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION
+            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS
         ).subscribe({
             if (it) {
                 SystemUtil.getLocation(this)
@@ -715,6 +718,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         data.comm = "退出登录"
         data.doEvent = EventLog.ACCOUNTQUITEVENT
         viewModel.eventLog(data)
+        Const.USERID="1"
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
         startIntentActivity(LoginActivity().javaClass)