From 8d459194e620a691994fb8226fb08c51a3dd8065 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期三, 29 十月 2025 21:33:24 +0800
Subject: [PATCH] 钥匙柜

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceVM.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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 9a45189..db88e0b 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
@@ -9,6 +9,7 @@
 import com.doumee.keyCabinet.bean.CabinetFaceBean;
 import com.doumee.keyCabinet.bean.FaceUserBean;
 import com.doumee.keyCabinet.bean.KeyCabinetBean;
+import com.doumee.keyCabinet.event.HttpEvent;
 import com.doumee.keyCabinet.http.Apis;
 import com.doumee.keyCabinet.http.param.AlcoholTestAlarmParam;
 import com.doumee.keyCabinet.http.param.BaseResponse;
@@ -21,9 +22,14 @@
 import com.doumee.lib_coremodel.base.BaseModel;
 import com.doumee.lib_coremodel.base.DataViewModel;
 import com.doumee.lib_coremodel.http.rxJava.SimpleObserver;
+import com.doumee.lib_coremodel.http.utils.GsonTools;
 import com.doumee.lib_coremodel.http.utils.RxUtils;
+import com.doumee.lib_coremodel.util.StringUtil;
+
+import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class FaceVM extends DataViewModel {
@@ -43,26 +49,28 @@
      * @param type //0锛氱鐞嗗憳锛�1锛氬徃鏈�
      */
     public void getMemberIdByCode(String code,String type){
-        showLoading(true);
+        //showLoading(true);
         getRetrofitService(Apis.class).getMemberIdByCode(code)
                 .compose(RxUtils.schedulersTransformer())
                 .subscribe(new SimpleObserver<BaseResponse<Integer>>(rxJavaGcManager) {
                     @Override
                     public void onNext(@NonNull BaseResponse<Integer> response) {
+                        EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
+                                "鑾峰彇IC鍗$敤鎴蜂富閿� - 鍙告満:"+code+", 杩斿洖锛�"+ GsonTools.changeGsonToJson(response)));
                         if(200==response.getCode()){
                             //鏌ヨ鏁版嵁
                             if(response.getData()!=null){
                                 if("0".equals(type)){
                                     MApplication.getLoginBean().setAutoMemberId(response.getData());
-                                    //doAction();
+                                    doAction(6);
                                 }else {
-                                    MApplication.getLoginBean().setAutoMemberId(response.getData());
+                                    MApplication.getLoginBean().setMemberId(response.getData());
                                     MApplication.getLoginBean().setAuthType(1);
-                                    //doAction();
+                                    doAction(7);
                                 }
                             }
                         }else {
-                            toast(response.getMessage());
+                            //toast(response.getMessage());
                         }
                     }
 
@@ -73,7 +81,7 @@
 
                     @Override
                     public void onComplete() {
-                        hideLoading();
+                        //hideLoading();
                     }
                 });
     }
@@ -85,6 +93,7 @@
     public void alcoholTestAlarm(String data){
         AlcoholTestAlarmParam param = new AlcoholTestAlarmParam();
         param.setMemberId(MApplication.getLoginBean().getMemberId());
+        param.setAlcoholNum(data);
         showLoading(true);
         getRetrofitService(Apis.class).alcoholTestAlarm(ParamsUtil.encodeRequestBody(param))
                 .compose(RxUtils.schedulersTransformer())

--
Gitblit v1.9.3