From 1c91b62ea573082581e72fd433d02e3dc52dbf51 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 一月 2026 11:03:29 +0800
Subject: [PATCH] 2026年01月05日11:00:26 升级gradle和uni库
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 75 ++++---------------------------------
1 files changed, 9 insertions(+), 66 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 4265160..8f44ed1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -75,7 +75,7 @@
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import com.umeng.analytics.MobclickAgent;
+//import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -85,7 +85,6 @@
import java.util.List;
import java.util.Objects;
-import cn.jpush.android.api.JPushInterface;
/**
@@ -111,7 +110,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-// //閫氱煡鏍忕偣鍑昏繘鏉ワ紝闃叉搴旂敤鍦ㄥ悗鍙版椂琚噸澶嶅惎鍔�,闃块噷浜戞帹鍔ㄩ�氱煡鎸囧畾鎵撳紑鏌愪釜Activity锛屾病鏈夎缃瓼lags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);榛樿鍚姩鏂板疄渚嬶紝瀵艰嚧澶氫釜瀹炰緥
+//// //閫氱煡鏍忕偣鍑昏繘鏉ワ紝闃叉搴旂敤鍦ㄥ悗鍙版椂琚噸澶嶅惎鍔�,闃块噷浜戞帹鍔ㄩ�氱煡鎸囧畾鎵撳紑鏌愪釜Activity锛屾病鏈夎缃瓼lags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);榛樿鍚姩鏂板疄渚嬶紝瀵艰嚧澶氫釜瀹炰緥
// if (!isTaskRoot()) {
// finish();
// }
@@ -155,8 +154,8 @@
if (TextUtils.isEmpty(data)) {
return;
}
- PushMessageInfoBean pushMessageInfoBean = new Gson().fromJson(data, PushMessageInfoBean.class);
-// PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
+// PushMessageInfoBean pushMessageInfoBean = new Gson().fromJson(data, PushMessageInfoBean.class);
+ PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
return;
}
@@ -296,63 +295,6 @@
/**
- * 涓婁紶鏋佸厜娉ㄥ唽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;
- }
-
- HdlThreadLogic.runSubThread(new Runnable() {
- @Override
- public void run() {
- String registrationID = JPushInterface.getRegistrationID(_mActivity);
- int addCount = 0;
- while (TextUtils.isEmpty(registrationID)) {
- SystemClock.sleep(1000);//1s浼戠湢
- registrationID = JPushInterface.getRegistrationID(_mActivity);
- addCount++;
- if (addCount > 5) {
- //5s瓒呮椂
- break;
- }
- }
- if (!TextUtils.isEmpty(registrationID)) {
-// UserConfigManage.getInstance().setRegistrationID(registrationID);
-// UserConfigManage.getInstance().Save();
- String finalRegistrationID = registrationID;
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
-
- if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setPushToken(finalRegistrationID);
- UserConfigManage.getInstance().setPushId(pushId);
- UserConfigManage.getInstance().Save();
- }
- 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浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
- }
- });
-
- }
-
-
- }
- });
- }
-
- /**
* 涓婁紶 token 鍒版湇鍔″櫒
*
* @param token 浠ょ墝
@@ -362,7 +304,7 @@
if (TextUtils.isEmpty(token)) {
return;
}
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
@@ -880,13 +822,14 @@
//瑙﹀彂娑堟伅鐐瑰嚮浜嬩欢
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.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
+// HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
}
@@ -914,8 +857,8 @@
return;
} else {
AppManagerUtils.getAppManager().finishAllActivity();
- //濡傛灉寮�鍙戣�呰皟鐢╧ill鎴栬�卐xit涔嬬被鐨勬柟娉曟潃姝昏繘绋嬶紝鎴栬�呭弻鍑籦ack閿細鏉�姝昏繘绋嬶紝璇峰姟蹇呭湪姝や箣鍓嶈皟鐢∕obclickAgent.onKillProcess鏂规硶锛岀敤鏉ヤ繚瀛樼粺璁℃暟鎹��
- MobclickAgent.onKillProcess(_mActivity);
+// //鍙嬬洘sdk濡傛灉寮�鍙戣�呰皟鐢╧ill鎴栬�卐xit涔嬬被鐨勬柟娉曟潃姝昏繘绋嬶紝鎴栬�呭弻鍑籦ack閿細鏉�姝昏繘绋嬶紝璇峰姟蹇呭湪姝や箣鍓嶈皟鐢∕obclickAgent.onKillProcess鏂规硶锛岀敤鏉ヤ繚瀛樼粺璁℃暟鎹��
+// MobclickAgent.onKillProcess(_mActivity);
Process.killProcess(Process.myPid());
}
--
Gitblit v1.8.0