From c270637fca83139eed0735096ce2685694d23ef2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 三月 2024 10:38:18 +0800
Subject: [PATCH] 2024年03月21日10:38:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 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 aa89411..5ec3a0c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -92,13 +92,23 @@
         this.initMqttClient();
         //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
         this.pushTokens();
-        //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
+//        //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
         this.clickJpushNotificationMessage();
         //鍒濆鍖栨潈闄�
         this.requestPermissions();
 
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+//        Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
+//        intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+//        intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
+//        _mActivity.startActivity(intent);
+        //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
+//        this.clickJpushNotificationMessage();
+    }
 
     /**
      * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
@@ -385,21 +395,22 @@
      * 鍒濆鍖杕qtt瀹㈡埛绔�
      */
     public void initMqttClient() {
-
-        HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
-            @Override
-            public void onSuccess(MqttInfo info) {
-                if (info != null) {
-                    MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
-                    MqttRecvClient.getInstance().connect();
+        if (!MqttRecvClient.getInstance().isInit()) {
+            HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
+                @Override
+                public void onSuccess(MqttInfo info) {
+                    if (info != null) {
+                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+                        MqttRecvClient.getInstance().connect();
+                    }
                 }
-            }
 
-            @Override
-            public void onFailure(HDLException e) {
-                HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
-            }
-        });
+                @Override
+                public void onFailure(HDLException e) {
+                    HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+                }
+            });
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

--
Gitblit v1.8.0