From acccdeba7fe28f7f4b72ba464ad4789b0d9ddb2a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 08 十二月 2025 11:06:21 +0800
Subject: [PATCH] 2025年12月08日11:06:18

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java |  124 ++++++++++++++++++++++++++++++-----------
 1 files changed, 90 insertions(+), 34 deletions(-)

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 8f5a6d8..004975e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
@@ -2,14 +2,21 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.enums.MessageStateType;
+import com.hdl.photovoltaic.internet.HttpClient;
+import com.hdl.photovoltaic.internet.api.HttpApi;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.push.PushMessageInfoBean;
 import com.hdl.photovoltaic.ui.BPowerStationActivity;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
@@ -47,56 +54,105 @@
     }
 
     /**
+     * 娣诲姞鎺ㄩ�乀oken
+     *
+     * @param cloudCallBeak -
+     */
+    public void pushAdd(CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_push_add;
+        JsonObject json = new JsonObject();
+        json.addProperty("deviceName", Build.MODEL);//璁惧鍚嶇О
+        json.addProperty("deviceType", "Android");//璁惧绫诲瀷
+        json.addProperty("produce", AppConfigManage.isIsOnlineServer());//琛ㄧず鏄惁鏄寮忔湇鍔″櫒
+        json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
+        json.addProperty("software", "PHOTOVOLTAIC");//涔熷氨浜戠璇寸殑閫氶亾鍙凤紙channel)
+        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>() {
+            @Override
+            public void onSuccess(String pushId) {
+                if (!TextUtils.isEmpty(pushId)) {
+                    UserConfigManage.getInstance().setPushId(pushId);
+                    UserConfigManage.getInstance().Save();
+                }
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(pushId);
+                }
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+    /**
+     * 鍒犻櫎鎺ㄩ�乀oken
+     *
+     * @param cloudCallBeak -
+     */
+    public void pushDel(CloudCallBeak<String> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_push_del;
+        JsonObject json = new JsonObject();
+        json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
+        json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());
+
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(jsonStr);
+                }
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+
+
+    }
+
+    /**
      * 鎺ㄩ�佹暟鎹粺涓�澶勭悊鐨勬柟娉�
      *
      * @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) {
-//                    //瀛樺湪鍞竴涓�绉嶅彲鑳藉氨鏄綋鍓嶆椿鍔ㄧ獥鍙e氨鏄畠
-//                    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);
+
 //            }
         }
     }

--
Gitblit v1.8.0