From 4bc924d0ce29560a5e1ad1adf1042de032d954a1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 14:50:56 +0800
Subject: [PATCH] 2025年12月04日14:50:54
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 315f9ab..e70dad0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -111,6 +111,10 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+//// //閫氱煡鏍忕偣鍑昏繘鏉ワ紝闃叉搴旂敤鍦ㄥ悗鍙版椂琚噸澶嶅惎鍔�,闃块噷浜戞帹鍔ㄩ�氱煡鎸囧畾鎵撳紑鏌愪釜Activity锛屾病鏈夎缃瓼lags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);榛樿鍚姩鏂板疄渚嬶紝瀵艰嚧澶氫釜瀹炰緥
+// if (!isTaskRoot()) {
+// finish();
+// }
setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF1C1C1E));
//鍒濆鍖栫鐗�
@@ -151,6 +155,7 @@
if (TextUtils.isEmpty(data)) {
return;
}
+// PushMessageInfoBean pushMessageInfoBean = new Gson().fromJson(data, PushMessageInfoBean.class);
PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
return;
@@ -287,12 +292,6 @@
//鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
portConflictDialog();
-// Intent intent = new Intent(_mActivity, BPowerStationActivity.class);
-// intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-// intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
-// _mActivity.startActivity(intent);
- //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
-// this.clickJpushNotificationMessage();
}
@@ -325,7 +324,7 @@
// UserConfigManage.getInstance().setRegistrationID(registrationID);
// UserConfigManage.getInstance().Save();
String finalRegistrationID = registrationID;
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
@@ -359,18 +358,13 @@
* @param token 浠ょ墝
*/
private void sendPushTokenToServer(final String token) {
+
if (TextUtils.isEmpty(token)) {
return;
}
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
-
- if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setToken(token);
- UserConfigManage.getInstance().setPushId(pushId);
- UserConfigManage.getInstance().Save();
- }
HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
}
@@ -815,6 +809,9 @@
showFragment();
}
} else if (event.getTopic().contains(ConstantManage.refresh_push_token)) {
+ String token = event.getType();
+ UserConfigManage.getInstance().setPushToken(token);
+ UserConfigManage.getInstance().Save();
//pushToken鏇存柊
sendPushTokenToServer(UserConfigManage.getInstance().getPushToken());
}
@@ -881,15 +878,16 @@
*/
private void clickNotificationMessageTab() {
//瑙﹀彂娑堟伅鐐瑰嚮浜嬩欢
- viewBinding.myMessageBottomIl2.clickTv.performClick();
-// if (currentFragmentIndex == 2) {
-// return;
-// }
-// currentFragmentIndex = 2;
-// bottomViewChangeOfStyle();
-// showFragment();
-// HdlCommonLogic.lowerTagType = LowerTagType.message;
-// HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
+// viewBinding.myMessageBottomIl2.clickTv.performClick();
+ if (currentFragmentIndex == 2) {
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
+ return;
+ }
+ currentFragmentIndex = 2;
+ bottomViewChangeOfStyle();
+ showFragment();
+ HdlCommonLogic.lowerTagType = LowerTagType.message;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
}
--
Gitblit v1.8.0