From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index fdafc77..f52773f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -63,7 +63,7 @@
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import com.umeng.analytics.MobclickAgent;
+//import com.umeng.analytics.MobclickAgent;
//import com.umeng.commonsdk.UMConfigure;
import org.greenrobot.eventbus.EventBus;
@@ -195,7 +195,7 @@
initAutoSize();
// //鍒濆鍖栨瀬鍏夋帹閫�
// initJPush();
- //璋锋瓕鍘熺敓fcm鎺ㄩ��
+// //璋锋瓕鍘熺敓fcm鎺ㄩ��
// // 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
// if (isGooglePlayServicesAvailable(this)) {
// initFCM();
@@ -203,7 +203,7 @@
// HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
// // 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
// }
-// //闃块噷浜戞帹閫�
+ //闃块噷浜戞帹閫�
initAliYunPush();
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
@@ -686,7 +686,8 @@
*/
private void restartApp(Context context) {
try {
- MobclickAgent.onKillProcess(context);
+// MobclickAgent.onKillProcess(context);
+ SystemClock.sleep(300);
Intent intent = new Intent(context, StartActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent);
--
Gitblit v1.8.0