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/main/MainVM.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
index c511e94..40f82bc 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
@@ -71,7 +71,6 @@
public void devLogin(){
//娓呴櫎鐧诲綍淇℃伅
- MApplication.saveConfigBean(new DevConfigBean());
EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-璇锋眰"));
getRetrofitService(Apis.class).getCabinetInfoForDriver(LMobileInfo.getDeviceUniqueId())
.compose(RxUtils.schedulersTransformer())
@@ -89,6 +88,7 @@
toast(MApplication.mContext.getString(R.string.guide_toast_1));
}
}else {
+ MApplication.saveConfigBean(new DevConfigBean());
toast(response.getMessage());
}
}
@@ -158,12 +158,6 @@
DaoManager.getCabinetGridDao().insert(addList);
}
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵1锛�"+gridDo.getCurKeyCode()));
- }
-
if(updateList.size()>0){
CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
for(int i=0;i<updateList.size();i++){
@@ -215,13 +209,13 @@
List<FaceUserBean> datas = new ArrayList<>();
if(faceBean!=null&&faceBean.getAutoFaceList()!=null){
for(FaceUserBean bean:faceBean.getAutoFaceList()){
- bean.setGroupId("1");
+ bean.setGroupId("0");
}
datas.addAll(faceBean.getAutoFaceList());
}
if(faceBean!=null&&faceBean.getDriverFaceList()!=null){
for(FaceUserBean bean:faceBean.getDriverFaceList()){
- bean.setGroupId("0");
+ bean.setGroupId("1");
}
datas.addAll(faceBean.getDriverFaceList());
}
@@ -330,7 +324,7 @@
.subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse response) {
- toast("鍏抽棬鎺ュ彛璋冪敤鎴愬姛");
+
}
@Override
--
Gitblit v1.9.3