From 1c91b62ea573082581e72fd433d02e3dc52dbf51 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 一月 2026 11:03:29 +0800
Subject: [PATCH] 2026年01月05日11:00:26 升级gradle和uni库
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 56 +++++---------------------------------------------------
1 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 9002e32..986fcae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -19,12 +19,6 @@
import androidx.multidex.MultiDex;
-import com.alibaba.sdk.android.push.CloudPushService;
-import com.alibaba.sdk.android.push.CommonCallback;
-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;
@@ -63,7 +57,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;
@@ -193,8 +187,8 @@
// //9.鍒濆鍖栫綉缁滃伐鍏�
// NetWorkUtil.init(this);
initAutoSize();
-// //鍒濆鍖栨瀬鍏夋帹閫�
-// initJPush();
+ //鍒濆鍖栨瀬鍏夋帹閫�
+ initJPush();
//璋锋瓕鍘熺敓fcm鎺ㄩ��
// 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
if (isGooglePlayServicesAvailable(this)) {
@@ -203,8 +197,6 @@
HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
// 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
}
-// //闃块噷浜戞帹閫�
-// initAliYunPush();
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
initSocket();
@@ -221,45 +213,6 @@
}
- /**
- * 鍒濆鍖栭樋閲屼簯鎺ㄩ��
- */
- private void initAliYunPush() {
- PushInitConfig pushInitConfig = new PushInitConfig.Builder()
- .application(this)
- .appKey("335628427") //璇峰～鍐欎綘鑷繁鐨刟ppKey锛屼簯绔粰鐨�
- .appSecret("fd1dabe7ec494c878a5970d8646c83bc") //璇峰～鍐欎綘鑷繁鐨刟ppSecret,浜戠缁欑殑
- .build();
- PushServiceFactory.init(pushInitConfig);
- CloudPushService pushService = PushServiceFactory.getCloudPushService();
- pushService.register(this, new CommonCallback() {
- @Override
- public void onSuccess(String success) {
- String deviceId = pushService.getDeviceId();
- Log.d("com.aliyun.emas.pocdemo", "鑾峰彇deviceId " + deviceId);
- saveToken(deviceId);
-
- }
-
- @Override
- public void onFailed(String errorCode, String errorMessage) {
- //閿欒鐮佽繛鎺ワ細https://help.aliyun.com/document_detail/434686.html?spm=a2c4g.11186623.0.0.62d3556dC2DqKJ#topic-1824037
- Log.d("com.aliyun.emas.pocdemo", "鍒濆鍖栧け璐�,閿欒鐮�: " + errorCode + "閿欒淇℃伅: " + errorMessage);
-
- }
- });
- if (AppConfigManage.isDebug()) {
- //浠呴�傜敤浜嶥ebug鍖咃紝姝ｅ紡鍖呬笉闇�瑕佹琛�
- pushService.setLogLevel(CloudPushService.LOG_DEBUG);
- }
- //灏忕背
- //appKey/appSecret鍦ㄥ皬绫冲紑鍙戣�呭钩鍙拌幏鍙�
- MiPushRegister.register(this, "2882303761520382032", "5612038223032");
- // OPPO閫氶亾娉ㄥ唽
- //appKey/appSecret鍦∣PPO寮�鍙戣�呭钩鍙拌幏鍙�
- OppoRegister.register(this, "d80747c83e38442aaa2e5183c310bae0", "86afce21417b49a4984816024b15d4b9");
-
- }
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
@@ -686,7 +639,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