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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index bb99acf..f52773f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -24,6 +24,7 @@
import com.alibaba.sdk.android.push.noonesdk.PushInitConfig;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.alibaba.sdk.android.push.register.MiPushRegister;
+import com.alibaba.sdk.android.push.register.OppoRegister;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.firebase.messaging.FirebaseMessaging;
@@ -62,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;
@@ -252,7 +253,11 @@
pushService.setLogLevel(CloudPushService.LOG_DEBUG);
}
//灏忕背
+ //appKey/appSecret鍦ㄥ皬绫冲紑鍙戣�呭钩鍙拌幏鍙�
MiPushRegister.register(this, "2882303761520382032", "5612038223032");
+ // OPPO閫氶亾娉ㄥ唽
+ //appKey/appSecret鍦∣PPO寮�鍙戣�呭钩鍙拌幏鍙�
+ OppoRegister.register(this, "d80747c83e38442aaa2e5183c310bae0", "86afce21417b49a4984816024b15d4b9");
}
@@ -681,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