Merge dev_mogo_httpdns
there are some conflicts:
both modified: foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
both modified: gradle.properties
both modified: modules/mogo-module-share/consumer-rules.pro
both modified: modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
This commit is contained in:
tongchenfei
@@ -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.MogoApisHandler;
|
||||
import com.mogo.module.common.dialog.BaseFloatDialog;
|
||||
import com.mogo.module.common.utils.CloudPoiManager;
|
||||
@@ -28,7 +29,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;
|
||||
@@ -458,8 +459,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);
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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，改变自车图标
|
||||
|
||||
@@ -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>>
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
@@ -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,6 +11,7 @@ import com.mogo.map.search.geo.MogoPoiItem;
|
||||
import com.mogo.map.search.poisearch.IMogoPoiSearch;
|
||||
import com.mogo.map.search.poisearch.MogoPoiResult;
|
||||
import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
|
||||
import com.mogo.module.common.constants.HostConst;
|
||||
import com.mogo.module.share.TanluServiceManager;
|
||||
import com.mogo.module.share.bean.BaseDataCompat;
|
||||
import com.mogo.module.share.bean.Location;
|
||||
@@ -54,7 +55,7 @@ public class TanluModelData {
|
||||
public TanluModelData(Context context) {
|
||||
this.mContext = context;
|
||||
IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(context);
|
||||
mShareApiService = network.create(TanluApiService.class, getBaseUrl());
|
||||
mShareApiService = network.create(TanluApiService.class, HostConst.LAUNCHER_SNAPSHOT_HOST);
|
||||
}
|
||||
|
||||
private String getBaseUrl() {
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.mogo.commons.data.BaseData;
|
||||
import com.mogo.commons.network.ParamsProvider;
|
||||
import com.mogo.commons.network.SubscribeImpl;
|
||||
import com.mogo.commons.network.Utils;
|
||||
import com.mogo.module.common.constants.HostConst;
|
||||
import com.mogo.module.common.entity.RoadTrafficStatus;
|
||||
import com.mogo.module.common.entity.UploadTrafficEntity;
|
||||
import com.mogo.module.share.constant.HttpConstant;
|
||||
@@ -29,7 +30,7 @@ public class TrafficModelData {
|
||||
|
||||
public TrafficModelData() {
|
||||
IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getApp().getApplicationContext());
|
||||
mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getNetHost());
|
||||
mTrafficApiService = network.create(TrafficApiService.class, HostConst.TMC_HOST);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user