From fab8c02a0aa8f941a507bdcb3e4d72deb6eb2242 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 24 十月 2025 14:53:18 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetVM.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetVM.java
index c99ca2e..2a338f5 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetVM.java
@@ -1,6 +1,7 @@
package com.doumee.keyCabinet.ui.keyCabinet;
import android.app.Application;
+import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.databinding.ObservableField;
@@ -9,11 +10,15 @@
import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.bean.CabinetDetailBean;
+import com.doumee.keyCabinet.bean.LoginBean;
import com.doumee.keyCabinet.bean.ManageKeyCabinetBean;
+import com.doumee.keyCabinet.dao.CabinetGridDo;
+import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.http.Apis;
import com.doumee.keyCabinet.http.param.BaseResponse;
import com.doumee.keyCabinet.http.param.BatchOpenGridAdminParam;
import com.doumee.keyCabinet.http.param.CancelFaultParam;
+import com.doumee.keyCabinet.http.param.CloseGridParam;
import com.doumee.keyCabinet.http.param.MarkFaultParam;
import com.doumee.keyCabinet.http.param.MarkRepairParam;
import com.doumee.keyCabinet.utils.ParamsUtil;
@@ -21,6 +26,8 @@
import com.doumee.lib_coremodel.base.DataViewModel;
import com.doumee.lib_coremodel.http.rxJava.SimpleObserver;
import com.doumee.lib_coremodel.http.utils.RxUtils;
+
+import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
@@ -40,7 +47,7 @@
}
public void getCabinetDetail(){
- CabinetDetailBean bean = new CabinetDetailBean();
+ /*CabinetDetailBean bean = new CabinetDetailBean();
bean.setGridNum(24);
bean.setOnlineKeyNum(1);
bean.setOutKeyNum(2);
@@ -95,11 +102,8 @@
b4.setWorkingStatus(1);
b4.setBindStatus(1);
- datasLD.setValue(datas);
+ datasLD.setValue(datas);*/
- if(true){
- return;
- }
showLoading(true);
getRetrofitService(Apis.class).getCabinetDetail(MApplication.getLoginBean().getToken(),
MApplication.getConfigBean().getId())
@@ -110,6 +114,7 @@
if(200==response.getCode()){
dataOb.set(response.getData());
if(response.getData()!=null){
+ MApplication.getLoginBean().setMemberId(response.getData().getMemberId());
if(response.getData().getCabinetGridInfoVOList()!=null){
datasLD.setValue(response.getData().getCabinetGridInfoVOList());
}else {
@@ -136,14 +141,14 @@
}
public void batchOpenGridAdmin(List<Integer> gridIdList,boolean isAll){
- if(isAll) {
+ /*if(isAll) {
doAction(8);
}else {
doAction(10);
}
if(true){
return;
- }
+ }*/
showLoading(true);
BatchOpenGridAdminParam param = new BatchOpenGridAdminParam();
param.setCabinetId(MApplication.getConfigBean().getId());
@@ -156,6 +161,7 @@
public void onNext(@NonNull BaseResponse response) {
if(200==response.getCode()){
if(isAll) {
+ toast("鎵归噺寮�闂ㄦ垚鍔�");
doAction(8);
}else {
doAction(10);
@@ -190,6 +196,7 @@
@Override
public void onNext(@NonNull BaseResponse response) {
if(200==response.getCode()){
+ toast("鏍囪鏌滄牸姝ｅ父鎴愬姛");
getCabinetDetail();
}else {
toast(response.getMessage());
@@ -220,6 +227,7 @@
@Override
public void onNext(@NonNull BaseResponse response) {
if(200==response.getCode()){
+ toast("鏍囪鏌滄牸鏁呴殰鎴愬姛");
getCabinetDetail();
}else {
toast(response.getMessage());
@@ -250,6 +258,7 @@
@Override
public void onNext(@NonNull BaseResponse response) {
if(200==response.getCode()){
+ toast("鏍囪缁翠慨淇濆吇鎴愬姛");
getCabinetDetail();
}else {
toast(response.getMessage());
@@ -268,6 +277,42 @@
});
}
+ /**
+ * 鍏抽棬
+ * @param gridDo
+ */
+ public void closeGrid(CabinetGridDo gridDo){
+ CloseGridParam param = new CloseGridParam();
+ LoginBean loginBean = MApplication.getLoginBean();
+ param.setCabinetId(MApplication.getConfigBean().getId());
+ param.setAuthType(loginBean.getAuthType());
+ param.setMemberId(loginBean.getMemberId());
+ param.setGridId(gridDo.getGridId());
+ param.setKeyStatus(!TextUtils.isEmpty(gridDo.getCurKeyCode())?1:2);
+ toast(gridDo.getGridKey()+"鍏抽棴锛屽綋鍓嶉挜鍖欏彿锛�"+gridDo.getCurKeyCode());
+ getRetrofitService(Apis.class).closeGrid(ParamsUtil.encodeRequestBody(param))
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
+ @Override
+ public void onNext(@NonNull BaseResponse response) {
+ if(response.getCode()==200){
+ getCabinetDetail();
+ doAction(11);
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
public MutableLiveData<List<ManageKeyCabinetBean>> getDatasLD() {
return datasLD;
}
--
Gitblit v1.9.3