From 2f5411b86c59706d31f6ec7de629d8f860725e46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 十一月 2025 19:56:56 +0800
Subject: [PATCH] 2025年11月26日19:56:45 集成谷歌推送
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 152 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 147 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index fd8969e..733934b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -6,11 +6,14 @@
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
import android.os.Process;
import android.os.SystemClock;
import android.text.TextUtils;
+import android.util.Log;
+import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
@@ -32,18 +35,23 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlOtaLogic;
+import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.push.PushMessageInfoBean;
import com.hdl.photovoltaic.services.ForeService;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.message.MessageInfoActivity;
import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
import com.hdl.photovoltaic.ui.newC.PowerStationsMoveActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.BadgeUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
@@ -59,6 +67,7 @@
import java.lang.reflect.Type;
import java.util.List;
+import java.util.Objects;
import cn.jpush.android.api.JPushInterface;
@@ -71,6 +80,8 @@
private EventListener allTopicsListener;
private int backPressTimes;
+
+ private volatile boolean isRunning = false;
@Override
public Object getContentView() {
@@ -88,8 +99,12 @@
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
this.initMqttClient();
- //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
- this.pushTokens();
+// //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
+// this.pushTokens();
+ //涓婁紶鎺ㄥ姩浠ょ墝鍒颁簯绔紙璋锋瓕FCM鎺ㄩ�侊級
+ this.sendPushTokenToServer(UserConfigManage.getInstance().getPushToken());
+ //鐐瑰嚮閫氱煡鏍忔秷鎭繘鏉�
+ this.OpenSpecifiedPage(getIntent(), "onBindView");
//鑾峰彇浜戠鑴氭湰
HdlESLocalJsonLogic.getInstance().getAllHdlESLocalJson();
// mForegroundService= new Intent(this, ForeService.class);
@@ -115,6 +130,44 @@
// this.portConflictDialog();
}
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ //AndroidManifest.xml 闇�瑕佹坊鍔犲惎鍔ㄦā寮廰ndroid:launchMode="singleTask"鎵嶆墽琛岃繖涓柟娉�
+ OpenSpecifiedPage(intent, "onNewIntent");
+ }
+
+ /**
+ * 鐐瑰嚮閫氱煡鏍忔秷鎭繘鏉�
+ */
+ private void OpenSpecifiedPage(Intent intent, String tag) {
+ Log.d("==========", tag);
+ try {
+ String data = getIntentExpantData(intent);
+ if (TextUtils.isEmpty(data)) {
+ return;
+ }
+ PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
+ if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
+ return;
+ }
+ HDLUniMPSDKManager.uinEnabled = false;
+ if (tag.equals("onNewIntent")) {
+ HDLUniMPSDKManager.uinEnabled = false;
+ //C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ startAppAutomaticallyOpenUni();
+ }
+ CheckUniOn(pushMessageInfoBean);
+
+
+ } catch (Exception e) {
+ Log.d("閿欒", " " + e.getMessage());
+ }
+ }
+
public void startAppAutomaticallyOpenUni() {
new Thread(new Runnable() {
@Override
@@ -132,6 +185,42 @@
// }
}
});
+ }
+ }).start();
+ }
+
+ /**
+ * 妫�娴媢ni鏄惁鎵撳紑锛屾娴嬫渶闀挎椂闂翠负5s锛屾娴嬫垚鍔熷悗鎵撳紑鍘熺敓娑堟伅鐣岄潰锛屽叧闂繑鍥炰富鐣岄潰
+ */
+ public void CheckUniOn(PushMessageInfoBean pushMessageInfoBean) {
+ if (pushMessageInfoBean == null) return;
+ final long startTime = System.currentTimeMillis();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ while (System.currentTimeMillis() - startTime < 5 * 1000) {
+ if (HDLUniMPSDKManager.uinEnabled) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (pushMessageInfoBean.isAiPrompt()) {
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_open_ai_push_message, new HDLUniMP.UniCallBackBaseBean());
+ } else {
+ MessageBean messageBean = new MessageBean();
+ messageBean.setMsgId(Long.valueOf(pushMessageInfoBean.getMsgId()));
+ Intent intentMessageInfoActivity = new Intent();
+ intentMessageInfoActivity.setClass(_mActivity, MessageInfoActivity.class);
+ intentMessageInfoActivity.putExtra("messageBean", JSONObject.toJSONString(messageBean));
+ startActivity(intentMessageInfoActivity);
+ }
+
+ }
+ });
+ break;
+ }
+ SystemClock.sleep(1000);
+ }
+
}
}).start();
}
@@ -239,6 +328,9 @@
MqttRecvClient.getInstance().checkAndsubscribeAllTopics(topicHome);//璁㈤槄銆愮數绔欍�戞秷鎭�
+ } else if (event.getTopic().contains(ConstantManage.refresh_push_token)) {
+ //pushToken鏇存柊
+ sendPushTokenToServer(UserConfigManage.getInstance().getPushToken());
}
}
@@ -334,7 +426,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
- HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
+// HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
// stopService(mForegroundService);
@@ -374,7 +466,7 @@
public void onSuccess(String pushId) {
if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setRegistrationID(finalRegistrationID);
+ UserConfigManage.getInstance().setPushToken(finalRegistrationID);
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
@@ -393,6 +485,34 @@
}
+ }
+ });
+ }
+
+ /**
+ * 涓婁紶 token 鍒版湇鍔″櫒
+ *
+ * @param token 浠ょ墝
+ */
+ private void sendPushTokenToServer(final String token) {
+ if (TextUtils.isEmpty(token)) {
+ return;
+ }
+ HdlResidenceLogic.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);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔け璐� PushToken:" + UserConfigManage.getInstance().getPushToken() + " 閿欒锛�" + e.getMessage(), true);
}
});
}
@@ -554,5 +674,27 @@
HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener);
}
-
+ /**
+ * 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ *
+ * @return 杩斿洖闄勫姞鏁版嵁
+ */
+ private String getIntentExpantData(Intent intent) {
+ try {
+ if (intent == null) {
+ return "";
+ }
+ // 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ if (intent.getExtras() != null) {
+ for (String key : intent.getExtras().keySet()) {
+ if (key.equals("pushData")) {
+ return Objects.requireNonNull(intent.getExtras().get(key)).toString();
+ }
+ }
+ }
+ } catch (Exception e) {
+ return "";
+ }
+ return "";
+ }
}
--
Gitblit v1.8.0