From 053b695f9e9b51e96d68def0478b6c6c703c6308 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 30 Dec 2020 14:25:17 +0800 Subject: [PATCH 1/4] opt --- foudations/httpdns-mogo/build.gradle | 2 +- .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 9 ++------- .../java/com/mogo/base/websocket/WebSocketManager.java | 3 +++ gradle.properties | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index 964b800da1..6b662cab56 100644 --- a/foudations/httpdns-mogo/build.gradle +++ b/foudations/httpdns-mogo/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler - implementation 'com.mogo.httpdns:httpdns-helper:1.0.14' + implementation 'com.mogo.httpdns:httpdns-helper:1.0.15' if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.httpdnsbase diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java index d556f51cc1..64e4ffe141 100644 --- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java +++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java @@ -50,14 +50,8 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback) { - Logger.d("MogoHttpDns", "host: " + host + " type: " + type); + Logger.d("MogoHttpDns", "getHttpDnsIp host: " + host + " type: " + type); Map map = httpDnsHelper.getAllAddress(); - if(map != null) { - Logger.d("MogoHttpDns", "all host: "); - for (String key : map.keySet()) { - Logger.d("MogoHttpDns", "key: " + key + " value: " + map.get(key)); - } - } if (useCache) { String address = httpDnsHelper.getHttpDnsCachedAddress(type, host); if (address != null) { @@ -74,6 +68,7 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void addHttpDnsTtlCallback(String host, int type, IHttpDnsTtlCallback callback) { + Logger.d("MogoHttpDns","addHttpDnsTtlCallback: host: "+host+" type: "+type); if (ttlCallbackMap.get(type + "-" + host) == null) { ttlCallbackMap.put(type + "-" + host, new ArrayList()); } diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index 5e110bb8ea..1ad96357ef 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -78,6 +78,9 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin @Override public void ttlIp(String url) { Logger.d(TAG,"ttlIp url : " + url); + if(!WebSocketInstanceHolder.getClientProxy().isOpen()){ + return; + } WebSocketInstanceHolder.getClientProxy().stop(); WebSocketInstanceHolder.getClientProxy().disConnect(); Logger.d(TAG,"ready to re initWebSocket : " + url); diff --git a/gradle.properties b/gradle.properties index 04aee2cfe7..542c574591 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.60 +CARCHATTING_VERSION=2.2.63 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.8 # websocket From a121f3d2bda723b389884021b3bf93ddd012334f Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 5 Jan 2021 14:02:48 +0800 Subject: [PATCH 2/4] httpdns singleton --- .idea/gradle.xml | 1 + .../com/mogo/launcher/MogoApplication.java | 12 ++++++ .../mogo/httpdns/IHttpDnsLocationChanged.java | 13 +++++++ .../java/com/mogo/httpdns/IMogoHttpDns.java | 10 +++++ foudations/httpdns-mogo/build.gradle | 2 - .../com/mogo/httpdns/mogo/MogoHttpDns.java | 18 +++++---- .../base/websocket/WebSocketDnsManager.java | 2 +- .../com/mogo/commons/AbsMogoApplication.java | 6 +++ .../utils/httpdns/HttpSimpleLocation.java | 37 +++++++++++++++++++ 9 files changed, 91 insertions(+), 10 deletions(-) create mode 100644 foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsLocationChanged.java create mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 426ff6b360..8efbfa420e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -85,6 +85,7 @@ diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b21ec92c05..02b837e126 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -12,6 +12,7 @@ import com.bytedance.boost_multidex.BoostMultiDex; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; +import com.mogo.map.location.MogoLocation; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoApisHandler; @@ -30,6 +31,7 @@ import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.test.crashreport.ITestCrashReportProvider; import com.mogo.utils.ProcessUtils; import com.mogo.utils.UiThreadHandler; +import com.mogo.utils.httpdns.HttpSimpleLocation; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; @@ -157,6 +159,16 @@ public class MogoApplication extends AbsMogoApplication { prepareBaseService( apis, 2_000L ); } + @Override + protected HttpSimpleLocation getCurrentLocation() { + MogoLocation location = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation(); + if (location == null) { + return null; + }else { + return new HttpSimpleLocation(location.getCityCode(), location.getLatitude(), location.getLongitude()); + } + } + /** * 基础服务：passport、location、socket */ diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsLocationChanged.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsLocationChanged.java new file mode 100644 index 0000000000..3753ebc90e --- /dev/null +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsLocationChanged.java @@ -0,0 +1,13 @@ +package com.mogo.httpdns; + +import android.location.Location; + +import com.mogo.utils.httpdns.HttpSimpleLocation; + +public interface IHttpDnsLocationChanged { + /** + * 获取当前定位 + * @return 当前定位 + */ + HttpSimpleLocation getLocation(); +} diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java index 725d63cc72..f07ea004cb 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java @@ -1,5 +1,7 @@ package com.mogo.httpdns; +import android.content.Context; + import androidx.annotation.Keep; import androidx.annotation.Nullable; @@ -95,4 +97,12 @@ interface IMogoHttpDns extends IProvider { */ @Keep void removeHttpDnsTtlCallback(String host,int type); + + /** + * 初始化 + * + * @param context 上下文 + * @param locationChanged 定位发生变化 + */ + void init(Context context, IHttpDnsLocationChanged locationChanged); } diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index 6b662cab56..2c44ea5a06 100644 --- a/foudations/httpdns-mogo/build.gradle +++ b/foudations/httpdns-mogo/build.gradle @@ -37,11 +37,9 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.httpdnsbase implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.modulecommon } else { implementation project(':foudations:httpdns-base') implementation project(':foudations:mogo-commons') - implementation project(':modules:mogo-module-common') } } diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java index 64e4ffe141..a39e7c59a1 100644 --- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java +++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java @@ -1,7 +1,6 @@ package com.mogo.httpdns.mogo; import android.content.Context; -import android.os.Debug; import android.text.TextUtils; import android.util.ArrayMap; @@ -12,14 +11,14 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; import com.mogo.httpdns.HttpDnsConst; import com.mogo.httpdns.IHttpDnsCallback; +import com.mogo.httpdns.IHttpDnsLocationChanged; import com.mogo.httpdns.IHttpDnsTtlCallback; import com.mogo.httpdns.IMogoHttpDns; import com.mogo.httpdnshelper.sdk.HttpDnsHelper; import com.mogo.httpdnshelper.sdk.bean.HttpDnsSimpleLocation; import com.mogo.httpdnshelper.sdk.listener.IHttpDnsCurrentLocation; import com.mogo.httpdnshelper.sdk.listener.OnAddressChangedListener; -import com.mogo.map.location.MogoLocation; -import com.mogo.module.common.MogoApisHandler; +import com.mogo.utils.httpdns.HttpSimpleLocation; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.HttpDns; @@ -83,13 +82,18 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void init(final Context context) { + + } + + @Override + public void init(Context context, final IHttpDnsLocationChanged locationChanged) { httpDnsHelper = new HttpDnsHelper.Builder().setContext(context).setEnv(DebugConfig.getNetMode()).setSn(Utils.getSn()).setShowDebugLog(true).setLoopCheckDelay(15 * 60 * 1000).setCurrentLocation(new IHttpDnsCurrentLocation() { @org.jetbrains.annotations.Nullable @Override public HttpDnsSimpleLocation getCurrentLocation() { - MogoLocation last = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(context).getLastKnowLocation(); - if (last != null) { - return new HttpDnsSimpleLocation(last.getCityCode(), last.getLatitude(), last.getLongitude()); + HttpSimpleLocation simpleLocation = locationChanged.getLocation(); + if (simpleLocation != null) { + return new HttpDnsSimpleLocation("0734", simpleLocation.getLat(), simpleLocation.getLon()); } return null; } @@ -121,7 +125,7 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe } @Override - public void onAddressChanged(@org.jetbrains.annotations.Nullable Map map) { + public void onAddressChanged(Map map) { if (map != null) { for (String key : map.keySet()) { if (ttlCallbackMap.get(key) != null) { diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java index 8a46cb0ba2..4605e4b9ec 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java @@ -28,7 +28,7 @@ public class WebSocketDnsManager { public void getHttpDnsIp(WebSocketDns webSocketDns) { this.webSocketDns = webSocketDns; - IMogoHttpDns mogoHttpDns = ARouter.getInstance().navigation(IMogoHttpDns.class); + IMogoHttpDns mogoHttpDns = MogoHttpDnsHandler.getHttpDnsApi(); ThreadPoolService.execute(() -> mogoHttpDns.getHttpDnsIp(WebSocketConstant.getDomain(), HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS,false, ip -> { Logger.d(TAG, "getHttpDnsIp ip : " + ip + " , 得到Dns IP,准备回调 初始化webSocket"); this.cacheIp = ip; 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 636cf85304..3cf6518c85 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 @@ -24,6 +24,7 @@ import com.mogo.httpdns.MogoHttpDnsHandler; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.TipDrawable; import com.mogo.utils.TipToast; +import com.mogo.utils.httpdns.HttpSimpleLocation; import com.mogo.utils.network.NetConfig; import java.security.SecureRandom; @@ -87,6 +88,7 @@ public abstract class AbsMogoApplication extends Application { } private void syncInit() { + MogoHttpDnsHandler.getHttpDnsApi().init(this, this::getCurrentLocation); TipToast.init( this, ( ( context, message, tipDrawable ) -> { if ( TextUtils.isEmpty( message ) ) { return null; @@ -100,6 +102,10 @@ public abstract class AbsMogoApplication extends Application { } ) ); } + protected HttpSimpleLocation getCurrentLocation(){ + return null; + } + private View generateToastView( Context context, String message, TipDrawable tipDrawable){ View contentView; if(tipDrawable==null) { diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java new file mode 100644 index 0000000000..f8589f8f18 --- /dev/null +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java @@ -0,0 +1,37 @@ +package com.mogo.utils.httpdns; + +public class HttpSimpleLocation { + private String cityCode; + private double lat; + private double lon; + + public HttpSimpleLocation(String cityCode, double lat, double lon) { + this.cityCode = cityCode; + this.lat = lat; + this.lon = lon; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLon() { + return lon; + } + + public void setLon(double lon) { + this.lon = lon; + } +} From aa95ab8f875adc82697fc979ee89c617120d5545 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 5 Jan 2021 17:58:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=B0=E8=B7=AF=E7=94=B1=E8=A1=A8=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8Bhttpdns=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/httpdns-mogo/build.gradle | 2 +- .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 4 ++-- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index 2c44ea5a06..8fc6202121 100644 --- a/foudations/httpdns-mogo/build.gradle +++ b/foudations/httpdns-mogo/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler - implementation 'com.mogo.httpdns:httpdns-helper:1.0.15' + implementation 'com.mogo.httpdns:httpdns-helper:1.0.16' if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.httpdnsbase diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java index a39e7c59a1..7bdc28045f 100644 --- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java +++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java @@ -87,13 +87,13 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void init(Context context, final IHttpDnsLocationChanged locationChanged) { - httpDnsHelper = new HttpDnsHelper.Builder().setContext(context).setEnv(DebugConfig.getNetMode()).setSn(Utils.getSn()).setShowDebugLog(true).setLoopCheckDelay(15 * 60 * 1000).setCurrentLocation(new IHttpDnsCurrentLocation() { + httpDnsHelper = new HttpDnsHelper.Builder().setContext(context).setEnv(DebugConfig.getNetMode()).setDefaultUrl("dzt.zhidaozhixing.com").setSn(Utils.getSn()).setShowDebugLog(true).setLoopCheckDelay(15 * 60 * 1000).setCurrentLocation(new IHttpDnsCurrentLocation() { @org.jetbrains.annotations.Nullable @Override public HttpDnsSimpleLocation getCurrentLocation() { HttpSimpleLocation simpleLocation = locationChanged.getLocation(); if (simpleLocation != null) { - return new HttpDnsSimpleLocation("0734", simpleLocation.getLat(), simpleLocation.getLon()); + return new HttpDnsSimpleLocation(simpleLocation.getCityCode(), simpleLocation.getLat(), simpleLocation.getLon()); } return null; } diff --git a/gradle.properties b/gradle.properties index 542c574591..b363eb76e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.63 +CARCHATTING_VERSION=2.2.65 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.8 # websocket From b1fdb1fd31a4e7a09c8b25950c1865d7b1864477 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 6 Jan 2021 11:55:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0host=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/httpdns/mogo/MogoHttpDns.java | 2 +- .../module/common/constants/HostConst.java | 19 ++++++++ modules/mogo-module-share/consumer-rules.pro | 5 +- modules/mogo-module-share/proguard-rules.pro | 5 +- .../com/mogo/module/share/ShareControl.java | 7 +-- .../module/share/constant/HttpConstant.kt | 4 ++ .../module/share/manager/SeekHelpManager.kt | 7 +-- .../mogo/module/share/net/ShareApiService.kt | 47 ------------------- .../module/share/net/ShareDevaApiService.java | 32 +++++++++++++ .../module/share/net/ShareLsApiService.java | 25 ++++++++++ .../module/share/net/ShareRtlApiService.java | 19 ++++++++ .../share/strategyreceiver/BlockStrategy.kt | 11 ----- 12 files changed, 116 insertions(+), 67 deletions(-) create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java delete mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareDevaApiService.java create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareLsApiService.java create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java index 7bdc28045f..5134c3e77c 100644 --- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java +++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java @@ -93,7 +93,7 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe public HttpDnsSimpleLocation getCurrentLocation() { HttpSimpleLocation simpleLocation = locationChanged.getLocation(); if (simpleLocation != null) { - return new HttpDnsSimpleLocation(simpleLocation.getCityCode(), simpleLocation.getLat(), simpleLocation.getLon()); + return new HttpDnsSimpleLocation("0734", simpleLocation.getLat(), simpleLocation.getLon()); } return null; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java new file mode 100644 index 0000000000..6a188c5115 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java @@ -0,0 +1,19 @@ +package com.mogo.module.common.constants; + +/** + * 通用接口请求host + * + * @author tong + */ +public class HostConst { + public static final String DEVA_HOST = "http://dzt-deva.zhidaozhixing.com"; + public static final String IM_HOST = "http://dzt-im.zhidaozhixing.com"; + public static final String LAUNCHER_SNAPSHOT_HOST = "http://dzt-launcherSnapshot.zhidaozhixing.com"; + public static final String CHANNEL_MANAGER_HOST = "http://dzt-channelManager.zhidaozhixing.com"; + public static final String DATA_SERVICE_HOST = "http://dzt-dataService.zhidaozhixing.com"; + public static final String REALTIME_LOCATION_HOST = "http://dzt-realtimeLocation.zhidaozhixing.com"; + public static final String INSTANT_HOST = "http://dzt-Instant.zhidaozhixing.com"; + + public static final String IM_SOCKET_DOMAIN = "dzt-im.zhidaozhixing.com"; + public static final String WEBSOCKET_DOMAIN = "dzt-city.zhidaozhixing.com"; +} diff --git a/modules/mogo-module-share/consumer-rules.pro b/modules/mogo-module-share/consumer-rules.pro index 3cae82b2c2..5c4b2cc0e8 100644 --- a/modules/mogo-module-share/consumer-rules.pro +++ b/modules/mogo-module-share/consumer-rules.pro @@ -2,4 +2,7 @@ -keep class com.mogo.module.share.bean.**{*;} -keep class com.mogo.module.share.constant.**{*;} -keep class com.mogo.module.share.manager.ISeekHelpListener --keep class com.mogo.module.share.net.ShareApiService +-keep class com.mogo.module.share.net.ShareDevaApiService +-keep class com.mogo.module.share.net.ShareLsApiService +-keep class com.mogo.module.share.net.ShareRtlApiService +#-keep class com.mogo.module.share.net.ShareApiService diff --git a/modules/mogo-module-share/proguard-rules.pro b/modules/mogo-module-share/proguard-rules.pro index b436d973dd..08a8bde62e 100644 --- a/modules/mogo-module-share/proguard-rules.pro +++ b/modules/mogo-module-share/proguard-rules.pro @@ -24,4 +24,7 @@ -keep class com.mogo.module.share.bean.**{*;} -keep class com.mogo.module.share.constant.**{*;} -keep class com.mogo.module.share.manager.ISeekHelpListener --keep class com.mogo.module.share.net.ShareApiService \ No newline at end of file +-keep class com.mogo.module.share.net.ShareDevaApiService +-keep class com.mogo.module.share.net.ShareLsApiService +-keep class com.mogo.module.share.net.ShareRtlApiService +#-keep class com.mogo.module.share.net.ShareApiService \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 25ff93e4f4..07a102a9cc 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -16,6 +16,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; +import com.mogo.module.common.constants.HostConst; import com.mogo.module.common.dialog.BaseFloatDialog; import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.share.bean.FixableButton; @@ -27,7 +28,7 @@ import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.dialog.GridFixableShareDialog; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.module.share.manager.UploadHelper; -import com.mogo.module.share.net.ShareApiService; +import com.mogo.module.share.net.ShareDevaApiService; import com.mogo.service.MogoServicePaths; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.share.IMogoTanluProvider; @@ -454,8 +455,8 @@ public class ShareControl implements IMogoShareManager, Handler.Callback { ShareConfigRequest request = new ShareConfigRequest(Utils.getSn(), location.getAdCode()); params.put("data", request.toJson()); - ServiceApisManager.serviceApis.getNetworkApi().create(ShareApiService.class, - HttpConstant.Companion.getNetHost()).queryShareButtonConfig(params).subscribeOn(Schedulers.io()).observeOn(Schedulers.io()).subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { + ServiceApisManager.serviceApis.getNetworkApi().create(ShareDevaApiService.class, + HostConst.DEVA_HOST).queryShareButtonConfig(params).subscribeOn(Schedulers.io()).observeOn(Schedulers.io()).subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { @Override public void onSuccess(ShareButtonConfigResponse o) { super.onSuccess(o); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt index 497a1dd160..18f146150e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt @@ -10,6 +10,10 @@ class HttpConstant { const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com" const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com" + const val DEVA_HOST = "http://dzt-deva.zhidaozhixing.com" + const val RTL_HOST = "http://dzt-realtimeLocation.zhidaozhixing.com" + const val LS_HOST = "http://dzt-launcherSnapshot.zhidaozhixing.com" + @JvmStatic fun getNetHost(): String { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index d1b6bf781b..16e8bd8e59 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -10,11 +10,12 @@ import com.mogo.commons.network.SubscribeImpl import com.mogo.commons.network.Utils import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack +import com.mogo.module.common.constants.HostConst import com.mogo.module.share.bean.SeekRecord import com.mogo.module.share.bean.SeekRequest import com.mogo.module.share.bean.getJson import com.mogo.module.share.constant.HttpConstant -import com.mogo.module.share.net.ShareApiService +import com.mogo.module.share.net.ShareRtlApiService import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger import com.mogo.utils.network.RequestOptions @@ -164,7 +165,7 @@ object SeekHelpManager { properties["from"] = from AnalyticsUtils.track("v2x_share_type", properties) - ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { + ServiceApisManager.serviceApis.networkApi.create(ShareRtlApiService::class.java, HostConst.REALTIME_LOCATION_HOST).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { override fun onSuccess(o: BaseData?) { super.onSuccess(o) // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标 @@ -222,7 +223,7 @@ object SeekHelpManager { fun debugCancelSeek() { val seekRequest = SeekRequest(Utils.getSn(), 0) val param = mutableMapOf("data" to seekRequest.getJson()) - ServiceApisManager.serviceApis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { + ServiceApisManager.serviceApis.networkApi.create(ShareRtlApiService::class.java, HostConst.REALTIME_LOCATION_HOST).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) { override fun onSuccess(o: BaseData?) { super.onSuccess(o) // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt deleted file mode 100644 index 347ff0de3d..0000000000 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.mogo.module.share.net - -import com.mogo.commons.data.BaseData -import com.mogo.module.share.bean.AverateSpeedResponse -import com.mogo.module.share.bean.BaseDataCompat -import com.mogo.module.share.bean.RoadInfos -import com.mogo.module.share.bean.ShareButtonConfigResponse -import io.reactivex.Observable -import okhttp3.RequestBody -import retrofit2.http.* - -/** - * 分享用到的api接口 - */ -interface ShareApiService { - /** - * 发起求助接口 - */ - @FormUrlEncoded - @POST("/yycp-realtimeLocations/vehicleTypeManage/car/updateVehicleType/v1") - fun sendHelpSignal(@FieldMap param: Map): Observable - - /** - * 拥堵策略，上报平均速度 - */ - @Headers("Content-type:application/json;charset=UTF-8") - @POST("/deva/car/path/no/poiStrategyCheck/v1") - fun sendAverageSpeedForBlockStrategy(@Body request: RequestBody, @Query("sn") sn: String): Observable - - /** - * 获取分享框服务端配置 - */ - @FormUrlEncoded - @POST("/deva/car/poiType/no/poiTypeList") - fun queryShareButtonConfig(@FieldMap param: Map): Observable - - /** - * 查询（搜索）道路事件信息 - * 接口文档：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42305842 - * 文档中有些参数暂时没有用到，包括radius,limit - * @return - */ - @FormUrlEncoded - @POST("/yycp-launcherSnapshot/launcherSnapshot/searchRoadEventsSync") - fun queryRoadInfos(@FieldMap params: Map): Observable> - -} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareDevaApiService.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareDevaApiService.java new file mode 100644 index 0000000000..d4adcb6e0a --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareDevaApiService.java @@ -0,0 +1,32 @@ +package com.mogo.module.share.net; + +import com.mogo.module.share.bean.AverateSpeedResponse; +import com.mogo.module.share.bean.ShareButtonConfigResponse; + +import java.util.Map; + +import io.reactivex.Observable; +import okhttp3.RequestBody; +import retrofit2.http.Body; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.Headers; +import retrofit2.http.POST; +import retrofit2.http.Query; + +public interface ShareDevaApiService { + /** + * 拥堵策略，上报平均速度 + */ + @Headers("Content-type:application/json;charset=UTF-8") + @POST("/deva/car/path/no/poiStrategyCheck/v1") + Observable sendAverageSpeedForBlockStrategy(@Body RequestBody request, @Query("sn")String sn); + + /** + * 获取分享框服务端配置 + */ + @FormUrlEncoded + @POST("/deva/car/poiType/no/poiTypeList") + Observable queryShareButtonConfig(@FieldMap Map param); + +} diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareLsApiService.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareLsApiService.java new file mode 100644 index 0000000000..2de41196a1 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareLsApiService.java @@ -0,0 +1,25 @@ +package com.mogo.module.share.net; + +import com.mogo.module.share.bean.BaseDataCompat; +import com.mogo.module.share.bean.RoadInfos; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface ShareLsApiService { + /** + * 查询（搜索）道路事件信息 + * 接口文档：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42305842 + * 文档中有些参数暂时没有用到，包括radius,limit + * + * @return + */ + @FormUrlEncoded + @POST("/yycp-launcherSnapshot/launcherSnapshot/searchRoadEventsSync") + Observable> queryRoadInfos(@FieldMap Map params); + +} diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java new file mode 100644 index 0000000000..bf43b3f1ea --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java @@ -0,0 +1,19 @@ +package com.mogo.module.share.net; + +import com.mogo.commons.data.BaseData; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface ShareRtlApiService { + /** + * 发起求助接口 + */ + @FormUrlEncoded + @POST("/yycp-realtimeLocations/vehicleTypeManage/car/updateVehicleType/v1") + Observable sendHelpSignal(@FieldMap Map param ); +} diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 75936e070a..369c528f10 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -3,24 +3,13 @@ package com.mogo.module.share.strategyreceiver import android.content.Context import android.os.Handler import android.os.SystemClock -import android.util.ArrayMap -import com.mogo.commons.network.SubscribeImpl -import com.mogo.commons.network.Utils import com.mogo.map.MogoLatLng -import com.mogo.module.share.bean.AverateSpeedResponse -import com.mogo.module.share.constant.HttpConstant import com.mogo.module.share.manager.ServiceApisManager -import com.mogo.module.share.net.ShareApiService import com.mogo.service.IMogoServiceApis import com.mogo.service.share.IMogoTanluProvider import com.mogo.service.share.TanluUploadParams import com.mogo.utils.logger.Logger -import com.mogo.utils.network.RequestOptions -import com.mogo.utils.network.utils.GsonUtil import com.mogo.utils.storage.SharedPrefsMgr -import io.reactivex.schedulers.Schedulers -import okhttp3.MediaType -import okhttp3.RequestBody import java.util.* import kotlin.collections.ArrayList