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 | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 a1c86b8..55928f7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -63,6 +63,7 @@
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;
@@ -691,6 +692,14 @@
}
}
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;
}
@@ -1005,8 +1014,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 {
@@ -1015,8 +1023,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) {
@@ -1741,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;
}
@@ -1780,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;
}
@@ -1994,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;
}
@@ -2033,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;
}
--
Gitblit v1.8.0