From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 六月 2025 10:37:28 +0800
Subject: [PATCH] 2025年06月05日10:37:26

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   47 +++++++++++++++--------------------------------
 1 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 9ad9cb7..db20c5c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -44,7 +44,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.commonsdk.UMConfigure;
+//import com.umeng.commonsdk.UMConfigure;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -53,7 +53,7 @@
 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;
@@ -63,7 +63,7 @@
 
 public class HDLApp extends Application {
 
-    final String TAG=HDLApp.class.getName();
+    final String TAG = HDLApp.class.getName();
     //鎺у埗鎵撳嵃 Debug妯″紡鎵撳嵃
     private Boolean isLogEnabled = true;
     //涓夋柟sdk鍒濆鍖栨爣璇�
@@ -180,8 +180,8 @@
         this.networkMonitoring();
         //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
 //        this.initLocalAssetsData();
-        //鍒濆鍖栧弸鐩烻DK
-        initUMengSDK();
+//        //鍒濆鍖栧弸鐩烻DK锛屾斁鍦⊿tartActivity閲岄潰鍒濆鍖�
+//        initUMengSDK();
 
 
     }
@@ -191,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()
     }
 
 
@@ -229,31 +229,14 @@
             @Override
             public void onReLogin(int type) {
 
-
-                boolean isLoginActivity = false;
-                // 鑾峰彇褰撳墠Activity鐨勫垪琛�
-                ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
-                List<ActivityManager.RunningTaskInfo> taskInfo = activityManager.getRunningTasks(1);
-                // 閬嶅巻Activity鍒楄〃锛屽垽鏂洰鏍嘇ctivity鏄惁鍦ㄥ垪琛ㄤ腑
-                for (ActivityManager.RunningTaskInfo info : taskInfo) {
-                    if (info.topActivity.getClassName().equals("com.hdl.photovoltaic.ui.LoginActivity")) {
-                        // 鐩爣Activity瀛樺湪
-                        // 鍦ㄨ繖閲屽彲浠ヨ繘琛岀浉搴斿鐞�
-                        isLoginActivity = true;
-                        break;
-                    }
-                }
-                if (!isLoginActivity) {
-
-                }
-
-
                 HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
                 //type:  0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
                 //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
                 AppManagerUtils.getAppManager().finishAllActivity();
 //                HDLSDKSPUtils.clear();//搴曞眰鑷繁娓呯┖
 
+                //娓呯┖浣忓畢id
+                UserConfigManage.getInstance().setHomeId("");
                 //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥
                 UserConfigManage.getInstance().setAcceiptPolicy(false);
                 //閲嶆柊璁惧畾涓�涓椂闂�
@@ -322,8 +305,8 @@
      * 鍒濆鍖栨瀬鍏塖DK
      */
     private void initJPush() {
-        JPushInterface.setDebugMode(true);
-        JPushInterface.init(getBaseContext());
+//        JPushInterface.setDebugMode(true);
+//        JPushInterface.init(getBaseContext());
     }
 
     /**

--
Gitblit v1.8.0