From 07ef58effb8a570cd8a917e5a0c4d2b57e0fd5d3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 13:43:29 +0800
Subject: [PATCH] 2024年03月20日13:43:24
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..db93bb2 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 {
@@ -96,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鍒颁簯绔�
@@ -226,11 +232,6 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
- //鏂紑mqtt杩炴帴
- if (MqttRecvClient.getInstance() != null) {
- MqttRecvClient.getInstance().stop();
- }
-
}
private void initView() {
@@ -399,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