From 9d6dd1ccc62eb2c7030eb0cc1e6aa05d7ee67458 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 10:11:10 +0800
Subject: [PATCH] 2024年03月20日10:11:04

---
 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 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 843528c..db93bb2 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鍒颁簯绔�
@@ -222,11 +232,6 @@
         HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
         //绉婚櫎鐩戝惉
         HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
-        //鏂紑mqtt杩炴帴
-        if (MqttRecvClient.getInstance() != null) {
-            MqttRecvClient.getInstance().stop();
-        }
-
     }
 
     private void initView() {
@@ -395,7 +400,8 @@
             @Override
             public void onSuccess(MqttInfo info) {
                 if (info != null) {
-                    MqttRecvClient.init(_mActivity, info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+                    MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+                    MqttRecvClient.getInstance().connect();
                 }
             }
 

--
Gitblit v1.8.0