From 81e258e6aa59dafce998b4f41b1271a9f5c9aff5 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 30 十月 2025 20:07:26 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 d1d11bd..b9c2d26 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
@@ -78,7 +78,6 @@
.subscribe(new SimpleObserver<BaseResponse<DevConfigBean>>(rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse<DevConfigBean> response) {
- EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-杩斿洖锛�"+ GsonTools.changeGsonToJson(response)));
if(200==response.getCode()){
if(response.getData()!=null){
MApplication.saveConfigBean(response.getData());
@@ -129,6 +128,7 @@
gridDo.setKeyStatus(bean.getKeyStatus());
gridDo.setWorkingStatus(bean.getWorkingStatus());
updateList.add(gridDo);
+ oldMap.remove(key);
}else {
//鏂板
CabinetGridDo gridDo = new CabinetGridDo();
@@ -144,9 +144,26 @@
addList.add(gridDo);
}
}
+ if(oldMap.size()>0) {
+ CabinetGridDo[] dels = new CabinetGridDo[oldMap.size()];
+ int i=0;
+ for (String key : oldMap.keySet()) {
+ dels[i] = oldMap.get(key);
+ i++;
+ }
+ //鍒犻櫎澶氱殑
+ DaoManager.getCabinetGridDao().delete(dels);
+ }
if(addList.size()>0){
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++){
@@ -185,9 +202,6 @@
}
public void getFaceDatas() {
- if (true) {
- return;
- }
//showLoading(true);
getRetrofitService(Apis.class).allFaceList( LMobileInfo.getDeviceUniqueId())
.compose(RxUtils.schedulersTransformer())
@@ -201,13 +215,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());
}
@@ -264,13 +278,6 @@
public List<CabinetGridDo> getOpenGrids(){
return DaoManager.getCabinetGridDao().getOpenGrids();
- }
-
- public void insertGrids(List<CabinetGridDo> addList){
- if(addList.size()>0){
- DaoManager.getCabinetGridDao().insert(addList);
- }
- addInfo("鏇存柊搴撴暟鎹�:鏂板" + addList.size());
}
public void updateGrids(List<CabinetGridDo> updateList){
@@ -344,7 +351,7 @@
public void addInfo(String info){
String s = infoObs.get();
- s+=info+"\n";
+ s=info+"\n"+s;
infoObs.set(s);
}
}
--
Gitblit v1.9.3