From 3f41182984d69d7fae703776edd1591f48dff93f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 十一月 2023 17:13:05 +0800
Subject: [PATCH] 2023年11月22日17:12:40
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index d80232f..48627f5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -4,14 +4,20 @@
import androidx.appcompat.content.res.AppCompatResources;
import android.Manifest;
+import android.content.ComponentName;
+import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.IBinder;
import android.os.Process;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
+import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
@@ -19,18 +25,23 @@
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
+import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.AesUtils;
import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.Md5Utils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
+import com.hdl.sdk.link.core.bean.LinkResponse;
import com.hdl.sdk.link.core.bean.ModbusResponse;
-import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
@@ -38,7 +49,15 @@
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
+
+import okhttp3.ResponseBody;
/**
@@ -62,7 +81,6 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -204,12 +222,15 @@
@Override
public void onMessage(Object msg) {
+ if (msg == null) {
+ return;
+ }
if (msg instanceof ModbusResponse) {
ModbusResponse response = (ModbusResponse) msg;
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁==="+new Gson().toJson(response),false);
+ HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -217,6 +238,17 @@
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
// }
+ } else if (msg instanceof LinkResponse) {
+ LinkResponse linkResponse = (LinkResponse) msg;
+ if (linkResponse.getTopic() == null) {
+ return;
+ }
+ if (linkResponse.getTopic().endsWith("/ota/device/progress/up")) {
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(linkResponse.getTopic());
+ uniCallBackBaseBean.setData(linkResponse.getData());
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
+ }
}
}
};
@@ -237,22 +269,30 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触==="+e.getMessage(), e.getCode(),true);
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触===" + e.getMessage(), e.getCode(), true);
}
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
+ public void onEventMessage(BaseEventBus event) {
//缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
if (event == null) {
+ return;
+ }
+ if (TextUtils.isEmpty(event.getTopic())) {
+ return;
+ }
+ String[] topics = event.getTopic().split("/");
+ //涓婚涓嶇鍚堣鍒欎笉澶勭悊
+ if (topics.length < 3) {
return;
}
int index = -1;
List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- if (gatewayBean.getGatewayId().equals(event.getGatewayId())) {
+ if (gatewayBean.getGatewayId().equals(topics[2])) {
index = i;
break;
}
@@ -311,4 +351,5 @@
super.onBackPressed();
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0