From 0956b5497e1602218f0b6c4797b39d34584e2bec Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 三月 2024 09:32:48 +0800
Subject: [PATCH] 2024年03月21日09:32:35
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 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 29fbb70..5ec3a0c 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,24 +92,34 @@
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鍒颁簯绔�
*/
private void pushTokens() {
-// String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
-// String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
-// if (is_registrationID.equals("true")) {
-// //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
-// return;
-// }
+ String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
+ String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
+ if (is_registrationID.equals("true")) {
+ //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
+ return;
+ }
HdlThreadLogic.runSubThread(new Runnable() {
@Override
@@ -141,14 +147,14 @@
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
-// HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
+ HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
@Override
public void onFailure(HDLException e) {
-// HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
+ HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
}
});
@@ -233,6 +239,7 @@
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
+
}
@@ -388,19 +395,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