From 61ec279cdb0ce5afdbec89e9a7b9f890bd5ab97d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 02 九月 2025 14:45:19 +0800
Subject: [PATCH] 2025年09月02日14:45:16
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 9 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 679940a..55928f7 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;
@@ -62,7 +63,9 @@
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.HelpWebActivity;
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 +404,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 +677,29 @@
}
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;
+ //鎵撳紑C绔府鍔╅〉闈�
+ case HDLUniMP.UNI_EVENT_REPLY_help_Detail: {
+ Intent intent = new Intent();
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setClass(HDLApp.getInstance(), HelpWebActivity.class);
+ HDLApp.getInstance().startActivity(intent);
+ }
+ break;
}
@@ -815,6 +846,12 @@
//uni鑾峰彇鍥剧墖
case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_SELECTED_IMAGE: {
+ }
+ break;
+ //璁惧瀹氫綅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: {
+ this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);
+ ;
}
break;
}
@@ -965,6 +1002,47 @@
@Override
public void onError(HDLLinkException e) {
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
+ /**
+ * 璁惧瀹氫綅
+ */
+ private void uniGetDeviceFind(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ JsonObject jObject = new JsonObject();
+ String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(attribute_data)) {
+ try {
+ jObject = new Gson().fromJson(attribute_data, JsonObject.class);
+ } catch (Exception ignored) {
+ jObject = new JsonObject();
+ }
+ }
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jObject, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String s) {
+ if (callback != null) {
+ try {
+ if (s.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
+ } else if (s.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, s, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(type, s, callback);
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
if (callback != null) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
@@ -1670,7 +1748,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1709,7 +1787,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1923,7 +2001,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1962,7 +2040,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -2525,15 +2603,15 @@
if (gatewayBean == null) {
continue;
}
- if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
- || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
- if (gatewayBean.isActivate()) {
+ if (gatewayBean.isActivate()) {
+ if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
+ || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
inverterList.add(gatewayBean);
} else {
- inverterUnactivatedList.add(gatewayBean);
+ lcList.add(gatewayBean);
}
} else {
- lcList.add(gatewayBean);
+ inverterUnactivatedList.add(gatewayBean);
}
}
newList.addAll(inverterUnactivatedList);
@@ -2902,6 +2980,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