From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index ad0e563..db20c5c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -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();
 
 
     }
@@ -235,6 +235,8 @@
                 AppManagerUtils.getAppManager().finishAllActivity();
 //                HDLSDKSPUtils.clear();//搴曞眰鑷繁娓呯┖
 
+                //娓呯┖浣忓畢id
+                UserConfigManage.getInstance().setHomeId("");
                 //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥
                 UserConfigManage.getInstance().setAcceiptPolicy(false);
                 //閲嶆柊璁惧畾涓�涓椂闂�
@@ -303,8 +305,8 @@
      * 鍒濆鍖栨瀬鍏塖DK
      */
     private void initJPush() {
-        JPushInterface.setDebugMode(true);
-        JPushInterface.init(getBaseContext());
+//        JPushInterface.setDebugMode(true);
+//        JPushInterface.init(getBaseContext());
     }
 
     /**

--
Gitblit v1.8.0