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

debuging with server has finished

Browse Source
This commit is contained in:
zhongchao
2021-06-24 11:21:58 +08:00
parent c9f26de53b
commit 0f63a6f9d2
7 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
View File

@@ -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<AdasAutoPilo
@Override
public void autopilotRoute(AutopilotRoute autopilotRoute) {
AdasServiceModel.getInstance().uploadAutopilotRoute(autopilotRoute.getModels());
//todo 划线
}
@Override
@@ -93,4 +98,27 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilo
public void test() {
dispatchRemindDialog.showDialog("123123123");
}
public void testNotifyAutopilotState() {
AutopilotStatus autopilotStatus = new AutopilotStatus();
AutopilotStatus.ValuesBean valuesBean = new AutopilotStatus.ValuesBean();
valuesBean.setReason("123");
valuesBean.setSpeed(123);
valuesBean.setState(0);
autopilotStatus.setValues(valuesBean);
AdasServiceModel.getInstance().uploadAutopilotStatus(autopilotStatus);
}
public void testUploadAutopilotRoute() {
List<AutopilotRoute.RouteModels> 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);
}
}

8
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java
View File

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

8
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
View File

@@ -62,7 +62,7 @@ public class AdasServiceModel {
ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus.getValues());
Map<String, Object> 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<AutopilotRoute.RouteModels> list) {
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
ReportedRoute reportedRoute = new ReportedRoute(sn, Arrays.toString(list.toArray()));
ReportedRoute reportedRoute = new ReportedRoute(sn, GsonUtil.jsonFromObject(list));
Map<String, Object> 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<String, Object> 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())

9
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java
View File

@@ -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<BaseData> uploadAutopilotState(Map<String, Object> parameters);
Observable<BaseData> uploadAutopilotState(@FieldMap Map<String, Object> parameters);
/**
* 上报自动驾驶路径 服务于业务调度
@@ -41,7 +42,7 @@ public interface IAdasApiService {
*/
@FormUrlEncoded
@POST("/dataService/autoDriver/receiveCarPreSetPath")
Observable<BaseData> uploadAutopilotRoute(Map<String, Object> parameters);
Observable<BaseData> uploadAutopilotRoute(@FieldMap Map<String, Object> parameters);
/**
* 上报自动驾驶调度处理结果 服务于业务调度
@@ -50,6 +51,6 @@ public interface IAdasApiService {
* @return {@link BaseData}
*/
@FormUrlEncoded
@POST("")
Observable<BaseData> uploadDispatchResult(Map<String, Object> parameters);
@POST("/dataService/autoDriver/receiverDestSiteResult")
Observable<BaseData> uploadDispatchResult(@FieldMap Map<String, Object> parameters);
}

7
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/AdasTestPanelBroadCastReceiver.java
View File

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

1
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java
View File

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

10
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -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<MainView, MainPresenter> 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);
}
}
// 隐藏布局