From 22881a4d6409c7d17867e1d40bf81a13578208df Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java
index db88e0b..e1a695a 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java
@@ -49,8 +49,10 @@
* @param type //0锛氱鐞嗗憳锛�1锛氬徃鏈�
*/
public void getMemberIdByCode(String code,String type){
- //showLoading(true);
- getRetrofitService(Apis.class).getMemberIdByCode(code)
+ GetMemberIdByCodeParam param = new GetMemberIdByCodeParam();
+ param.setUserType("0".equals(type)?1:0);
+ param.setCode(code);
+ getRetrofitService(Apis.class).getMemberIdByCode(ParamsUtil.encodeRequestBody(param))
.compose(RxUtils.schedulersTransformer())
.subscribe(new SimpleObserver<BaseResponse<Integer>>(rxJavaGcManager) {
@Override
@@ -70,7 +72,7 @@
}
}
}else {
- //toast(response.getMessage());
+ doAction(8,response.getMessage());
}
}
@@ -92,6 +94,7 @@
*/
public void alcoholTestAlarm(String data){
AlcoholTestAlarmParam param = new AlcoholTestAlarmParam();
+ param.setCabinetId(MApplication.getConfigBean().getId());
param.setMemberId(MApplication.getLoginBean().getMemberId());
param.setAlcoholNum(data);
showLoading(true);
--
Gitblit v1.9.3