From a91655ae2d34b4c0e43f674125d29b2851d4e7fd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 05 十二月 2025 11:51:17 +0800
Subject: [PATCH] 2025年12月05日11:47:12 先隐藏掉阿拉伯语言
---
app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java | 27 ------
app/src/main/java/com/hdl/photovoltaic/push/CustomNotification.java | 26 ++----
app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java | 49 +++---------
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java | 5
app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java | 42 ++++++----
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 20 ++--
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 20 ++--
8 files changed, 76 insertions(+), 117 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 92eb85a..9002e32 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -195,16 +195,16 @@
initAutoSize();
// //鍒濆鍖栨瀬鍏夋帹閫�
// initJPush();
-// //璋锋瓕鍘熺敓fcm鎺ㄩ��
-// // 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
-// if (isGooglePlayServicesAvailable(this)) {
-// initFCM();
-// } else {
-// HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
-// // 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
-// }
- //闃块噷浜戞帹閫�
- initAliYunPush();
+ //璋锋瓕鍘熺敓fcm鎺ㄩ��
+ // 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
+ if (isGooglePlayServicesAvailable(this)) {
+ initFCM();
+ } else {
+ HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
+ // 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
+ }
+// //闃块噷浜戞帹閫�
+// initAliYunPush();
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
initSocket();
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
index 0643bf0..acef781 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
@@ -66,8 +66,8 @@
json.addProperty("produce", AppConfigManage.isIsOnlineServer());//琛ㄧず鏄惁鏄寮忔湇鍔″櫒
json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮鎶奝HOTOVOLTAIC鏀规垚XENTERRA锛屼篃灏变簯绔鐨勯�氶亾鍙凤紙channel)
- json.addProperty("platform", "ALIYUN_APNS");//闃块噷浜戠殑鐗堟湰鐨刾latform
-// json.addProperty("platform", "FCM");//google鐨勭増鏈殑platform
+// json.addProperty("platform", "ALIYUN_APNS");//闃块噷浜戠殑鐗堟湰鐨刾latform
+ json.addProperty("platform", "FCM");//google鐨勭増鏈殑platform
json.addProperty("language", UserConfigManage.getInstance().getCurrentAppLanguage());//2.0杩藉姞鐨勫瓧娈�
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -130,52 +130,29 @@
*
* @param context 涓婁笅鏂�
* @param pushMessageInfoBean 鎺ㄩ�佹暟鎹璞″疄浣�
- * @param isOpened true=鐐瑰嚮閫氱煡鏍忓洖璋�,false=鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟;
+ * @param isAppInForeground true琛ㄧず鏄墠鍙帮紝false琛ㄧず鍚庡彴
*/
- public void PushPushCommonData(Context context, PushMessageInfoBean pushMessageInfoBean, boolean isOpened) {
+ public void PushPushCommonData(Context context, PushMessageInfoBean pushMessageInfoBean, boolean isAppInForeground) {
if (UserConfigManage.getInstance().isBAccount()) {
//娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
// this.addPushDataToMemoryList(pushMessageInfoBean);
- if (isOpened) {
-// //瀹夎鍟嗚烦杞晫闈�
-// Intent intent = new Intent(context, BPowerStationActivity.class);
-// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-// intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
-// context.startActivity(intent);
- } else {
+ if (isAppInForeground) {
//搴旂敤鍦ㄥ墠鍙伴�氱煡鏇存柊浣忓畢娑堟伅鍒楄〃鍗冲彲
BaseEventBus bus = new BaseEventBus();
bus.setTopic(ConstantManage.refresh_message_house);
bus.setType(ConstantManage.refresh_message_house);
- EventBus.getDefault().post(bus);
+ EventBus.getDefault().postSticky(bus);
+ } else {
+ // 瀹夎鍟嗚烦杞晫闈�
+// Intent intent = new Intent(context, BPowerStationActivity.class);
+// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+// intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
+// context.startActivity(intent);
}
} else {
// if (isOpened) {
//浜у搧缁忕悊璇存殏鏃朵笉鍋� 2024骞�03鏈�29鏃�10:34:44
-// boolean existsActivity = AppManagerUtils.getAppManager().existsActivity(MessageCenterListActivity.class);
-// if (existsActivity) {
-// //瀛樺湪鍞竴涓�绉嶅彲鑳藉氨鏄綋鍓嶆椿鍔ㄧ獥鍙ｅ氨鏄畠
-// return;
-// }
-// //璺宠浆C绔秷鎭腑蹇冪晫闈�
-// Intent intent = new Intent(context, MessageCenterListActivity.class);
-// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-// context.startActivity(intent);
-// //涓嶇瀛樹笉瀛樺湪杩欎簺Activity(鎵惧埌鎵嶇Щ闄�)锛岄兘瑕佸仛杩欎簺鍔ㄤ綔,鏈夊彲鑳藉綋鍓嶇殑娲诲姩绐楀彛鏄叾涓竴涓�
-// AppManagerUtils.getAppManager().finishActivity(AccountAndSecurityActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(AsRegardsActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(BindMailActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(BindPhoneActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(languageSelectionActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(MeChangePasswordActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(PersonalDataActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(SetActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(TemperatureUnitActivity.class);
-// AppManagerUtils.getAppManager().finishActivity(WebActivity.class);
-// //閫氱煡uni绉婚櫎鐣岄潰
-// HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
-// uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_REMOVE_VIEW);
-// HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+
// }
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/CustomNotification.java b/app/src/main/java/com/hdl/photovoltaic/push/CustomNotification.java
index d4834a7..4aa2c10 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/CustomNotification.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/CustomNotification.java
@@ -67,23 +67,14 @@
}
PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, data);
//鍘熺敓鍦ㄥ墠鍙版垨鑰卽ni鍦ㄥ墠鍙�
- if (this.isAppInForegroundOrIsShowUniMP(context)) {
- HdlPushLogic.getInstance().PushPushCommonData(context, pushMessageInfoBean, false);
+ if (this.isAppInForeground(context)) {
+ HdlPushLogic.getInstance().PushPushCommonData(context, pushMessageInfoBean, true);
} else {
this.showCustomNotification(context, pushMessageInfoBean, fromPush);
}
// this.showCustomNotification(context, pushMessageInfoBean);
}
- /**
- * 鏄惁鍦ㄥ墠鍙� true琛ㄧず鍦ㄥ墠鍙帮紝false琛ㄧず鍦ㄥ悗鍙�
- *
- * @param context 涓婁笅鏂�
- * @return true琛ㄧず鍦ㄥ墠鍙帮紝false琛ㄧず鍦ㄥ悗鍙�
- */
- public boolean isAppInForegroundOrIsShowUniMP(Context context) {
- return (this.isAppInForeground(context) || HDLUniMPSDKManager.getInstance().showUniMP());
- }
/**
* 澶勭悊閫氱煡娑堟伅锛堝簲鐢ㄥ湪鍚庡彴鏃讹紝绯荤粺浼氳嚜鍔ㄦ樉绀洪�氱煡锛�
@@ -132,9 +123,10 @@
/**
* 鑾峰彇Intent
- * @param context 涓婁笅鏂�
+ *
+ * @param context 涓婁笅鏂�
* @param pushMessageInfoBean 鏁版嵁妯″瀷
- * @param fromPush 娑堟伅鏉ヨ嚜锛堟瀬鍏夛紝璋锋瓕锛岄樋閲屼簯锛夊钩鍙�
+ * @param fromPush 娑堟伅鏉ヨ嚜锛堟瀬鍏夛紝璋锋瓕锛岄樋閲屼簯锛夊钩鍙�
* @return 鎰忓浘
*/
public Intent createNotificationIntent(Context context, PushMessageInfoBean pushMessageInfoBean, FromPush fromPush) {
@@ -173,7 +165,7 @@
* @param context 涓婁笅
* @return true琛ㄧず鍦ㄥ墠鍙帮紝false鍦ㄥ悗鍙�
*/
- private boolean isAppInForeground(Context context) {
+ public boolean isAppInForeground(Context context) {
try {
ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
@@ -181,9 +173,11 @@
return false;
}
final String packageName = context.getPackageName();
+ final String uniPackageName = packageName + ":unimp0";
for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
- if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
- appProcess.processName.equals(packageName)) {
+ if ((appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
+ appProcess.processName.equals(packageName)) || (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
+ appProcess.processName.equals(uniPackageName))) {
return true;
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java b/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
index 5692a59..9509177 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
@@ -103,6 +103,7 @@
@Override
public void onNotPushData(Intent intent) {
//TODO 娌℃湁鎺ㄩ�佹暟鎹紝鍙兘鏄紓甯歌皟鐢紝闇�瑕佸紓甯稿鐞�
+ finish();
}
/**
@@ -113,33 +114,9 @@
@Override
public void onParseFailed(Intent intent) {
//TODO 鎺ㄩ�佹暟鎹В瀵嗗紓甯革紝闇�瑕佸紓甯稿鐞�
+ finish();
}
- /**
- * 瑙ｆ瀽鍘傚晢鐗瑰畾鐨勬暟鎹�
- */
- private void parseVendorSpecificData(Intent intent) {
- // 灏忕背閫氶亾鏁版嵁瑙ｆ瀽
- if (intent.hasExtra("miPushMessage")) {
- Log.d(TAG, "灏忕背閫氶亾鏁版嵁");
- // 灏忕背鎺ㄩ�佺殑鏁版嵁缁撴瀯
- }
- // 鍗庝负閫氶亾鏁版嵁瑙ｆ瀽
- if (intent.hasExtra("hms_message_id")) {
- Log.d(TAG, "鍗庝负閫氶亾鏁版嵁");
- // 鍗庝负鎺ㄩ�佺殑鏁版嵁缁撴瀯
- }
-
- // OPPO閫氶亾鏁版嵁瑙ｆ瀽
- if (intent.hasExtra("oppo_push_message")) {
- Log.d(TAG, "OPPO閫氶亾鏁版嵁");
- }
-
- // vivo閫氶亾鏁版嵁瑙ｆ瀽
- if (intent.hasExtra("vivo_push_message")) {
- Log.d(TAG, "vivo閫氶亾鏁版嵁");
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java b/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java
index cec1434..f1dacd5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java
@@ -114,7 +114,8 @@
Log.d(TAG, "onNotificationReceivedInApp:title=" + title
+ " content=" + content + " extraMap=" + JSON.toJSONString(extraMap) + " openType="
+ openType + " openActivity=" + openActivity + " openUrl=" + openUrl);
-// CustomNotification.getInstance().messageDataProcessing(context, title, content, JSON.toJSONString(extraMap));
+ //濡傛灉鍦ㄥ墠鍙版椂锛屽彂閫侀�氱煡璁╂秷鎭垪琛ㄦ洿鏂帮紝鍦ㄥ悗鍙版槸锛岃繖閲屼笉浼氭墽琛岋紝浼氭墽琛孷endorChannelActivity.onSysNoticeOpened()鐨勬柟娉�
+ CustomNotification.getInstance().messageDataProcessing(context, title, content, JSON.toJSONString(extraMap),CustomNotification.FromPush.AliYun);
}
/**
@@ -129,7 +130,7 @@
public boolean showNotificationNow(Context context, Map<String, String> extraMap) {
//false琛ㄧず鎷︽埅锛宼rue琛ㄧず涓嶆嫤鎴紝璇锋牴鎹繘琛屾嫤鎴紝鎷︽埅鍚庝細鎵ц鍒� onNotificationReceivedInApp
Log.d(TAG, "showNotificationNow:" + "extraMap=" + JSON.toJSONString(extraMap));
- return !CustomNotification.getInstance().isAppInForegroundOrIsShowUniMP(context);
+ return !CustomNotification.getInstance().isAppInForeground(context);
// return false;
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
index 492b4cf..89ec8fa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
@@ -23,6 +23,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.MessageStateType;
import com.hdl.photovoltaic.other.HdlPushLogic;
+import com.hdl.photovoltaic.push.CustomNotification;
import com.hdl.photovoltaic.push.PushMessageInfoBean;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.StartActivity;
@@ -59,7 +60,7 @@
*/
@Override
public void onMessageReceived(RemoteMessage remoteMessage) {
- Log.d(TAG, "鍦ㄥ墠鍙拌繕鏄湪鍚�" + isAppInForeground(this));
+ Log.d(TAG, "鏄惁鍦ㄥ墠鍙帮細" + isAppInForeground(this));
Log.d(TAG, "鏉ヨ嚜RemoteMessage: " + JSON.toJSONString(remoteMessage));
// // 鏁版嵁娑堟伅锛氫换浣曠姸鎬侀兘浼氭墽琛�
// if (!remoteMessage.getData().isEmpty()) {
@@ -70,27 +71,32 @@
// if (remoteMessage.getNotification() != null) {
// handleNotification(remoteMessage.getNotification()); // 鍙湁鍓嶅彴鎵ц
// }
+
+
String title = "";//鎺ㄩ�佹爣棰�
String content = "";//鎺ㄩ�佸唴瀹�
if (remoteMessage.getNotification() != null) {
title = remoteMessage.getNotification().getTitle();
content = remoteMessage.getNotification().getBody();
}
- //鍘熺敓鍦ㄥ墠鍙版垨鑰卽ni鍦ㄥ墠鍙�
- if (isAppInForeground(this) || HDLUniMPSDKManager.getInstance().showUniMP()) {
- // 妫�鏌ユ秷鎭槸鍚﹀寘鍚暟鎹礋杞�
- if (!remoteMessage.getData().isEmpty()) {
- PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, JSON.toJSONString(remoteMessage.getData()));
- HdlPushLogic.getInstance().PushPushCommonData(this, pushMessageInfoBean, false);
-// this.showCustomNotification(pushMessageInfoBean);
- }
- } else {
- // 妫�鏌ユ秷鎭槸鍚﹀寘鍚�氱煡璐熻浇
- if (!remoteMessage.getData().isEmpty()) {
- PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, JSON.toJSONString(remoteMessage.getData()));
- this.showCustomNotification(pushMessageInfoBean);
- }
+ if (!remoteMessage.getData().isEmpty()) {
+ CustomNotification.getInstance().messageDataProcessing(this, title, content, JSON.toJSONString(remoteMessage.getData()), CustomNotification.FromPush.FCM);
}
+// //鍘熺敓鍦ㄥ墠鍙版垨鑰卽ni鍦ㄥ墠鍙�
+// if (isAppInForeground(this)) {
+// // 妫�鏌ユ秷鎭槸鍚﹀寘鍚暟鎹礋杞�
+// if (!remoteMessage.getData().isEmpty()) {
+// PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, JSON.toJSONString(remoteMessage.getData()));
+// HdlPushLogic.getInstance().PushPushCommonData(this, pushMessageInfoBean, false);
+//// this.showCustomNotification(pushMessageInfoBean);
+// }
+// } else {
+// // 妫�鏌ユ秷鎭槸鍚﹀寘鍚�氱煡璐熻浇
+// if (!remoteMessage.getData().isEmpty()) {
+// PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, JSON.toJSONString(remoteMessage.getData()));
+// this.showCustomNotification(pushMessageInfoBean);
+// }
+// }
}
@@ -178,9 +184,11 @@
return false;
}
final String packageName = context.getPackageName();
+ final String uniPackageName = packageName + ":unimp0";
for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
- if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
- appProcess.processName.equals(packageName)) {
+ if ((appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
+ appProcess.processName.equals(packageName)) || (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
+ appProcess.processName.equals(uniPackageName))) {
return true;
}
}
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 e70dad0..1d22b7e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -878,16 +878,16 @@
*/
private void clickNotificationMessageTab() {
//瑙﹀彂娑堟伅鐐瑰嚮浜嬩欢
-// 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);
+ 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);
}
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 87fa7d0..e77b1ce 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -155,6 +155,7 @@
if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId()) && !pushMessageInfoBean.isAiPrompt()) {
return;
}
+ Log.d("==========111111", tag);
HDLUniMPSDKManager.uinEnabled = false;
if (tag.equals("onNewIntent")) {
HDLUniMPSDKManager.uinEnabled = false;
@@ -211,7 +212,7 @@
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_open_ai_push_message);
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
-// HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡AI浜嬩欢---", false);
+ HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡AI浜嬩欢---", false);
} else {
MessageBean messageBean = new MessageBean();
messageBean.setMsgId(Long.valueOf(pushMessageInfoBean.getMsgId()));
@@ -219,6 +220,7 @@
intentMessageInfoActivity.setClass(_mActivity, MessageInfoActivity.class);
intentMessageInfoActivity.putExtra("messageBean", JSONObject.toJSONString(messageBean));
startActivity(intentMessageInfoActivity);
+ HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡AI浜嬩欢---11111", false);
}
}
--
Gitblit v1.8.0