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 | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 0b240f2..986fcae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,13 +1,13 @@
package com.hdl.photovoltaic;
import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlarmManager;
import android.app.Application;
-import android.app.PendingIntent;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
+import android.graphics.Color;
import android.os.Build;
import android.os.Handler;
import android.os.LocaleList;
@@ -57,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;
@@ -116,7 +116,7 @@
SharedPreUtils.init(this);
getAppLanguage();
//棰勫垱寤鸿剼鏈琷son鏂囦欢澶�
- HdlFileLogic.getInstance().createHdlESLocalJsonDirectory();
+ HdlFileLogic.getInstance().createHdlDeviceModelLocalJsonDirectory();
init();
@@ -187,8 +187,8 @@
// //9.鍒濆鍖栫綉缁滃伐鍏�
// NetWorkUtil.init(this);
initAutoSize();
-// //鍒濆鍖栨瀬鍏夋帹閫�
-// initJPush();
+ //鍒濆鍖栨瀬鍏夋帹閫�
+ initJPush();
//璋锋瓕鍘熺敓fcm鎺ㄩ��
// 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
if (isGooglePlayServicesAvailable(this)) {
@@ -212,6 +212,7 @@
}
+
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
@@ -446,7 +447,7 @@
Log.d("FCM", "FCM Token: " + token);
// 淇濆瓨 token
- saveFCMToken(token);
+ saveToken(token);
});
// // 璁㈤槄涓婚锛堝彲閫夛級
@@ -474,15 +475,12 @@
*
* @param token 浠ょ墝
*/
- public void saveFCMToken(String token) {
+ public void saveToken(String token) {
if (TextUtils.isEmpty(token.trim())) {
return;
}
UserConfigManage.getInstance().setPushToken(token);
UserConfigManage.getInstance().Save();
-
-// // 鍙戦�佸埌鏈嶅姟鍣�
-// sendTokenToServer(token);
}
@@ -612,14 +610,37 @@
return this;
}
}
-
+// private void createNotificationChannel() {
+// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+// NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+// // 閫氱煡娓犻亾鐨刬d銆�
+// String id = "ali_push_channel";
+// // 鐢ㄦ埛鍙互鐪嬪埌鐨勯�氱煡娓犻亾鐨勫悕瀛椼��
+// CharSequence name = "notification channel";
+// // 鐢ㄦ埛鍙互鐪嬪埌鐨勯�氱煡娓犻亾鐨勬弿杩般��
+// String description = "notification description";
+// int importance = NotificationManager.IMPORTANCE_HIGH;
+// NotificationChannel mChannel = new NotificationChannel(id, name, importance);
+// // 閰嶇疆閫氱煡娓犻亾鐨勫睘鎬с��
+// mChannel.setDescription(description);
+// // 璁剧疆閫氱煡鍑虹幇鏃剁殑闂伅锛堝鏋淎ndroid璁惧鏀寔鐨勮瘽锛夈��
+// mChannel.enableLights(true);
+// mChannel.setLightColor(Color.RED);
+// // 璁剧疆閫氱煡鍑虹幇鏃剁殑闇囧姩锛堝鏋淎ndroid璁惧鏀寔鐨勮瘽锛夈��
+// mChannel.enableVibration(true);
+// mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400});
+// // 鏈�鍚庡湪notificationmanager涓垱寤鸿閫氱煡娓犻亾銆�
+// mNotificationManager.createNotificationChannel(mChannel);
+// }
+// }
/**
* 閲嶅惎app
*/
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