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 51eefd3..b0aa8f5 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt @@ -489,7 +489,7 @@ abstract class BaseActivity : AppCompatActivity() { Base64.decode(model.faceFeatureStr) ).also { //1-会员、2-临时用户 - it.userType = if (model.isMember) "1" else "2" + it.userType = if (model.member) "1" else "2" it.cardNo = model.cardNo } faceList.add(faceEntity) 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 7b32599..d015a7b 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -861,7 +861,7 @@ class LoginByFaceActivity : BaseActivity(), Base64.decode(faceModel.faceFeatureStr) ).also { //1-会员、2-临时用户 - it.userType = if (faceModel.isMember) "1" else "2" + it.userType = if (faceModel.member) "1" else "2" } val faceId = faceDao.insert(faceEntity) faceEntity.faceId = faceId diff --git a/app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt b/app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt index 136a35c..34625c5 100644 --- a/app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt +++ b/app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt @@ -2,7 +2,6 @@ package com.sw.platecabinet.model.response import android.os.Parcelable -import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize /** @@ -38,5 +37,5 @@ data class UserFaceModel( /** * 是否会员 */ - val isMember: Boolean + val member: Boolean ) : Parcelable \ No newline at end of file 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 89e5d9d..e9a1cb3 100644 --- a/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt +++ b/app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt @@ -9,16 +9,12 @@ import com.sw.plate.utils.ToastUtils import com.sw.plate.utils.arcface.FaceApi 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 import com.sw.platecabinet.utils.SpTool import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import timber.log.Timber @@ -80,7 +76,7 @@ class UserViewModel : BaseViewModel() { } val faceEntityList = list.map { FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)).apply { - userType = if (it.isMember) "1" else "2" + userType = if (it.member) "1" else "2" } } withContext(Dispatchers.Default) {