From 41fc4df45eb9c43560a9660188a614ede0072200 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 11:44:29 +0800
Subject: [PATCH] 2025年12月29日11:44:25

---
 app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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 e058dac..04f16b1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -40,7 +40,6 @@
 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;
@@ -60,7 +59,7 @@
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.config.HDLLinkConfig;
 import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import com.umeng.analytics.MobclickAgent;
+//import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -152,9 +151,10 @@
                 return;
             }
             PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
-            if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
+            if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId()) && !pushMessageInfoBean.isAiPrompt()) {
                 return;
             }
+            Log.d("==========111111", tag);
             HDLUniMPSDKManager.uinEnabled = false;
             if (tag.equals("onNewIntent")) {
                 HDLUniMPSDKManager.uinEnabled = false;
@@ -208,7 +208,10 @@
                             @Override
                             public void run() {
                                 if (pushMessageInfoBean.isAiPrompt()) {
-                                    HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_open_ai_push_message, new HDLUniMP.UniCallBackBaseBean());
+                                    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);
                                 } else {
                                     MessageBean messageBean = new MessageBean();
                                     messageBean.setMsgId(Long.valueOf(pushMessageInfoBean.getMsgId()));
@@ -216,6 +219,7 @@
                                     intentMessageInfoActivity.setClass(_mActivity, MessageInfoActivity.class);
                                     intentMessageInfoActivity.putExtra("messageBean", JSONObject.toJSONString(messageBean));
                                     startActivity(intentMessageInfoActivity);
+                                    HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡AI浜嬩欢---11111", false);
                                 }
 
                             }
@@ -419,8 +423,8 @@
                     HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                 }
                 AppManagerUtils.getAppManager().finishAllActivity();
-                //濡傛灉寮�鍙戣�呰皟鐢╧ill鎴栬�卐xit涔嬬被鐨勬柟娉曟潃姝昏繘绋嬶紝鎴栬�呭弻鍑籦ack閿細鏉�姝昏繘绋嬶紝璇峰姟蹇呭湪姝や箣鍓嶈皟鐢∕obclickAgent.onKillProcess鏂规硶锛岀敤鏉ヤ繚瀛樼粺璁℃暟鎹��
-                MobclickAgent.onKillProcess(_mActivity);
+//                //鍙嬬洘sdk濡傛灉寮�鍙戣�呰皟鐢╧ill鎴栬�卐xit涔嬬被鐨勬柟娉曟潃姝昏繘绋嬶紝鎴栬�呭弻鍑籦ack閿細鏉�姝昏繘绋嬶紝璇峰姟蹇呭湪姝や箣鍓嶈皟鐢∕obclickAgent.onKillProcess鏂规硶锛岀敤鏉ヤ繚瀛樼粺璁℃暟鎹��
+//                MobclickAgent.onKillProcess(_mActivity);
                 Process.killProcess(Process.myPid());
             }
         }
@@ -465,7 +469,7 @@
 //                    UserConfigManage.getInstance().setRegistrationID(registrationID);
 //                    UserConfigManage.getInstance().Save();
                     String finalRegistrationID = registrationID;
-                    HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+                    HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
                         @Override
                         public void onSuccess(String pushId) {
 
@@ -502,7 +506,7 @@
         if (TextUtils.isEmpty(token)) {
             return;
         }
-        HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+        HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String pushId) {
 

--
Gitblit v1.8.0