From 81e76f2dd4cb9789f34e5eb85a45745a19492c84 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 27 Jan 2022 18:21:22 +0800 Subject: [PATCH] =?UTF-8?q?[Upload]=20=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- config.gradle | 2 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 2 +- .../mogo/eagle/core/network/NetConfig.java | 26 ----------------- .../aicloud/services/httpdns/MogoHttpDns.java | 25 ---------------- .../com/mogo/commons/AbsMogoApplication.java | 2 +- .../mogo/commons/network/NetConfigUtils.java | 29 +------------------ gradle.properties | 16 +++++----- .../dispatch/model/DispatchServiceModel.java | 2 +- 8 files changed, 13 insertions(+), 91 deletions(-) diff --git a/config.gradle b/config.gradle index 5f9130d7b2..ceecd3f816 100644 --- a/config.gradle +++ b/config.gradle @@ -114,7 +114,7 @@ ext { obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19', mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10', - adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate14', + adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate16', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 0659589fe7..8df78d393f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -960,7 +960,7 @@ class MoGoHmiFragment : MvpFragment */ override fun showTurnLight(light: Int) { if (isOpenTurnlight) { - Log.d("liyz", "showTurnLight light = $light") + //Log.d("liyz", "showTurnLight light = $light") turnLightView.setTurnLight(light) } } diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/NetConfig.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/NetConfig.java index 7263d8a5d9..4a6ea80e02 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/NetConfig.java +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/NetConfig.java @@ -88,14 +88,6 @@ public final class NetConfig { return this; } - public synchronized HostnameVerifier getHostnameVerifier() { - return hostnameVerifier; - } - - public synchronized NetConfig setHostnameVerifier( HostnameVerifier hostnameVerifier ) { - this.hostnameVerifier = hostnameVerifier; - return this; - } public synchronized NetConfig setSignaturePrefix( String prefix ) { this.signaturePrefix = prefix; @@ -106,24 +98,6 @@ public final class NetConfig { return signaturePrefix; } - public synchronized Set< Interceptor > getInterceptors() { - return interceptors; - } - - public synchronized NetConfig addInterceptor( Interceptor interceptor ) { - interceptors.add( interceptor ); - return this; - } - - public synchronized Set< Interceptor > getNetworkInterceptors() { - return networkInterceptors; - } - - public synchronized NetConfig addNetworkInterceptor( Interceptor networkInterceptor ) { - networkInterceptors.add( networkInterceptor ); - return this; - } - public synchronized NetConfig setPublicParams( Map< String, Object > publicParams ) { this.publicParams = publicParams; return this; diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java index 12c804dd8a..b0c7e16e38 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java @@ -50,29 +50,4 @@ public class MogoHttpDns implements IMogoHttpDns { } -// @Override -// public List lookup(String hostname) throws UnknownHostException { -// String cacheIp = httpDnsHelper.getHttpDnsCachedAddress(HTTP_DNS_ADDRESS_TYPE_HTTP, hostname); -// Logger.d("MogoHttpDnsLook", "lookup host: " + hostname + " cacheIp: " + cacheIp); -// if (cacheIp == null || TextUtils.isEmpty(cacheIp)) { -// cacheIp = httpDnsHelper.getHttpDnsAddress(HttpDnsHelper.HTTP_DNS_TYPE_HTTP, hostname); -// Logger.d("MogoHttpDnsLook", "==== lookup host: " + hostname + " cacheIp: " + cacheIp); -// if (!TextUtils.isEmpty(cacheIp)) { -// String[] info = cacheIp.split(":"); -// if (info.length > 1) { -// return Arrays.asList(InetAddress.getAllByName(info[0])); -// } else { -// return Arrays.asList(InetAddress.getAllByName(cacheIp)); -// } -// } -// return Collections.emptyList(); -// } -// String[] info = cacheIp.split(":"); -// if (info.length > 1) { -// return Arrays.asList(InetAddress.getAllByName(info[0])); -// } else { -// return Arrays.asList(InetAddress.getAllByName(cacheIp)); -// } -// } - } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index e4155e84be..a46c38f046 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -142,7 +142,7 @@ public abstract class AbsMogoApplication extends Application { ThreadPoolService.execute(() -> { //初始化网络配置 - NetConfigUtils.init(sApis); + NetConfigUtils.init(); // 初始化埋点 AnalyticsUtils.init(sApp); if (DebugConfig.getCarMachineType() == CAR_MACHINE_TYPE_SELF_INNOVATE) { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java index 7138fa8fe1..89639b3bed 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java @@ -1,19 +1,11 @@ package com.mogo.commons.network; -import com.mogo.aicloud.services.httpdns.IMogoHttpDns; import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.storage.SpStorage; -import com.mogo.eagle.core.network.AllAllowedHostnameVerifier; import com.mogo.eagle.core.network.Constants; import com.mogo.eagle.core.network.NetConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import javax.net.ssl.SSLContext; -import okhttp3.Request; - -import static com.mogo.aicloud.services.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP; - /** * @author xuxinchao * @description 网络配置工具 @@ -23,9 +15,8 @@ public class NetConfigUtils { /** * 网络配置初始化 - * @param iMogoHttpDns Http DNS转换实现 */ - public static void init(IMogoHttpDns iMogoHttpDns){ + public static void init() { try { SSLContext sc = NetConfig.getSslContext(); NetConfig.instance().setSslContext(sc); @@ -34,24 +25,6 @@ public class NetConfigUtils { } NetConfig.instance().setSignaturePrefix(Constants.SIGN_PREFIX) .setPublicParams(ParamsUtil.getStaticParams()) - .setHostnameVerifier(new AllAllowedHostnameVerifier()) - .addNetworkInterceptor(chain -> { - Request original = chain.request(); - Request request = original.newBuilder() - .header("token", SpStorage.getTicket()) - .method(original.method(), original.body()) - .build(); - return chain.proceed(request); - }) - // 增加域名->域名的转换方式，暂时去掉httpdns方式 - .addInterceptor(chain -> { - Request request = chain.request(); - String path = request.url().encodedPath(); - String host = "http://" + iMogoHttpDns.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()); - }) .setLoggable(DebugConfig.isDebug()); } diff --git a/gradle.properties b/gradle.properties index 434b03b691..1dbfe43be0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,21 +63,21 @@ SERVICE_CHAIN_VERSION=1.0.43 LOGLIB_VERSION=1.1.18 ######## MogoAiCloudSDK Version ######## # 网络请求 -MOGO_NETWORK_VERSION=1.3.17 +MOGO_NETWORK_VERSION=1.3.18 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.17 +MOGO_PASSPORT_VERSION=1.3.18 # 常链接 -MOGO_SOCKET_VERSION=1.3.17 +MOGO_SOCKET_VERSION=1.3.18 # 数据采集 -MOGO_REALTIME_VERSION=1.3.17 +MOGO_REALTIME_VERSION=1.3.18 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.17 +MOGO_TANLU_VERSION=1.3.18 # 直播推流 -MOGO_LIVE_VERSION=1.3.17 +MOGO_LIVE_VERSION=1.3.18 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.17 +MOGO_TRAFFICLIVE_VERSION=1.3.18 # 定位服务 -MOGO_LOCATION_VERSION=1.3.17 +MOGO_LOCATION_VERSION=1.3.18 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.0.0.23 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java index a76f74bd62..271561edfc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java @@ -74,7 +74,7 @@ public class DispatchServiceModel { @Override public void onNext(BaseData o) { super.onNext(o); - Logger.d(TAG, "uploadAutopilotStatus success"); + //Logger.d(TAG, "uploadAutopilotStatus success"); } @Override