From 53cfbb7c949edc8e3d0b624e251afbad1a1c74ca Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 08 一月 2024 18:03:18 +0800
Subject: [PATCH] 2024年01月08日18:03:16
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 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 d2289a6..9e76eff 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -17,6 +17,7 @@
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
@@ -68,11 +69,7 @@
private ActivityMyPowerStationBinding viewBinding;
private int currentFragmentIndex = 1;
private EventListener allTopicsListener;
-
private int backPressTimes;
-
- private NetworkChangeReceiver networkChangeReceiver;
-
@Override
public Object getContentView() {
@@ -91,8 +88,7 @@
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
this.initMqttClient();
-
- //涓婁紶鏋佸厜娉ㄥ唽ID
+ //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
this.pushTokens();
//鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
this.clickJpushNotificationMessage();
@@ -104,9 +100,15 @@
/**
- * 涓婁紶鏋佸厜娉ㄥ唽ID
+ * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
*/
private void pushTokens() {
+ String is_registrationID = HDLApp.getInstance().getKey("registrationID");
+ if (is_registrationID.equals("true")) {
+ //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
+ return;
+ }
+
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
@@ -133,6 +135,7 @@
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
+ HDLApp.getInstance().setInfoMap("registrationID", "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + finalRegistrationID, true);
}
@@ -157,9 +160,9 @@
boolean isBoolean = PermissionUtils.isNotificationEnabled(_mActivity);
if (!isBoolean) {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
- confirmationCancelDialog.setTitle("鎻愮ず");
- confirmationCancelDialog.setContent("閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.");
- confirmationCancelDialog.setConfirmation("鍓嶅線璁剧疆");
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.no_permissions_unable_to_receive_push));
+ confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
@@ -179,15 +182,6 @@
}
}
- /**
- * 鐩戝惉缃戠粶鐘舵�佸彉鍖�
- */
- private void networkMonitoring() {
- IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
- networkChangeReceiver = new NetworkChangeReceiver();
- registerReceiver(networkChangeReceiver, intentFilter);
- }
private void initEvent() {
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -225,9 +219,6 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
- //绉婚櫎鐩戝惉缃戠粶鐘舵�佸彉鍖�
- unregisterReceiver(networkChangeReceiver);
-
}
private void initView() {
@@ -383,12 +374,8 @@
}
}
}
- }
-
- ;
- HDLLinkLocalSdk.getInstance().
-
- registerAllTopicsListener(allTopicsListener);
+ };
+ HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener);
}
/**
--
Gitblit v1.8.0