Merge branch 'wxw_new' into dev-hxb

hxb

2024-04-11 1078968985ae81e79ea149e3251841cd9bd54a1e

 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);
    }
}