From b75795836a851a13e54cc4efb597262fb448217c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 08 五月 2024 15:22:01 +0800 Subject: [PATCH] 2024年05月08日15:21:54 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 97 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 80 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 8b72d3c..f81c9d7 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -1,20 +1,33 @@ package com.hdl.photovoltaic; +import android.app.Activity; import android.app.Application; +import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; +import android.os.SystemClock; import android.text.TextUtils; +import android.util.Log; + +import androidx.multidex.MultiDex; import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.linkpm.sdk.HDLLinkPMSdk; +import com.hdl.linkpm.sdk.core.exception.HDLException; +import com.hdl.linkpm.sdk.home.type.HomeType; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; import com.hdl.linkpm.sdk.user.callback.IOnReloginListener; import com.hdl.linkpm.sdk.utils.HDLSDKSPUtils; +import com.hdl.photovoltaic.bean.MqttInfo; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.enums.NetworkType; +import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlLogLogic; +import com.hdl.photovoltaic.other.HdlMessageLogic; +import com.hdl.photovoltaic.other.HdlMqttLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.ui.HomeLoginActivity; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; @@ -22,6 +35,7 @@ import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.utils.NetworkUtils; import com.hdl.photovoltaic.utils.SharedPreUtils; +import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.connect.HDLUdpConnect; @@ -35,6 +49,10 @@ import cn.jpush.android.api.JPushInterface; import io.dcloud.common.util.RuningAcitvityUtil; +import me.jessyan.autosize.AutoSize; +import me.jessyan.autosize.AutoSizeConfig; +import me.jessyan.autosize.onAdaptListener; +import me.jessyan.autosize.utils.ScreenUtils; import okhttp3.logging.HttpLoggingInterceptor; public class HDLApp extends Application { @@ -55,14 +73,15 @@ @Override public void onCreate() { - super.onCreate(); + + // 鑾峰彇褰撳墠杩涚▼鐨凱ID + Log.d("杩涚▼===", android.os.Process.myPid() + ""); mHDLApp = this; SharedPreUtils.init(this); getAppLanguage(); - initThirdSDK(); + init(); // appLocationInfo(); - } public void getAppLanguage() { @@ -107,16 +126,15 @@ /** * 鍒濆鍖栦笁鏂圭浉鍏砈DK */ - public void initThirdSDK() { + public void init() { // 灏忕▼搴忚繘绋� - if (RuningAcitvityUtil.getAppName(getBaseContext()).contains("unimp")) { + if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) { return; } if (isInitThirdSDK) { return; } isInitThirdSDK = true; - // //5.鍒濆鍖朆ugly // CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true); //6.鍒濆鍖朌CUniMPSDK @@ -128,6 +146,7 @@ // TypeUtils.compatibleWithFieldName = true; // //9.鍒濆鍖栫綉缁滃伐鍏� // NetWorkUtil.init(this); + initAutoSize(); //鍒濆鍖栨瀬鍏夋帹閫� initJPush(); initHDLLinkPMSdk(); @@ -135,10 +154,11 @@ initSocket(); //4.鍒濆鍖朞KHttpLog 鏄惁寮�鍚� setOKHttpLogOpen(isLogEnabled); +// initMqttClient(); //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� - this.initLocalAssetsData(); +// this.initLocalAssetsData(); } @@ -181,20 +201,26 @@ UserConfigManage.getInstance().setLoginDateTime(0); UserConfigManage.getInstance().Save(); - //鏂紑mqtt杩炴帴 - if (MqttRecvClient.getInstance() != null) { - MqttRecvClient.getInstance().stop(); + //娓呯┖娑堟伅缂撳瓨鏁版嵁 + HdlMessageLogic.getInstance().clearListMessage(); + //娓呯┖缂撳瓨鏁版嵁 + if (mInfoMap != null) { + mInfoMap.clear(); } +// //鏂紑mqtt杩炴帴 +// if (MqttRecvClient.getInstance() != null) { +// MqttRecvClient.getInstance().disConnect(); +// } //鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛� // TODO: 10/10/23 // TcpSocketBoot.stopAllConnectLinkGateway(); -// if(null!=HDLUniMPSDKManager.getInstance().getUniMP()){ -// LogUtils.d("asdfasdfasdfsdf鎴戣鍒犻櫎鍟�"); -// HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); -// } -// initDCUniMPSDK(); + if (null != HDLUniMPSDKManager.getInstance().getUniMP()) { + HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); + } + SystemClock.sleep(200); + 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); } @@ -283,13 +309,42 @@ } + /** + * 钃濇箹涓� 淇敼瀹藉害 640dp 瀹藉害鎸夌収dp銆乻p鏉ラ�傞厤 + * 鏃嬭浆鍚庨珮鍙樺,鎸夋棆杞悗楂樺害閫傞厤,鎵�浠ュ搴︿笉鍐欐 + */ + private void initAutoSize() { + AutoSize.initCompatMultiProcess(this); + boolean isBaseOnWidth = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT; + AutoSizeConfig.getInstance() + .setBaseOnWidth(true) + .setCustomFragment(true) + .setDesignWidthInDp(375) + .setDesignHeightInDp(812) + .setUseDeviceSize(false) + .setOnAdaptListener(new onAdaptListener() { + @Override + public void onAdaptBefore(Object target, Activity activity) { + + AutoSizeConfig.getInstance().setScreenWidth(ScreenUtils.getScreenSize(activity)[0]); + AutoSizeConfig.getInstance().setScreenHeight(ScreenUtils.getScreenSize(activity)[1] + + ScreenUtils.getHeightOfNavigationBar(activity) + ScreenUtils.getStatusBarHeight()); + + } + + @Override + public void onAdaptAfter(Object target, Activity activity) { + + } + }); + } /** * 鍒濆鍖杣ni app mqtt */ private void initUniMqtt() { try { - String ip = NetworkUtils.getIPAddress(this); + String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this); if (TextUtils.isEmpty(ip)) { return; } @@ -301,4 +356,12 @@ } } + @Override + protected void attachBaseContext(Context base) { + MultiDex.install(base); + super.attachBaseContext(base); + } + + + } -- Gitblit v1.8.0