From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 2ddf9e6..b436c04 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic;
import android.app.Activity;
+import android.app.ActivityManager;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
@@ -43,15 +44,16 @@
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.commonsdk.UMConfigure;
+//import com.umeng.commonsdk.UMConfigure;
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
+import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import cn.jpush.android.api.JPushInterface;
+//import cn.jpush.android.api.JPushInterface;
import io.dcloud.common.util.RuningAcitvityUtil;
import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig;
@@ -86,13 +88,13 @@
@Override
public void onCreate() {
super.onCreate();
- // 鑾峰彇褰撳墠杩涚▼鐨凱ID
- String processMessage= "杩涚▼ID:"+Process.myPid()+" 杩涚▼鍚嶏細"+RuningAcitvityUtil.getAppName(getBaseContext());
- Log.d(TAG, processMessage);
- if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) {
- //闈炲師鐢熻繘绋嬶紝鐢ㄥ垵濮嬪寲鍚庨潰鐨�
- return;
- }
+// // 鑾峰彇褰撳墠杩涚▼鐨凱ID
+// String processMessage= "杩涚▼ID:"+Process.myPid()+" 杩涚▼鍚嶏細"+RuningAcitvityUtil.getAppName(getBaseContext());
+// Log.d(TAG, processMessage);
+// if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) {
+// //闈炲師鐢熻繘绋嬶紝鐢ㄥ垵濮嬪寲鍚庨潰鐨�
+// return;
+// }
mHDLApp = this;
SharedPreUtils.init(this);
getAppLanguage();
@@ -178,8 +180,8 @@
this.networkMonitoring();
//鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
// this.initLocalAssetsData();
- //鍒濆鍖栧弸鐩烻DK
- initUMengSDK();
+// //鍒濆鍖栧弸鐩烻DK锛屾斁鍦⊿tartActivity閲岄潰鍒濆鍖�
+// initUMengSDK();
}
@@ -189,12 +191,12 @@
* 闆嗘垚鏁欑▼鍦板潃锛歨ttps://developer.umeng.com/docs/119267/detail/118588
*/
private void initUMengSDK() {
- UMConfigure.preInit(this, "6801aec0bc47b67d833fd76d", "XenterraSolar");
- //appkey鍜宑hannl蹇呴』淇濇寔鍜岄鍒濆鍖栦竴鑷达紒锛侊紒
- //deviceType锛氳澶囩被鍨嬶紝UMConfigure.DEVICE_TYPE_PHONE涓烘墜鏈恒�乁MConfigure.DEVICE_TYPE_BOX涓虹洅瀛�
- //pushSecret锛歅ush鎺ㄩ�佷笟鍔＄殑secret
- UMConfigure.init(this, "6801aec0bc47b67d833fd76d", "XenterraSolar", UMConfigure.DEVICE_TYPE_PHONE, "");
- UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
+// UMConfigure.preInit(this, "6801aec0bc47b67d833fd76d", "XenterraSolar");
+// //appkey鍜宑hannl蹇呴』淇濇寔鍜岄鍒濆鍖栦竴鑷达紒锛侊紒
+// //deviceType锛氳澶囩被鍨嬶紝UMConfigure.DEVICE_TYPE_PHONE涓烘墜鏈恒�乁MConfigure.DEVICE_TYPE_BOX涓虹洅瀛�
+// //pushSecret锛歅ush鎺ㄩ�佷笟鍔＄殑secret
+// UMConfigure.init(this, "6801aec0bc47b67d833fd76d", "XenterraSolar", UMConfigure.DEVICE_TYPE_PHONE, "");
+// UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
}
@@ -226,6 +228,7 @@
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@Override
public void onReLogin(int type) {
+
HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
//type: 0:姝ｅ父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
//鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
@@ -300,8 +303,8 @@
* 鍒濆鍖栨瀬鍏塖DK
*/
private void initJPush() {
- JPushInterface.setDebugMode(true);
- JPushInterface.init(getBaseContext());
+// JPushInterface.setDebugMode(true);
+// JPushInterface.init(getBaseContext());
}
/**
--
Gitblit v1.8.0