From dbff6d6f9200417ea60e2fe507b79cbe2eb7ea32 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 一月 2024 18:19:48 +0800
Subject: [PATCH] 2024年01月11日18:19:42

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
index db36dde..73c71d0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -46,7 +46,7 @@
      * @param isOpened             true=鐐瑰嚮閫氱煡鏍忓洖璋�,false=鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟;
      */
     public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
-        //娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�;
+        //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
         this.addPushDataToMemoryList(jPushMessageInfoBean);
         if (isOpened) {
             Intent intent = new Intent(context, MyPowerStationActivity.class);
@@ -66,17 +66,20 @@
      * 娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�
      */
     private void addPushDataToMemoryList(JPushMessageInfoBean jPushMessageInfoBean) {
-        if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
-            return;
+        try {
+            if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
+                return;
+            }
+            Gson gson = new Gson();
+            MessageBean messageBean = gson.fromJson(jPushMessageInfoBean.getExpantContent(), MessageBean.class);
+            if (messageBean == null) {
+                return;
+            }
+            messageBean.setTitle(jPushMessageInfoBean.getTitle());
+            messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
+            HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
+            HdlLogLogic.print("娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->鎴愬姛");
+        } catch (Exception ignored) {
         }
-        Gson gson = new Gson();
-        MessageBean messageBean = gson.fromJson(jPushMessageInfoBean.getExpantContent(), MessageBean.class);
-        if (messageBean == null) {
-            return;
-        }
-        messageBean.setTitle(jPushMessageInfoBean.getTitle());
-        messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
-        HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
-        HdlLogLogic.print("娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->鎴愬姛");
     }
 }

--
Gitblit v1.8.0