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

Merge branch 'dns' into dev_mogo_httpdns

Browse Source
This commit is contained in:
liujing
2021-01-07 14:44:29 +08:00
parent 5580b03b3c 8d4048f7ff
commit 3d6ec1592b
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt
View File

@@ -1,23 +0,0 @@
package com.mogo.module.v2x.network
import com.mogo.commons.debug.DebugConfig
class HttpConstant {
companion object {
const val HOST_DEV = "http://dzt-test.zhidaozhixing.com"
const val HOST_TEST = "http://dzt-test.zhidaozhixing.com"
const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com"
const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com"
fun getNetHost(): String {
return when (DebugConfig.getNetMode()) {
DebugConfig.NET_MODE_DEV -> HOST_DEV
DebugConfig.NET_MODE_QA -> HOST_TEST
DebugConfig.NET_MODE_DEMO -> HOST_DEMO
else -> HOST_PRODUCT
}
}
}
}

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
View File

@@ -15,8 +15,7 @@ import com.mogo.map.location.MogoLocation;
import com.mogo.module.v2x.entity.panel.Center;
import com.mogo.module.v2x.entity.panel.SurroundingRequest;
import com.mogo.module.v2x.entity.panel.SurroundingResponse;
import com.mogo.module.v2x.network.HttpConstant;
import com.mogo.module.v2x.network.V2XApiService;
import com.mogo.module.v2x.network.V2XApiServiceFactory;
import com.mogo.module.v2x.view.SurroundingEventView;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
@@ -38,7 +37,6 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
private Context mContext;
private IMogoNetwork mNetWork;
private IMogoServiceApis mApis;
private V2XApiService eventApiService;
private static final String TAG = "V2XSurroundingFragment";
@@ -48,7 +46,6 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
mNetWork =
((IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(view.getContext())).getNetworkApi();
mApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(getContext());
this.eventApiService = mNetWork.create(V2XApiService.class, HttpConstant.Companion.getNetHost());
}
@Override
@@ -65,7 +62,7 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
String[] poiTypes = {"10002", "10003", "10006", "10007", "10008", "10010", "10011", "10013", "10015"};
SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 300);
eventApiService.getSurroundingEventList(Utils.getSn(), convert(GsonUtil.jsonFromObject(request)))
V2XApiServiceFactory.getDevaApiService(mContext).getSurroundingEventList(Utils.getSn(), convert(GsonUtil.jsonFromObject(request)))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new SubscribeImpl<SurroundingResponse>(RequestOptions.create(getContext())) {