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/CustomNotification.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

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;
                 }
             }

--
Gitblit v1.8.0