From afe46e7a96bc408cf1f6bb2d4a798eaf344047a1 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 23 一月 2026 15:27:14 +0800
Subject: [PATCH] 钥匙柜同步柜格实际钥匙数据
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 f7418c1..f669dc7 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
@@ -136,12 +136,35 @@
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);
+ if(isSubmit){
+ boolean isSb = false;
+ //閽ュ寵鐘舵�� 1鍦ㄤ綅 2鍊熷嚭
+ if(1==gridDo.getKeyStatus()){
+ //鍒ゆ柇鏄惁涓�鑷�
+ if(!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);
+ isSb = true;
+ }
+ }else if(2==gridDo.getKeyStatus()){
+ //鍊熷嚭
+ //褰撳墠涓嶄负绌�
+ if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
+ //涓嶄竴鑷�
+ SyncGridDataParam.GridDTO errDo = new SyncGridDataParam.GridDTO();
+ errDo.setActualLable(gridDo.getCurKeyCode());
+ errDo.setBoardCode(bean.getBoardCode());
+ errDo.setChannelCode(bean.getChannelCode());
+ errList.add(errDo);
+ isSb = true;
+ }
+ }
+ addInfo2(gridDo.getGridKey()+"锛岄挜鍖欑姸鎬侊細"+gridDo.getKeyStatus()+"锛岀洰鏍囬挜鍖欙細"+gridDo.getKeyCode()+"锛屽綋鍓嶉挜鍖欙細"+
+ gridDo.getCurKeyCode()+"銆傛槸鍚︿笂鎶ワ細"+(isSb?"涓婃姤":"涓嶄笂鎶�"));
}
}else {
//鏂板
@@ -185,7 +208,9 @@
}
DaoManager.getCabinetGridDao().update(upList);
}
+
if(errList.size()>0){
+ addInfo2("涓嶄竴鑷存暟鎹細"+errList.size());
syncGridData(errList);
}
}
@@ -213,17 +238,18 @@
sb.append(d.getBoardCode()+"_"+d.getChannelCode()+":"+d.getActualLable());
}
EventBus.getDefault().post(new HttpEvent("涓婃姤閿欒閽ュ寵淇℃伅===銆�"+sb.toString()));
+ addInfo2("涓嶄竴鑷存暟鎹細"+sb.toString());
getRetrofitService(Apis.class).syncGridData(ParamsUtil.encodeRequestBody(param))
.compose(RxUtils.schedulersTransformer())
.subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse response) {
-
+ addInfo2("鍚屾鏌滄牸瀹為檯閽ュ寵鏁版嵁"+response.getMessage());
}
@Override
public void onError(@NonNull Throwable e) {
-
+ addInfo2("鍚屾鏌滄牸瀹為檯閽ュ寵鏁版嵁閿欒锛�"+e.getMessage());
}
@Override
@@ -408,7 +434,11 @@
public MutableLiveData<DevConfigBean> getConfidLD() {
return confidLD;
}
-
+ public void addInfo2(String info){
+ /*String s = infoObs.get();
+ s=info+"\n"+s;
+ infoObs.set(s);*/
+ }
public void addInfo(String info){
/*String s = infoObs.get();
s=info+"\n"+s;
--
Gitblit v1.9.3