1.在请求学校设置前先请求应用数据

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

@@ -645,7 +645,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
-        viewModel.getAppList()
+       /* viewModel.getAppList()*/
         viewModel.postAppNetWhiteList()
         useTimeStrategy()
         updatePadInfo()
@@ -1109,7 +1109,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                     }
                 }
             } catch (e: Exception) {
-                LogShow("商店应用为空")
+                LogShow("商店应用为空"+e.toString())
             }
             dataList.clear()
             var appList = AppUtils.GetAppList(this)

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -168,6 +168,24 @@ class MainViewModel : BaseViewModel() {
      */
     fun postDevicesetDetail(schoolid: Long) {
         launchUI {
+            val postListApp = appService.postListApp(ListAppBean())
+            if (postListApp.code == 0) {
+                if (postListApp.obj != null && postListApp.obj.isNotEmpty()) {
+                    listData.value = postListApp.obj
+                } else {
+                    listData.value = arrayListOf()
+                }
+            } else {
+                if (!postListApp.msg.isNullOrEmpty()) {
+                    netMessage.value = postListApp.msg
+                }
+            }
+            //获得必装应用
+            val result1 = appService.postForceApp()
+            if (result1.code == 0 && result1.obj != null && result1.obj.isNotEmpty()) {
+                forceData.value = result1.obj
+            }
+
             val map = HashMap<String, Any>()
             map["schoolid"] = schoolid
             val result = strategyService.postDevicesetDetail(map)