From ee9d75f83fb85f8206c8ea8d08750611bee35856 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 18 九月 2020 17:22:32 +0800
Subject: [PATCH] 测试项目采集、路口采集，完成发送0x8017;目前需要加一个发送查询是否在某段路
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 2698ff7..a66a6a2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -150,7 +150,7 @@
private RouteCross routeCross;
//瑕佹彃鍏ユ暟鎹簱鐨勮Е鍙戠嚎淇℃伅
- private RouteTriggerLine routeTriggerLine;
+ private RouteTriggerLine routeTriggerLine = new RouteTriggerLine();
private List<Integer> btn_ids = new ArrayList<Integer>();
private HashMap<String,Integer> routeCollect_btn_ids = new HashMap<>();
@@ -528,6 +528,7 @@
if (exam_type != Constant.NONE_BEEN_START_EXAM){
if (ROUTE_COLLECT == exam_type){
btn_start_exam.setText("缁撴潫閲囬泦");
+ routeCollectController.startRoadListener();
}else{
btn_start_exam.setText("缁撴潫璁粌");
@@ -575,7 +576,9 @@
private void initView(View view) {
tv_route_collect_info = view.findViewById(R.id.tv_route_info);
- routeCollectController = new RouteCollectController(this);
+// routeCollectController = new RouteCollectController(this);
+ routeCollectController = RouteCollectController.getInstance();
+ routeCollectController.setRouteCollectController(this);
items = view.findViewById(R.id.items);
items_score=view.findViewById(R.id.items_score);
route_collect=view.findViewById(R.id.route_collect);
@@ -713,6 +716,7 @@
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.ROUTE_MODE);
exam_type = 5;
sendExamJson(1,exam_type);
+
examStatusViewModel.updateStartExam(exam_type);
items.setVisibility(View.GONE);
items_score.setVisibility(View.GONE);
@@ -744,6 +748,7 @@
Toast.makeText(_mActivity, "缁撴潫閲囬泦", Toast.LENGTH_SHORT).show();
routeLineViewModel.updateCurrCollectFlag("");
+ routeCollectController.endRoadListener();
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
exam_type = 0;
examStatusViewModel.updateStartExam(exam_type);
@@ -996,7 +1001,7 @@
remoteRouteCollect.setScheme(routeCollects);
String str = new Gson().toJson(remoteRouteCollect);
Log.i(TAG,"json====="+str);
- //todo 鍙戦�佺嚎璺�
+ AYSdk.getInstance().sendCmd(0x8017,str);
sendMessage();
break;
}
@@ -1106,9 +1111,9 @@
@Override
public void beginCollectView() {
Log.i(TAG,"BIND_RTK_INFO_MAP");
- CThreadPoolExecutor.runOnMainThread(()->{
- StatusDialog.with(_mActivity).setType(StatusDialog.Type.PROGRESS).setCancelable(true).show();
- });
+// CThreadPoolExecutor.runOnMainThread(()->{
+// StatusDialog.with(_mActivity).setType(StatusDialog.Type.PROGRESS).setCancelable(true).show();
+// });
}
@@ -1129,6 +1134,8 @@
if (roadInfo != null && roadInfo.getStatus()==1){
Log.i(TAG,"鍦ㄦ煇涓矾閲岄潰"+roadInfo.getRoad_id());
+ stringBuilder.append(String.format("鍦�%d鍙疯矾閲岄潰",roadInfo.getRoad_id()));
+ stringBuilder.append("\n");
routeTriggerLine.setX(collectPointResult.getX());
routeTriggerLine.setY(collectPointResult.getY());
routeTriggerLine.setType(ExamPlatformData.getInstance().getCurrRouteItem());
@@ -1154,7 +1161,6 @@
public void roadinfo(RoadInfo roadInfo) {
Log.i(TAG,String.format("閬撹矾淇℃伅%s",roadInfo.toString()));
//閬撹矾淇℃伅鏄病鏈夎繘琛屾湰鍦颁繚瀛樼殑锛屽鏋滃穿婧冪殑璇濓紝灏辨湁闂
- ExamPlatformData.getInstance().setRouteCollectRoadInfo(roadInfo);
stringBuilder.append(String.format("閬撹矾淇℃伅%s",roadInfo.toString()));
stringBuilder.append("\n");
showRouteCollectInfoText();
--
Gitblit v1.8.0