From 30b7d526263abf634ee1003a572930822e81c8a2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 24 七月 2024 19:26:46 +0800
Subject: [PATCH] 2024年07月24日19:26:40
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 2891e40..7aa3842 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -51,6 +51,7 @@
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
+import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
@@ -348,6 +349,16 @@
break;
//璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
+ this.uniOidEditName(mode_type, data, callback);
+ }
+ break;
+ //鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NOT_RUN_DEVICE_LIST: {
+ this.uniGetListNotRun(mode_type, data, callback);
+ }
+ break;
+ //蹇嵎寮�鍚�嗗彉鍣�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST: {
this.uniOidEditName(mode_type, data, callback);
}
break;
@@ -1757,6 +1768,7 @@
if (cUserInfo == null) {
return;
}
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
UserConfigManage.getInstance().Save();
@@ -2161,8 +2173,9 @@
}
//EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
- baseEventBus.setData(list);
+ baseEventBus.setData(homeId);
EventBus.getDefault().post(baseEventBus);
//杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
@@ -2330,7 +2343,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2352,7 +2365,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2399,7 +2412,7 @@
/**
* 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2421,6 +2434,51 @@
});
}
+ /**
+ * 鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniGetListNotRun(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().getListNotRun(homeId, new CloudCallBeak<List<NotRunBean>>() {
+ @Override
+ public void onSuccess(List<NotRunBean> obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ紑鏈�
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniSetDeviceStartup(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().setDeviceStartup(homeId, aryJson, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
--
Gitblit v1.8.0