yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加host常量

Browse Source
This commit is contained in:
tongchenfei
2021-01-06 11:55:52 +08:00
parent aa95ab8f87
commit b1fdb1fd31
12 changed files with 116 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
View File

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

19
modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java Normal file
View File

@@ -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";
}

5
modules/mogo-module-share/consumer-rules.pro
View File

@@ -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

5
modules/mogo-module-share/proguard-rules.pro vendored
View File

@@ -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
-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

7
modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
View File

@@ -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<ShareButtonConfigResponse>(RequestOptions.create(mContext)) {
ServiceApisManager.serviceApis.getNetworkApi().create(ShareDevaApiService.class,
HostConst.DEVA_HOST).queryShareButtonConfig(params).subscribeOn(Schedulers.io()).observeOn(Schedulers.io()).subscribe(new SubscribeImpl<ShareButtonConfigResponse>(RequestOptions.create(mContext)) {
@Override
public void onSuccess(ShareButtonConfigResponse o) {
super.onSuccess(o);

4
modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt
View File

@@ -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 {

7
modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
View File

@@ -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<BaseData>(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<BaseData>(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<BaseData>(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<BaseData>(RequestOptions.create(context)) {
override fun onSuccess(o: BaseData?) {
super.onSuccess(o)
// 接口请求成功，内部同步v2x状态，通知adas，改变自车图标

47
modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt
View File

@@ -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<String, String>): Observable<BaseData>
/**
* 拥堵策略，上报平均速度
*/
@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<AverateSpeedResponse>
/**
* 获取分享框服务端配置
*/
@FormUrlEncoded
@POST("/deva/car/poiType/no/poiTypeList")
fun queryShareButtonConfig(@FieldMap param: Map<String, String>): Observable<ShareButtonConfigResponse>
/**
* 查询（搜索）道路事件信息
* 接口文档：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42305842
* 文档中有些参数暂时没有用到，包括radius,limit
* @return
*/
@FormUrlEncoded
@POST("/yycp-launcherSnapshot/launcherSnapshot/searchRoadEventsSync")
fun queryRoadInfos(@FieldMap params: Map<String, Any>): Observable<BaseDataCompat<RoadInfos>>
}

32
modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareDevaApiService.java Normal file
View File

@@ -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<AverateSpeedResponse> sendAverageSpeedForBlockStrategy(@Body RequestBody request, @Query("sn")String sn);
/**
* 获取分享框服务端配置
*/
@FormUrlEncoded
@POST("/deva/car/poiType/no/poiTypeList")
Observable<ShareButtonConfigResponse> queryShareButtonConfig(@FieldMap Map<String, String> param);
}

25
modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareLsApiService.java Normal file
View File

@@ -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<BaseDataCompat<RoadInfos>> queryRoadInfos(@FieldMap Map<String, Object> params);
}

19
modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java Normal file
View File

@@ -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<BaseData> sendHelpSignal(@FieldMap Map<String, String> param );
}

11
modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
View File

@@ -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