From 17d47a876f3d38023e2ddb7a801a321414809410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=A2=9E=E9=A3=9E?= <331023091@qq.com> Date: Mon, 29 Dec 2025 18:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E8=B0=83=E8=AF=95=E4=BA=BA=E8=84=B8=E8=AF=86?= =?UTF-8?q?=E5=88=AB=EF=BC=9B=E9=AA=8C=E8=AF=81=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E5=92=8C=E4=BA=BA=E8=84=B8?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 + .idea/compiler.xml | 6 +++ .../main/java/com/sw/platecabinet/MyApp.kt | 8 +++- .../sw/platecabinet/activity/BaseActivity.kt | 10 +++-- .../activity/DeviceInitActivity.kt | 37 ++++++++++++++----- .../activity/LoginByFaceActivity.kt | 4 +- .../activity/LoginByPwdActivity.kt | 6 +-- .../com/sw/platecabinet/model/ErrorInfo.kt | 15 +++++++- .../platecabinet/model/request/BindParam.kt | 4 +- .../platecabinet/model/request/LoginParam.kt | 2 +- .../model/response/ApiResponse.kt | 9 +++-- .../model/response/EquipmentUserInfo.kt | 9 +++-- .../model/response/SearchResult.kt | 2 +- .../com/sw/platecabinet/network/ApiClient.kt | 9 +++-- .../sw/platecabinet/network/api/ApiService.kt | 20 ++++++++-- .../network/interceptor/RequestInterceptor.kt | 2 +- .../platecabinet/repository/BaseRepository.kt | 22 +++++++---- .../repository/RemoteRepository.kt | 7 +++- .../viewmodel/SettingViewModel.kt | 4 +- .../platecabinet/viewmodel/UserViewModel.kt | 14 ++++++- .../main/res/layout/activity_device_init.xml | 5 ++- 21 files changed, 141 insertions(+), 55 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3a2b39c --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +SmartPlateCabinet \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/MyApp.kt b/app/src/main/java/com/sw/platecabinet/MyApp.kt index 147b774..bf7bb09 100644 --- a/app/src/main/java/com/sw/platecabinet/MyApp.kt +++ b/app/src/main/java/com/sw/platecabinet/MyApp.kt @@ -1,5 +1,6 @@ package com.sw.platecabinet +import android.util.Log import com.sw.plate.App import com.sw.plate.utils.AppUtil import com.sw.platecabinet.utils.CrashHandler @@ -24,9 +25,14 @@ class MyApp : App() { * 初始化全局数据 */ private fun initGlobalData() { + var deviceId = AppUtil.getUDID(this) + deviceId = "be154831-3466-3ba2-a2ea-57652c919fed" + Log.d("MyApp", "initialize: deviceId=$deviceId") + GlobalData.deviceId = deviceId + GlobalData.appVersion = AppUtil.getAppVersionCode(this).toString() GlobalData.globalEquipmentCode = "202501171634" - GlobalData.appBaseUrl = "http://192.168.1.201:14801" +// GlobalData.appBaseUrl = "http://192.168.1.201:14801" } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt index f7a03cf..39f17d7 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt @@ -200,10 +200,10 @@ abstract class BaseActivity : AppCompatActivity() { private fun disableSystemUICompletely() { Timber.d("disableSystemUICompletely") // 禁用系统手势（Android 10+） - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - window.insetsController?.systemBarsBehavior = - WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - } +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { +// window.insetsController?.systemBarsBehavior = +// WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE +// } // 全屏+隐藏导航栏（所有版本通用） @@ -330,10 +330,12 @@ abstract class BaseActivity : AppCompatActivity() { */ open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) { Timber.d("handleLoginSuccess isAdmin = $isAdmin") + equipmentUserInfo.isIntercept = false val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble() val balanceIsNotEnough = cardBalance <= 0.toDouble() if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) { //提示余额不足弹窗 + equipmentUserInfo.isIntercept = true BalanceNotEnoughDialog(this).show() return } diff --git a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt index b27170d..f6bde28 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt @@ -1,20 +1,22 @@ package com.sw.platecabinet.activity import android.content.Intent +import android.util.Log +import androidx.activity.viewModels import com.sw.plate.utils.AppUtil +import com.sw.plate.utils.ToastUtils import com.sw.platecabinet.GlobalData import com.sw.platecabinet.databinding.ActivityDeviceInitBinding import com.sw.platecabinet.databinding.ItemTitleTimeBinding import com.sw.platecabinet.ext.gone import com.sw.platecabinet.ext.invisible +import com.sw.platecabinet.viewmodel.SettingViewModel /** * 设备初始化界面 */ class DeviceInitActivity : BaseActivity() { -// private val deviceViewModel by viewModels() - override fun inflateViewBinding(): ActivityDeviceInitBinding { return ActivityDeviceInitBinding.inflate(layoutInflater) } @@ -24,9 +26,6 @@ class DeviceInitActivity : BaseActivity() { } override fun initialize() { - var deviceId = AppUtil.getUDID(this) - deviceId = "be154831-3466-3ba2-a2ea-57652c919fed" - GlobalData.deviceId = deviceId // val isSuccess = deviceViewModel.checkEquipmentInfo() // if (isSuccess) { // goLoginActivity() @@ -41,11 +40,29 @@ class DeviceInitActivity : BaseActivity() { // binding.btnInit.setOnClickListener { // deviceViewModel.getDeviceToken() // } - binding.btnInit.gone() - binding.ivQrCode.invisible() - binding.root.postDelayed({ - goLoginActivity() - }, 1000) +// binding.btnInit.gone() +// binding.ivQrCode.invisible() +// binding.root.postDelayed({ +// goLoginActivity() +// }, 1000) + showWaitingDialog("加载中……") + viewModel.getDeviceConfig { deviceConfig -> + runOnUiThread { + if (deviceConfig == null) { + hideWaitingDialog() + ToastUtils.showToast("获取设备配置数据失败") + return@runOnUiThread + } + GlobalData.appId = deviceConfig.arcsoftAppId ?: "" + GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: "" + GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: "" + binding.root.postDelayed({ + hideWaitingDialog() + goLoginActivity() + }, 500) + } + } +// goLoginActivity() } override fun registerDataChange() { diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt index 18dca1c..b66f172 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -81,7 +81,7 @@ class LoginByFaceActivity : BaseActivity(), openRectInfoDraw = true recognizeViewModel.setDrawRectInfoTextValue(true) //viewModel.generateToken() - viewModel.activeEngine() +// viewModel.activeEngine() viewModel.getUserFaceCache() binding.llToPwd.setOnClickListener { @@ -173,7 +173,7 @@ class LoginByFaceActivity : BaseActivity(), recognizeViewModel.recognizeUserId.observe(this, Observer { userId: String? -> Timber.i("recognizeUserId observe userId = $userId") - viewModel.getUserInfoById(memberId = userId?.toIntOrNull()) + viewModel.getUserInfoById(memberId = userId) }) recognizeViewModel.drawRectInfoText.observe(this, Observer { info -> diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt index 3033930..a504208 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt @@ -53,9 +53,9 @@ class LoginByPwdActivity : BaseActivity() { super.handleLoginSuccess(equipmentUserInfo, isAdmin) // val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble() // val balanceIsNotEnough = cardBalance <= 0.toDouble() -// if (balanceIsNotEnough) { -// return -// } + if (equipmentUserInfo.isIntercept) { + return + } LoginByFaceActivity.goInitActivity() finish() } diff --git a/app/src/main/java/com/sw/platecabinet/model/ErrorInfo.kt b/app/src/main/java/com/sw/platecabinet/model/ErrorInfo.kt index c950887..aa31d3c 100644 --- a/app/src/main/java/com/sw/platecabinet/model/ErrorInfo.kt +++ b/app/src/main/java/com/sw/platecabinet/model/ErrorInfo.kt @@ -6,11 +6,22 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo * 错误信息 code == 200 成功 */ data class ErrorInfo( - val code: Int = 200, + val code: String = "200", val msg: String = "", val equipmentUserInfo: EquipmentUserInfo? = null ) { fun isSuccess(): Boolean { - return code == 200 + return code == "00000" } } + +data class DeviceConfig( + var arcsoftAppId: String? = null, + var arcsoftSdkKey: String? = null, + var arcsoftActiveKey: String? = null +) + +data class CodeMsg( + val code: String? = "", + val msg: String? = "" +) diff --git a/app/src/main/java/com/sw/platecabinet/model/request/BindParam.kt b/app/src/main/java/com/sw/platecabinet/model/request/BindParam.kt index 23799a2..0a70260 100644 --- a/app/src/main/java/com/sw/platecabinet/model/request/BindParam.kt +++ b/app/src/main/java/com/sw/platecabinet/model/request/BindParam.kt @@ -14,7 +14,7 @@ data class BindParam( /** * 设备Id */ - val equipmentId: Int? = null, + val equipmentId: String? = null, /** * 设备编号 */ @@ -27,7 +27,7 @@ data class BindParam( * * 会员Id */ - val memberId: Int? = null, + val memberId: String? = null, /** *餐盘编号 */ diff --git a/app/src/main/java/com/sw/platecabinet/model/request/LoginParam.kt b/app/src/main/java/com/sw/platecabinet/model/request/LoginParam.kt index 78eade1..c5dbf79 100644 --- a/app/src/main/java/com/sw/platecabinet/model/request/LoginParam.kt +++ b/app/src/main/java/com/sw/platecabinet/model/request/LoginParam.kt @@ -17,7 +17,7 @@ data class LoginParam( /** * 会员信息 */ - val memberId: Int? = null, + val memberId: String? = null, /** * 密码 */ diff --git a/app/src/main/java/com/sw/platecabinet/model/response/ApiResponse.kt b/app/src/main/java/com/sw/platecabinet/model/response/ApiResponse.kt index 113835a..d55492c 100644 --- a/app/src/main/java/com/sw/platecabinet/model/response/ApiResponse.kt +++ b/app/src/main/java/com/sw/platecabinet/model/response/ApiResponse.kt @@ -1,11 +1,12 @@ package com.sw.platecabinet.model.response data class ApiResponse( - val code: Int, - val success: Boolean? = false, + val code: String, +// val success: Boolean? = false, val msg: String? = "", val data: T? = null, - val result: T? = null, +// val result: T? = null, ) { - fun isSuccess(): Boolean = code == 200 +// fun isSuccess(): Boolean = code == 200 + fun isSuccess(): Boolean = code == "00000" } diff --git a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt index 632a4ca..4787a8c 100644 --- a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt +++ b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt @@ -14,12 +14,12 @@ data class EquipmentUserInfo( /** * 主键 */ - val id: Int? = 0, + val id: Long? = 0, /** * * 设备Id */ - val equipmentId: Int? = 0, + val equipmentId: String? = "", /** * 设备编号 */ @@ -31,7 +31,7 @@ data class EquipmentUserInfo( /** * 会员Id */ - val memberId: Int? = 0, + val memberId: String? = "", /** * 餐盘编号 */ @@ -62,7 +62,8 @@ data class EquipmentUserInfo( /** * 用于cardBalance后续拦截判断 */ - var showBalanceNotEnoughDialog: Boolean = false + var showBalanceNotEnoughDialog: Boolean = false, + var isIntercept: Boolean = false ) : Parcelable { /** diff --git a/app/src/main/java/com/sw/platecabinet/model/response/SearchResult.kt b/app/src/main/java/com/sw/platecabinet/model/response/SearchResult.kt index 4c13bb5..d356f7a 100644 --- a/app/src/main/java/com/sw/platecabinet/model/response/SearchResult.kt +++ b/app/src/main/java/com/sw/platecabinet/model/response/SearchResult.kt @@ -77,7 +77,7 @@ data class SearchResult( // val rewardBalance: String? = "", // @SerializedName("topUpBalance") // val topUpBalance: String? = "" - val id: Int? = 0, + val id: String? = "", val name: String? = "", val phone: String? = "", ) : Parcelable diff --git a/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt b/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt index 34dc5e1..9efd866 100644 --- a/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt +++ b/app/src/main/java/com/sw/platecabinet/network/ApiClient.kt @@ -1,5 +1,6 @@ package com.sw.platecabinet.network +import com.sw.platecabinet.GlobalData import com.sw.platecabinet.MyApp import com.sw.platecabinet.network.api.ApiService import com.sw.platecabinet.network.interceptor.RequestInterceptor @@ -11,10 +12,10 @@ import timber.log.Timber import java.util.concurrent.TimeUnit object ApiClient { - private const val BASE_URL = "https://vip.shuziweidao.com" - private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889/" - - // private const val BASE_URL = "http://192.168.1.8:9092" + //private const val BASE_URL = "https://vip.shuziweidao.com" +// private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889/" + private var DEVICE_BASE_URL = GlobalData.appBaseUrl + // private const val BASE_URL = "http://192.168.1.8:9092" private const val TIME_OUT = 30L // 超时时间(秒) val okHttpClient = OkHttpClient.Builder() diff --git a/app/src/main/java/com/sw/platecabinet/network/api/ApiService.kt b/app/src/main/java/com/sw/platecabinet/network/api/ApiService.kt index 61fb8b2..29f638d 100644 --- a/app/src/main/java/com/sw/platecabinet/network/api/ApiService.kt +++ b/app/src/main/java/com/sw/platecabinet/network/api/ApiService.kt @@ -1,6 +1,7 @@ package com.sw.platecabinet.network.api import com.sw.platecabinet.GlobalData +import com.sw.platecabinet.model.DeviceConfig import com.sw.platecabinet.model.request.BindParam import com.sw.platecabinet.model.request.EquipmentParam import com.sw.platecabinet.model.request.LoginParam @@ -119,7 +120,7 @@ interface ApiService { @POST suspend fun plateUnbind( @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/plateUnbind", - @Field("id") id: Int + @Field("id") id: Long ): ApiResponse /** @@ -167,6 +168,19 @@ interface ApiService { /** * 获取人脸增量数据 */ - @POST("/terminal/neglect/common/app/faceFeature/increment/list") - suspend fun getFaceIncrementList(@Body param:Map): ApiResponse?> + @POST + suspend fun getFaceIncrementList( + @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/faceFeature/increment/list", + @Body param:Map + ): ApiResponse?> + + /** + * 获取设备配置数据 + */ + @GET + suspend fun getDeviceConfig( + @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/getYxEquipmentByEquipmentCode" + ): ApiResponse + + } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/network/interceptor/RequestInterceptor.kt b/app/src/main/java/com/sw/platecabinet/network/interceptor/RequestInterceptor.kt index 889da38..ecc2ac9 100644 --- a/app/src/main/java/com/sw/platecabinet/network/interceptor/RequestInterceptor.kt +++ b/app/src/main/java/com/sw/platecabinet/network/interceptor/RequestInterceptor.kt @@ -17,7 +17,7 @@ class RequestInterceptor : Interceptor { .header("Content-Type", "application/json") .header("Accept", "application/json") // .header("Authorization", "Bearer ${getToken()}") - .header("Authorization", getToken()) +// .header("Authorization", getToken()) .header("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiJiZTE1NDgzMS0zNDY2LTNiYTItYTJlYS01NzY1MmM5MTlmZWQiLCJ0eXBlIjoiNCIsInVzZXJJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDEifQ.sN40cOC-O5WQFrF4IDUs8fFlkNdUKLbJt_rHyTsgYYM") .header("X-DEVICE-CODE", GlobalData.deviceId) .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d") diff --git a/app/src/main/java/com/sw/platecabinet/repository/BaseRepository.kt b/app/src/main/java/com/sw/platecabinet/repository/BaseRepository.kt index c2b0ca9..6748ec9 100644 --- a/app/src/main/java/com/sw/platecabinet/repository/BaseRepository.kt +++ b/app/src/main/java/com/sw/platecabinet/repository/BaseRepository.kt @@ -1,6 +1,8 @@ package com.sw.platecabinet.repository import com.google.gson.JsonParseException +import com.sw.inbound.utils.GsonUtils +import com.sw.platecabinet.model.CodeMsg import com.sw.platecabinet.model.response.ApiResponse import retrofit2.HttpException import timber.log.Timber @@ -18,31 +20,37 @@ abstract class BaseRepository { when (e) { is HttpException -> { - ApiResponse(code = e.code(), msg = e.message()) + val jsonData = e.response()?.errorBody()?.string() + val codeMsg = GsonUtils.fromJson(jsonData, CodeMsg::class.java) + if (codeMsg?.msg.isNullOrBlank()) { + ApiResponse(code = "" + e.code(), msg = e.message()) + } else { + ApiResponse(code = codeMsg?.code?:"", msg = codeMsg?.msg?:"") + } } is SocketTimeoutException -> { - ApiResponse(code = -2, msg = "请求超时: ${e.message}") + ApiResponse(code = "-2", msg = "请求超时: ${e.message}") } is ConnectException -> { - ApiResponse(code = -3, msg = "连接失败: ${e.message}") + ApiResponse(code = "-3", msg = "连接失败: ${e.message}") } is SSLHandshakeException -> { - ApiResponse(code = -4, msg = "SSL握手失败: ${e.message}") + ApiResponse(code = "-4", msg = "SSL握手失败: ${e.message}") } is JsonParseException -> { - ApiResponse(code = -5, msg = "JSON解析错误: ${e.message}") + ApiResponse(code = "-5", msg = "JSON解析错误: ${e.message}") } is IOException -> { - ApiResponse(code = -6, msg = "网络IO错误: ${e.message}") + ApiResponse(code = "-6", msg = "网络IO错误: ${e.message}") } else -> { - ApiResponse(code = -1, msg = "未知错误: ${e.message ?: "无错误信息"}") + ApiResponse(code = "-1", msg = "未知错误: ${e.message ?: "无错误信息"}") } } } diff --git a/app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt b/app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt index 30725f7..f1762ef 100644 --- a/app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt +++ b/app/src/main/java/com/sw/platecabinet/repository/RemoteRepository.kt @@ -1,6 +1,7 @@ package com.sw.platecabinet.repository import com.sw.platecabinet.GlobalData +import com.sw.platecabinet.model.DeviceConfig import com.sw.platecabinet.model.request.BindParam import com.sw.platecabinet.model.request.EquipmentParam import com.sw.platecabinet.model.request.LoginParam @@ -97,7 +98,7 @@ class RemoteRepository constructor( return safeApiCall { apiService.plateBind(param = param) } } - suspend fun plateUnbind(id: Int): ApiResponse { + suspend fun plateUnbind(id: Long ): ApiResponse { return safeApiCall { apiService.plateUnbind(id = id) } } @@ -139,4 +140,8 @@ class RemoteRepository constructor( ) } } + + suspend fun getDeviceConfig(): ApiResponse { + return safeApiCall { apiService.getDeviceConfig() } + } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt index 268eb05..9a7ba76 100644 --- a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt +++ b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt @@ -149,7 +149,7 @@ class SettingViewModel : BaseViewModel() { // } // } - fun unbindPlate(id: Int, block:(Pair)-> Unit) { + fun unbindPlate(id: Long, block:(Pair)-> Unit) { block(null to ErrorInfo()) launchWithLoading { val response = repository.plateUnbind(id) @@ -187,7 +187,7 @@ class SettingViewModel : BaseViewModel() { launchWithLoading { // val bindParam = BindParam(plateNumber = plateNumber) val response = repository.findByPlateNumber(plateNumber) - if (response.code == 200) { + if (response.code == "00000") { _searchUserInfo.value = response.data } else { _searchUserInfo.value = EquipmentUserInfo( diff --git a/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt b/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt index fdd3e9c..855b0a7 100644 --- a/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt +++ b/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt @@ -11,6 +11,7 @@ import com.sw.plate.utils.arcface.facedb.entity.FaceEntity import com.sw.platecabinet.GlobalData import com.sw.platecabinet.GlobalData.globalEquipmentCode import com.sw.platecabinet.GlobalKey +import com.sw.platecabinet.model.DeviceConfig import com.sw.platecabinet.model.request.LoginParam import com.sw.platecabinet.model.response.EquipmentUserInfo import com.sw.platecabinet.model.response.UserFaceModel @@ -140,7 +141,7 @@ class UserViewModel : BaseViewModel() { /** * 通过用户id获取用户信息 */ - fun getUserInfoById(memberId: Int?, action:(EquipmentUserInfo?)->Unit={}) { + fun getUserInfoById(memberId: String?, action:(EquipmentUserInfo?)->Unit={}) { _currentUserInfo.value = null launchWithLoading { val loginParam = LoginParam(memberId = memberId) @@ -159,5 +160,16 @@ class UserViewModel : BaseViewModel() { Timber.d("resetUserInfo") _currentUserInfo.value = null } + fun getDeviceConfig(block: (DeviceConfig?) -> Unit) { +// Timber.tag(TAG).d("getDeviceConfig") + launch { + val response = repository.getDeviceConfig() + if (parseResponse(response)) { + block(response.data) + } else { + block(null) + } + } + } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_device_init.xml b/app/src/main/res/layout/activity_device_init.xml index 940dd59..8499b19 100644 --- a/app/src/main/res/layout/activity_device_init.xml +++ b/app/src/main/res/layout/activity_device_init.xml @@ -28,7 +28,7 @@ android:textColor="@color/white" android:textSize="22sp" android:textStyle="bold" - android:visibility="visible" + android:visibility="invisible" tools:ignore="HardcodedText" /> + tools:src="@mipmap/ic_logo512" + android:visibility="invisible"/> \ No newline at end of file