From 1078968985ae81e79ea149e3251841cd9bd54a1e Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期四, 11 四月 2024 15:24:20 +0800 Subject: [PATCH] Merge branch 'wxw_new' into dev-hxb --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 6622578..b350b7a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -1,9 +1,12 @@ package com.hdl.photovoltaic; import android.app.Application; +import android.content.Context; import android.content.Intent; import android.text.TextUtils; + +import androidx.multidex.MultiDex; import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.linkpm.sdk.HDLLinkPMSdk; @@ -205,7 +208,7 @@ } initDCUniMPSDK(); Intent intent = new Intent(getInstance(), HomeLoginActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP); if (type == 1) { intent.putExtra("isJpush", true); } @@ -311,4 +314,10 @@ HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->"); } } + + @Override + protected void attachBaseContext(Context base) { + MultiDex.install(base); + super.attachBaseContext(base); + } } -- Gitblit v1.8.0