From 83c12d3f28e5c43ecda8eca20cecb68bb0c58e87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 09 十月 2024 11:12:03 +0800
Subject: [PATCH] 2024年10月09日11:12:01
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 d1ad4eb..fbc9de8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,8 +10,6 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
-import android.os.SystemClock;
-import android.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;
@@ -34,16 +32,12 @@
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
-import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
-import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
@@ -77,7 +71,6 @@
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
-import com.huawei.hms.api.Api;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -96,7 +89,6 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
-import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
import okhttp3.ResponseBody;
@@ -263,7 +255,6 @@
}
break;
-
}
@@ -529,9 +520,17 @@
break;
//娑堟伅涓績
case HDLUniMP.UNI_EVENT_REPLY_MINE_MESSAGE_CENTER: {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
+ if (!TextUtils.isEmpty(homeId)) {
+ intent.putExtra("homeId", homeId);
+ }
+ if (!TextUtils.isEmpty(isShowFault)) {
+ intent.putExtra("isShowFault", isShowFault);
+ }
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -1196,7 +1195,9 @@
*/
private void uniGetCurrentDeviceFirmwares(String type, Object data, DCUniMPJSCallback callback) {
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
+ String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧oid
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));//鐢电珯id
+ HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, oid, homeId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
@Override
public void onSuccess(List<DeviceFirmwareBean> obj) {
uniSuccessCallback(type, obj, callback);
@@ -1447,7 +1448,8 @@
*/
private void uniGetCurrentGatewayDrivers(String type, Object data, DCUniMPJSCallback callback) {
String deviceOid = getKeyValue("oid", getKeyValue("data", data));
- HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));//鐢电珯id
+ HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, homeId, new CloudCallBeak<List<GatewayDriverBean>>() {
@Override
public void onSuccess(List<GatewayDriverBean> obj) {
uniSuccessCallback(type, obj, callback);
--
Gitblit v1.8.0