From 0f63a6f9d293cc09705d64e14d3d49e72e3b7cec Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 24 Jun 2021 11:21:58 +0800 Subject: [PATCH] debuging with server has finished --- .../module/adas/AdasAutoPilotManager.java | 28 +++++++++++++++++++ .../entity/AdasAutoPilotLocReceiverBean.java | 8 +++--- .../module/adas/model/AdasServiceModel.java | 8 +++--- .../module/adas/network/IAdasApiService.java | 9 +++--- .../AdasTestPanelBroadCastReceiver.java | 7 +++++ .../adas/view/DispatchRemindDialog.java | 1 + .../com/mogo/module/main/MainActivity.java | 10 +++++-- 7 files changed, 57 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java index ac010dab5c..4dce9dcad9 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java @@ -8,9 +8,13 @@ import com.mogo.module.adas.view.DispatchRemindDialog; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import com.zhidao.support.adas.high.bean.AutopilotRoute; import com.zhidao.support.adas.high.bean.AutopilotStatus; +import java.util.ArrayList; +import java.util.List; + import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_AFFIRM; import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_MANUAL_CANCEL; import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_TIMER_CANCEL; @@ -77,6 +81,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener list = new ArrayList<>(); + AutopilotRoute.RouteModels routeModels = new AutopilotRoute.RouteModels(); + routeModels.setLat(12.12); + routeModels.setLon(13.14); + list.add(routeModels); + AdasServiceModel.getInstance().uploadAutopilotRoute(list); + } + + public void testDispatchResultUpload() { + AdasServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM); + } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java index 39686ee7d4..9e9df3a376 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java @@ -2,13 +2,13 @@ package com.mogo.module.adas.entity; public class AdasAutoPilotLocReceiverBean { - private int poiId; + private String poiId; private double lat; private double lon; private String poiAddress; private long systemTime; - public AdasAutoPilotLocReceiverBean(int poiId, double lat, double lon, String poiAddress, long systemTime) { + public AdasAutoPilotLocReceiverBean(String poiId, double lat, double lon, String poiAddress, long systemTime) { this.poiId = poiId; this.lat = lat; this.lon = lon; @@ -16,11 +16,11 @@ public class AdasAutoPilotLocReceiverBean { this.systemTime = systemTime; } - public int getPoiId() { + public String getPoiId() { return poiId; } - public void setPoiId(int poiId) { + public void setPoiId(String poiId) { this.poiId = poiId; } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java index 0d707a0a4b..419f70cab4 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java @@ -62,7 +62,7 @@ public class AdasServiceModel { ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus.getValues()); Map map = new HashMap<>(); map.put("sn", sn); - map.put("reportedRoute", GsonUtil.jsonFromObject(reportedRoute)); + map.put("data", GsonUtil.jsonFromObject(reportedRoute)); mAdasApiService.uploadAutopilotState(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -93,10 +93,10 @@ public class AdasServiceModel { */ public void uploadAutopilotRoute(List list) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - ReportedRoute reportedRoute = new ReportedRoute(sn, Arrays.toString(list.toArray())); + ReportedRoute reportedRoute = new ReportedRoute(sn, GsonUtil.jsonFromObject(list)); Map map = new HashMap<>(); map.put("sn", sn); - map.put("reportedRoute", GsonUtil.jsonFromObject(reportedRoute)); + map.put("data", GsonUtil.jsonFromObject(reportedRoute)); mAdasApiService.uploadAutopilotRoute(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -130,7 +130,7 @@ public class AdasServiceModel { ReportDispatchResult reportDispatchResult = new ReportDispatchResult(sn, dispatchResultType); Map map = new HashMap<>(); map.put("sn", sn); - map.put("reportDispatchResult", GsonUtil.jsonFromObject(reportDispatchResult)); + map.put("data", GsonUtil.jsonFromObject(reportDispatchResult)); mAdasApiService.uploadDispatchResult(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java index 8d54f6cb2f..a99daa340f 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java @@ -7,6 +7,7 @@ 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; @@ -31,7 +32,7 @@ public interface IAdasApiService { */ @FormUrlEncoded @POST("/dataService/autoDriver/receiveAutopilotState") - Observable uploadAutopilotState(Map parameters); + Observable uploadAutopilotState(@FieldMap Map parameters); /** * 上报自动驾驶路径 服务于业务调度 @@ -41,7 +42,7 @@ public interface IAdasApiService { */ @FormUrlEncoded @POST("/dataService/autoDriver/receiveCarPreSetPath") - Observable uploadAutopilotRoute(Map parameters); + Observable uploadAutopilotRoute(@FieldMap Map parameters); /** * 上报自动驾驶调度处理结果 服务于业务调度 @@ -50,6 +51,6 @@ public interface IAdasApiService { * @return {@link BaseData} */ @FormUrlEncoded - @POST("") - Observable uploadDispatchResult(Map parameters); + @POST("/dataService/autoDriver/receiverDestSiteResult") + Observable uploadDispatchResult(@FieldMap Map parameters); } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/AdasTestPanelBroadCastReceiver.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/AdasTestPanelBroadCastReceiver.java index 1c9efda496..7ef877185e 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/AdasTestPanelBroadCastReceiver.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/AdasTestPanelBroadCastReceiver.java @@ -4,6 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import com.mogo.commons.AbsMogoApplication; import com.mogo.module.adas.AdasAutoPilotManager; import com.mogo.utils.logger.Logger; @@ -40,6 +41,12 @@ public class AdasTestPanelBroadCastReceiver extends BroadcastReceiver { Logger.d(TAG, "sceneType=" + sceneType); if (sceneType == 0) {//打开调度弹窗 AdasAutoPilotManager.getInstance().test(); + } else if(sceneType == 1){ //验证自动驾驶状态上报接口 + AdasAutoPilotManager.getInstance().testNotifyAutopilotState(); + } else if(sceneType == 2){ //验证自动驾驶路线上报接口 + AdasAutoPilotManager.getInstance().testUploadAutopilotRoute(); + } else if(sceneType == 3){ //验证自动驾驶调度上报接口 + AdasAutoPilotManager.getInstance().testDispatchResultUpload(); } } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java index 5b89ae5efd..6efb56ec58 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java @@ -43,6 +43,7 @@ public class DispatchRemindDialog extends BaseFloatDialog { public DispatchRemindDialog(@NonNull Context context) { super(context); setContentView(R.layout.dialog_adas_dispatch_remind); + setCanceledOnTouchOutside(false); tvTimer = findViewById(R.id.module_adas_dispatch_remind_timer); tvLoc = findViewById(R.id.module_adas_dispatch_remind_loc); Button btnAffirm = (Button) findViewById(R.id.module_adas_dispatch_remind_affirm); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 237d507a45..ac9d56cce8 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -5,6 +5,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.util.Log; @@ -141,8 +142,13 @@ public class MainActivity extends MvpActivity implement CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); } //申请悬浮窗权限 - Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION); - startActivityForResult(intent, REQUEST_CODE_DIALOG); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if(Settings.canDrawOverlays(this)){ + return; + } + Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION); + startActivityForResult(intent, REQUEST_CODE_DIALOG); + } } // 隐藏布局