Browse Source

1.添加必装应用接口。

master
wangwanlei 10 months ago
parent
commit
f7040f65d6

+ 1
- 1
app/src/main/java/com/xhly/manageapp/bean/ListAppBean.kt View File

@@ -1,7 +1,7 @@
1 1
 package com.xhly.manageapp.bean
2 2
 
3 3
 class ListAppBean {
4
-    var appgroupid = 1
4
+    var appgroupid = 0
5 5
 
6 6
     /**
7 7
      * 应用类型:1推荐应用2必装应用,0为全部

+ 9
- 4
app/src/main/java/com/xhly/manageapp/network/UriAdress.kt View File

@@ -12,10 +12,15 @@ object UriAdress {
12 12
     const val LOGAPPSTARTADD = "/logAppStart/add"
13 13
 
14 14
     /**
15
-     *获得应用列表
15
+     *获得可显示应用列表
16 16
      */
17 17
     const val LIST_APP = "/app/list_app"
18 18
 
19
+    /**
20
+     * 获得必装应用列表
21
+     */
22
+    const val FORCEAPP = "app/list_forceapp"
23
+
19 24
     /**
20 25
      * 获得平板策略
21 26
      */
@@ -44,15 +49,15 @@ object UriAdress {
44 49
     /**
45 50
      * 登录接口
46 51
      */
47
-    const val ULOGIN_LOGIN="/ulogin/login"
52
+    const val ULOGIN_LOGIN = "/ulogin/login"
48 53
 
49 54
     /**
50 55
      * 退出登录接口
51 56
      */
52
-    const val ULOGIN_LOGIN_OUT="/ulogin/login_out"
57
+    const val ULOGIN_LOGIN_OUT = "/ulogin/login_out"
53 58
 
54 59
     /**
55 60
      * 设备设置管理
56 61
      */
57
-    const val DEVICESETDETAIL="/deviceSet/detail"
62
+    const val DEVICESETDETAIL = "/deviceSet/detail"
58 63
 }

+ 4
- 1
app/src/main/java/com/xhly/manageapp/network/app/AppService.kt View File

@@ -15,8 +15,11 @@ interface AppService {
15 15
     @POST(UriAdress.LIST_APP)
16 16
     suspend fun postListApp(@Body listapp: ListAppBean): ResponseData<ArrayList<AppModel>>
17 17
 
18
+    @POST(UriAdress.FORCEAPP)
19
+    suspend fun postForceApp(): ResponseData<ArrayList<AppModel>>
20
+
18 21
     /**
19
-     * 获得版本更新
22
+     * 获得版本更新,用来统计版本更新消息,而不是用来版本更新
20 23
      */
21 24
     @POST(UriAdress.CLIENT_ADD)
22 25
     suspend fun postClientAdd(@Body updateBean: UpdateBean): ResponseData<Any>

+ 1
- 0
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

@@ -137,6 +137,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
137 137
         }
138 138
         onBackPressedDispatcher.addCallback {
139 139
             //屏蔽返回
140
+            viewModel.getAppList()
140 141
         }
141 142
     }
142 143
 

+ 10
- 0
app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt View File

@@ -23,6 +23,9 @@ class MainViewModel : CommonBaseViewModel() {
23 23
     private var logService = RetrofitService.create<LogService>()
24 24
     private val listData = MutableLiveData<ArrayList<AppModel>>()
25 25
     val listAppData: LiveData<ArrayList<AppModel>> = listData
26
+    private val forceData = MutableLiveData<ArrayList<AppModel>>()
27
+    val forceListAppData: LiveData<ArrayList<AppModel>> = listData
28
+
26 29
     private val strategy = MutableLiveData<StrategyBean>()
27 30
     val strategyData: LiveData<StrategyBean> = strategy
28 31
     private val appStrategy = MutableLiveData<ArrayList<AppTimeManageBean>>()
@@ -51,6 +54,13 @@ class MainViewModel : CommonBaseViewModel() {
51 54
         }
52 55
     }
53 56
 
57
+    fun getForceAppList(){
58
+        launchUI {
59
+            var postForceApp = appService.postForceApp()
60
+
61
+        }
62
+    }
63
+
54 64
     fun updateStrategy() {
55 65
         launchUI {
56 66
             val postDetailPad = strategyService.postDetailPad()

+ 1
- 1
corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt View File

@@ -25,7 +25,7 @@ class ResponseInterceptor : Interceptor {
25 25
          /*   requestBuilder.header("Authorization", "Bearer ${Const.token}")
26 26
             requestBuilder.header("Accept-Language", "zh-Hans")*/
27 27
             requestBuilder.header("XH-UserId","1")
28
-            requestBuilder.header("XH-DeviceModel", Build.DEVICE)
28
+            requestBuilder.header("XH-DeviceModel", Build.MODEL)
29 29
             request = requestBuilder.build()
30 30
             val originalResponse = chain.proceed(request)
31 31
             val responseBody = originalResponse.body

Loading…
Cancel
Save