restaurant/SmartPlateCabinet
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改会员字段名称

Browse Source
This commit is contained in:
lvmeng
2026-03-10 08:32:18 +08:00
parent 0a110020b9
commit e63d3f7624
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
+1 -1
View File
@@ -489,7 +489,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
Base64.decode(model.faceFeatureStr) Base64.decode(model.faceFeatureStr)
).also { ).also {
//1-会员、2-临时用户 //1-会员、2-临时用户
it.userType = if (model.isMember) "1" else "2" it.userType = if (model.member) "1" else "2"
it.cardNo = model.cardNo it.cardNo = model.cardNo
} }
faceList.add(faceEntity) faceList.add(faceEntity)
app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+1 -1
View File
@@ -861,7 +861,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
Base64.decode(faceModel.faceFeatureStr) Base64.decode(faceModel.faceFeatureStr)
).also { ).also {
//1-会员、2-临时用户 //1-会员、2-临时用户
it.userType = if (faceModel.isMember) "1" else "2" it.userType = if (faceModel.member) "1" else "2"
} }
val faceId = faceDao.insert(faceEntity) val faceId = faceDao.insert(faceEntity)
faceEntity.faceId = faceId faceEntity.faceId = faceId
app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt
+1 -2
View File
@@ -2,7 +2,6 @@ package com.sw.platecabinet.model.response
import android.os.Parcelable import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
/** /**
@@ -38,5 +37,5 @@ data class UserFaceModel(
/** /**
* 是否会员 * 是否会员
*/ */
val isMember: Boolean val member: Boolean
) : Parcelable ) : Parcelable
app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt
+1 -5
View File
@@ -9,16 +9,12 @@ import com.sw.plate.utils.ToastUtils
import com.sw.plate.utils.arcface.FaceApi import com.sw.plate.utils.arcface.FaceApi
import com.sw.plate.utils.arcface.facedb.entity.FaceEntity import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
import com.sw.platecabinet.GlobalData import com.sw.platecabinet.GlobalData
import com.sw.platecabinet.GlobalData.globalEquipmentCode
import com.sw.platecabinet.GlobalKey import com.sw.platecabinet.GlobalKey
import com.sw.platecabinet.model.DeviceConfig import com.sw.platecabinet.model.DeviceConfig
import com.sw.platecabinet.model.request.LoginParam 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.model.response.UserFaceModel
import com.sw.platecabinet.utils.SpTool import com.sw.platecabinet.utils.SpTool
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import timber.log.Timber import timber.log.Timber
@@ -80,7 +76,7 @@ class UserViewModel : BaseViewModel() {
} }
val faceEntityList = list.map { val faceEntityList = list.map {
FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)).apply { 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) { withContext(Dispatchers.Default) {