From 54a8c79222bba0644b02fe1dbc5d75e26ea50b5d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 14 十一月 2023 18:17:58 +0800
Subject: [PATCH] 2023年11月14日18:17:48
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 03ca70c..4885c41 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,6 +6,8 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.Process;
+import android.text.TextUtils;
import android.view.View;
import com.google.gson.Gson;
@@ -20,13 +22,16 @@
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
+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.AppManagerUtils;
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.ModbusResponse;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
@@ -47,6 +52,8 @@
private ActivityMyPowerStationBinding viewBinding;
private int currentFragmentIndex = 1;
private EventListener allTopicsListener;
+
+ private int backPressTimes;
@Override
@@ -204,7 +211,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===========" + new Gson().toJson(response));
+ 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());
@@ -232,22 +239,30 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触", e.getMessage(), e.getCode());
+ 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;
}
@@ -276,4 +291,34 @@
}
+ /**
+ * 鐐瑰嚮杩斿洖閿殑浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ if (AppManagerUtils.getAppManager().getActivitySize() <= 1) {
+ if (backPressTimes == 0) {
+ HdlThreadLogic.toast(_mActivity, R.string.kill_app);
+ backPressTimes = 1;
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } finally {
+ backPressTimes = 0;
+ }
+ }
+ }.start();
+ return;
+ } else {
+ AppManagerUtils.getAppManager().finishAllActivity();
+ Process.killProcess(Process.myPid());
+ }
+ }
+ super.onBackPressed();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0