From 3966f71e1361bc313966bc6fd07db90874a24a15 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 18 四月 2024 14:30:37 +0800
Subject: [PATCH] 2024年04月18日14:30:35
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 2ed3fac..0f32e3a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -101,11 +101,12 @@
}
+
@Override
protected void onResume() {
super.onResume();
//鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
- AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
portConflictDialog();
// Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
// intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -406,7 +407,7 @@
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null);
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
MqttRecvClient.getInstance().connect();
}
}
@@ -482,6 +483,8 @@
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
+ //闃叉app鍚姩鐨勬椂鍊欐病鏈夌綉缁�(app涔熺櫥褰曚笉浜�),瀵艰嚧鑾峰彇涓嶄簡mqtt杩滅▼杩炴帴淇℃伅;
+ initMqttClient();
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
--
Gitblit v1.8.0