From c7c07eaa32ca7b137b1ac028d17beee0ebcf9a0b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 三月 2024 15:22:15 +0800
Subject: [PATCH] 2024年03月26日15:22:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 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 679962f..1ee7d7c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,14 +2,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.app.ActivityCompat;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.location.Location;
-import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Process;
@@ -18,7 +15,6 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -67,7 +63,7 @@
 
 
 /**
- * 鎴戠殑鐢电珯鐣岄潰
+ * B绔�-鐢电珯鐣岄潰
  */
 public class MyPowerStationActivity extends CustomBaseActivity {
 
@@ -101,6 +97,17 @@
         //鍒濆鍖栨潈闄�
         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();
     }
 
 
@@ -226,11 +233,6 @@
         HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
         //绉婚櫎鐩戝惉
         HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
-        //鏂紑mqtt杩炴帴
-        if (MqttRecvClient.getInstance() != null) {
-            MqttRecvClient.getInstance().stop();
-        }
-
     }
 
     private void initView() {
@@ -394,20 +396,22 @@
      * 鍒濆鍖杕qtt瀹㈡埛绔�
      */
     public void initMqttClient() {
-
-        HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
-            @Override
-            public void onSuccess(MqttInfo info) {
-                if (info != null) {
-                    MqttRecvClient.init(_mActivity, info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+        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