From bfc932a6348457a022269ea993117c41cc051fe5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 29 八月 2025 17:47:35 +0800
Subject: [PATCH] 2025年08月29日17:47:33
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 58bd332..9ebe37d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -54,6 +54,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.MessageBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
@@ -63,6 +64,7 @@
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
+import com.hdl.photovoltaic.ui.message.MessageInfoActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterListActivity;
import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
@@ -401,6 +403,11 @@
this.uniDeleteOid(mode_type, data, callback);
}
break;
+ //璁惧娓呯┖杩愯鏁版嵁
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_clear_data: {
+ this.uniDeviceClearData(mode_type, data, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -669,6 +676,21 @@
}
break;
+ //鎵撳紑娑堟伅璇︽儏
+ case HDLUniMP.UNI_EVENT_REPLY_Message_Center_Detail: {
+ try {
+ String msgId = getKeyValue("msgId", getKeyValue("data", data));//鍞竴鏍囪瘑
+ MessageBean messageBean = new MessageBean();
+ messageBean.setMsgId(Long.parseLong(msgId));
+ Intent intent = new Intent();
+ intent.putExtra("messageBean", new Gson().toJson(messageBean));
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setClass(HDLApp.getInstance(), MessageInfoActivity.class);
+ HDLApp.getInstance().startActivity(intent);
+ } catch (Exception e) {
+ }
+ }
+ break;
}
@@ -819,7 +841,8 @@
break;
//璁惧瀹氫綅
case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: {
- this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);;
+ this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);
+ ;
}
break;
}
@@ -982,8 +1005,7 @@
*/
private void uniGetDeviceFind(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
- JsonArray jsonArray = new JsonArray();
- JsonObject jObject = null;
+ JsonObject jObject = new JsonObject();
String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
if (!TextUtils.isEmpty(attribute_data)) {
try {
@@ -992,8 +1014,7 @@
jObject = new JsonObject();
}
}
- jsonArray.add(jObject);
- TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jObject, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String s) {
if (callback != null) {
@@ -2950,6 +2971,28 @@
});
}
+ /**
+ * 璁惧娓呯┖杩愯鏁版嵁
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniDeviceClearData(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().DeviceClearData(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
--
Gitblit v1.8.0