From c04d741f6daddd9e445a0d00adc42d1c8c45f67f Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 23 一月 2026 10:40:33 +0800
Subject: [PATCH] 钥匙柜同步柜格实际钥匙数据
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 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..f7418c1 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
@@ -27,6 +27,7 @@
import com.doumee.keyCabinet.http.param.DevLoginParam;
import com.doumee.keyCabinet.http.param.FaceUserParam;
import com.doumee.keyCabinet.http.param.RequestBaseObject;
+import com.doumee.keyCabinet.http.param.SyncGridDataParam;
import com.doumee.keyCabinet.http.param.TimeOutUnCloseAlarmParam;
import com.doumee.keyCabinet.utils.BraceletLogUtils;
import com.doumee.keyCabinet.utils.LMobileInfo;
@@ -58,7 +59,11 @@
private MutableLiveData<List<FaceUserBean>> faceLD = new MutableLiveData<>();
private MutableLiveData<DevConfigBean> confidLD = new MutableLiveData<>();
+ private boolean isSubmit = false;
+ public void setSubmit(boolean submit) {
+ isSubmit = submit;
+ }
@ViewModelInject
public MainVM(@NonNull Application application, BaseModel model) {
super(application, model);
@@ -71,14 +76,12 @@
public void devLogin(){
//娓呴櫎鐧诲綍淇℃伅
- MApplication.saveConfigBean(new DevConfigBean());
EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-璇锋眰"));
getRetrofitService(Apis.class).getCabinetInfoForDriver(LMobileInfo.getDeviceUniqueId())
.compose(RxUtils.schedulersTransformer())
.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());
@@ -90,6 +93,7 @@
toast(MApplication.mContext.getString(R.string.guide_toast_1));
}
}else {
+ MApplication.saveConfigBean(new DevConfigBean());
toast(response.getMessage());
}
}
@@ -107,6 +111,7 @@
});
}
+
private void updateDao(List<ManageKeyCabinetBean> beans){
List<CabinetGridDo> gridDos = DaoManager.getCabinetGridDao().loadAll();
HashMap<String,CabinetGridDo> oldMap = new HashMap<>();
@@ -115,6 +120,7 @@
}
List<CabinetGridDo> addList = new ArrayList<>();
List<CabinetGridDo> updateList = new ArrayList<>();
+ List<SyncGridDataParam.GridDTO> errList = new ArrayList<>();
for(ManageKeyCabinetBean bean:beans){
String key = SportUtils.intToHex(Integer.parseInt(bean.getBoardCode()))+SportUtils.intToHex(Integer.parseInt(bean.getChannelCode()));
if(oldMap.containsKey(key)){
@@ -129,6 +135,14 @@
gridDo.setKeyStatus(bean.getKeyStatus());
gridDo.setWorkingStatus(bean.getWorkingStatus());
updateList.add(gridDo);
+ oldMap.remove(key);
+ if(isSubmit&&!isCheck(gridDo.getKeyCode(),gridDo.getCurKeyCode())){
+ SyncGridDataParam.GridDTO errDo = new SyncGridDataParam.GridDTO();
+ errDo.setActualLable(gridDo.getCurKeyCode());
+ errDo.setBoardCode(bean.getBoardCode());
+ errDo.setChannelCode(bean.getChannelCode());
+ errList.add(errDo);
+ }
}else {
//鏂板
CabinetGridDo gridDo = new CabinetGridDo();
@@ -144,9 +158,26 @@
addList.add(gridDo);
}
}
+ if(oldMap.size()>0) {
+ CabinetGridDo[] dels = new CabinetGridDo[oldMap.size()];
+ int i=0;
+ StringBuilder sb = new StringBuilder();
+ for (String key : oldMap.keySet()) {
+ dels[i] = oldMap.get(key);
+ i++;
+ if(sb.length()>0){
+ sb.append(",");
+ }
+ sb.append(oldMap.get(key).getKeyCode());
+ }
+ //鍒犻櫎澶氱殑
+ DaoManager.getCabinetGridDao().delete(dels);
+ addInfo("鍒犻櫎瑙勬牸锛�"+dels.length);
+ }
if(addList.size()>0){
DaoManager.getCabinetGridDao().insert(addList);
}
+
if(updateList.size()>0){
CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
for(int i=0;i<updateList.size();i++){
@@ -154,6 +185,52 @@
}
DaoManager.getCabinetGridDao().update(upList);
}
+ if(errList.size()>0){
+ syncGridData(errList);
+ }
+ }
+
+ private boolean isCheck(String v1,String v2){
+ if(TextUtils.isEmpty(v1)&&TextUtils.isEmpty(v2)){
+ return true;
+ }else if(TextUtils.isEmpty(v1)&&!TextUtils.isEmpty(v2)){
+ return false;
+ }else if(!TextUtils.isEmpty(v1)&&TextUtils.isEmpty(v2)){
+ return false;
+ }
+ return v1.equals(v2);
+ }
+
+ public void syncGridData(List<SyncGridDataParam.GridDTO> errList){
+ SyncGridDataParam param = new SyncGridDataParam();
+ param.setCode(LMobileInfo.getDeviceUniqueId());
+ param.setGridDTOList(errList);
+ StringBuilder sb = new StringBuilder();
+ for(SyncGridDataParam.GridDTO d:errList){
+ if(sb.length()>0){
+ sb.append(",");
+ }
+ sb.append(d.getBoardCode()+"_"+d.getChannelCode()+":"+d.getActualLable());
+ }
+ EventBus.getDefault().post(new HttpEvent("涓婃姤閿欒閽ュ寵淇℃伅===銆�"+sb.toString()));
+ getRetrofitService(Apis.class).syncGridData(ParamsUtil.encodeRequestBody(param))
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
+ @Override
+ public void onNext(@NonNull BaseResponse response) {
+
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
}
public void devHeart(){
@@ -185,9 +262,6 @@
}
public void getFaceDatas() {
- if (true) {
- return;
- }
//showLoading(true);
getRetrofitService(Apis.class).allFaceList( LMobileInfo.getDeviceUniqueId())
.compose(RxUtils.schedulersTransformer())
@@ -201,13 +275,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());
}
@@ -266,13 +340,6 @@
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){
if(updateList.size()>0){
CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
@@ -323,7 +390,7 @@
.subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse response) {
- toast("鍏抽棬鎺ュ彛璋冪敤鎴愬姛");
+
}
@Override
@@ -343,8 +410,8 @@
}
public void addInfo(String info){
- String s = infoObs.get();
- s+=info+"\n";
- infoObs.set(s);
+ /*String s = infoObs.get();
+ s=info+"\n"+s;
+ infoObs.set(s);*/
}
}
--
Gitblit v1.9.3