logic perform upgrade

This commit is contained in:
zhongchao
2021-09-01 16:21:42 +08:00
parent dc1adf80d0
commit 9b41205800
62 changed files with 109 additions and 168 deletions

View File

@@ -1,7 +1,7 @@
package com.mogo.commons;
import static com.mogo.aicloud.services.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;
import static com.mogo.commons.debug.DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE;
import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;
import android.app.Application;
import android.content.Context;
@@ -14,6 +14,8 @@ import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.amap.api.navi.AMapNaviView;
import com.mogo.aicloud.services.httpdns.IMogoHttpDns;
import com.mogo.aicloud.services.httpdns.MogoHttpDnsHandler;
import com.mogo.commons.analytics.AnalyticsUtils;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.device.Devices;
@@ -22,8 +24,6 @@ import com.mogo.commons.network.Constants;
import com.mogo.commons.network.ParamsUtil;
import com.mogo.commons.network.X509TrustManagerImpl;
import com.mogo.commons.storage.SpStorage;
import com.mogo.httpdns.IMogoHttpDns;
import com.mogo.httpdns.MogoHttpDnsHandler;
import com.mogo.utils.ThreadPoolService;
import com.mogo.utils.TipDrawable;
import com.mogo.utils.TipToast;
@@ -59,6 +59,8 @@ public abstract class AbsMogoApplication extends Application {
return aMapNaviView;
}
private static IMogoHttpDns sApis;
@Override
public void onCreate() {
super.onCreate();
@@ -66,9 +68,7 @@ public abstract class AbsMogoApplication extends Application {
aMapNaviView.onCreate(null);
sApp = this;
initARouter();
if (shouldInit()) {
init();
}
init();
}
private void initARouter() {
@@ -80,12 +80,10 @@ public abstract class AbsMogoApplication extends Application {
}
}
protected boolean shouldInit() {
return true;
}
protected void init() {
if (sApis == null) {
sApis = MogoHttpDnsHandler.getHttpDnsApi();
}
}
protected void initTipToast() {
@@ -161,11 +159,6 @@ public abstract class AbsMogoApplication extends Application {
} catch (Exception e) {
e.printStackTrace();
}
IMogoHttpDns dns = MogoHttpDnsHandler.getHttpDnsApi();
if (dns == null) {
Logger.d(TAG, "dns is null");
}
NetConfig.instance().setSignaturePrefix(Constants.SIGN_PREFIX)
.setPublicParams(ParamsUtil.getStaticParams())
.setHostnameVerifier(new AllAllowedHostnameVerifier())
@@ -181,7 +174,7 @@ public abstract class AbsMogoApplication extends Application {
.addInterceptor(chain -> {
Request request = chain.request();
String path = request.url().encodedPath();
String host = "http://" + dns.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
String host = "http://" + sApis.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
String url = host + path;
Logger.d("DomainExchange", "oriHost: " + request.url().host() + " newHost: " + host + " \r\n newUrl: " + url);
return chain.proceed(request.newBuilder().url(url).build());
@@ -193,10 +186,9 @@ public abstract class AbsMogoApplication extends Application {
private String cacheIp = null;
protected void registerSocketHttpDnsTTL(String host) {
IMogoHttpDns mogoHttpDns = MogoHttpDnsHandler.getHttpDnsApi();
mogoHttpDns.addressChangedListener(map -> {
sApis.addressChangedListener(map -> {
Logger.d("TEST-SOCKET", "ttl callBack ,ready to getCache Dns IP");
String dnsCacheIp = mogoHttpDns.getCachedHttpDnsIps(host, HTTP_DNS_ADDRESS_TYPE_HTTP);
String dnsCacheIp = sApis.getCachedHttpDnsIps(host, HTTP_DNS_ADDRESS_TYPE_HTTP);
if (dnsCacheIp == null) {
return;
}