设备联调

app/src/main/java/com/sw/platecabinet/viewmodel/BaseViewModel.kt

@@ -66,9 +66,10 @@ abstract class BaseViewModel() : ViewModel() {
     }
 
     fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
-        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
-        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
-        GlobalData.appId = equipmentInfo.arcsoftAppId!!
+//        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
+        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
+//        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
+//        GlobalData.appId = equipmentInfo.arcsoftAppId!!
 //        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
         GlobalData.restId = equipmentInfo.canteenId!!
     }

app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt

@@ -130,7 +130,7 @@ class UserViewModel : BaseViewModel() {
     /**
      * 通过用户id获取用户信息
      */
-    fun getUserInfoById(equipmentCode: String = globalEquipmentCode, memberId: Int) {
+    fun getUserInfoById(equipmentCode: String = globalEquipmentCode, memberId: Int, action:(EquipmentUserInfo?)->Unit={}) {
         _currentUserInfo.value = null
         launchWithLoading {
             val loginParam = LoginParam(
@@ -141,6 +141,7 @@ class UserViewModel : BaseViewModel() {
             val response = repository.equipmentBoxLogin(loginParam)
             if (parseResponse(response)) {
                 _currentUserInfo.value = response.data
+                action(response.data)
             }
         }
     }