From 56dbd70a0fe3615563d7941f18edde82a482822b Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 03 十一月 2020 10:07:43 +0800
Subject: [PATCH] 修改发送8017消息错误的bug
---
app/src/main/java/safeluck/drive/evaluation/app.java | 3 ++-
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 426546e..a037b25 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -154,7 +154,7 @@
private void opDBAndSendRoute() {
List<RouteCollect.CrossingActiveBean> crossingActiveBeans = new ArrayList<>();
List<RouteCollect.TriggerLineBean> triggerLineBeans = new ArrayList<>();
- List<Double> xy = new ArrayList<>();
+
RemoteRouteCollect remoteRouteCollect = new RemoteRouteCollect();
RouteCollect routeCollect = new RouteCollect();
List<RouteCollect> routeCollects = new ArrayList<>();
@@ -163,6 +163,7 @@
List<RouteTriggerLine> routeTriggerLines = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteTriggerLineDao().getAllRouteTriggerLine(ExamPlatformData.getInstance().getExamRoute());
List<RouteCross> routeCrosses = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext().getApplicationContext()).getRouteCrooDao().getAllRouteCross(ExamPlatformData.getInstance().getExamRoute());
for (RouteTriggerLine line:routeTriggerLines){
+ List<Double> xy = new ArrayList<>();
RouteCollect.TriggerLineBean triggerLineBean = new RouteCollect.TriggerLineBean();
int road = line.getRoad();
int type = line.getType();
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 61e67e7..3c042d1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -90,6 +90,7 @@
import safeluck.drive.evaluation.routecollect.bean.RoadCrossInfo;
import safeluck.drive.evaluation.routecollect.bean.RoadInfo;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
+import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.widget.StatusDialog;
@@ -953,7 +954,7 @@
List<RouteCollect.CrossingActiveBean> crossingActiveBeans = new ArrayList<>();
List<RouteCollect.TriggerLineBean> triggerLineBeans = new ArrayList<>();
- List<Double> xy = new ArrayList<>();
+
RemoteRouteCollect remoteRouteCollect = new RemoteRouteCollect();
RouteCollect routeCollect = new RouteCollect();
List<RouteCollect> routeCollects = new ArrayList<>();
@@ -969,15 +970,19 @@
List<RouteTriggerLine> routeTriggerLines = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteTriggerLineDao().getAllRouteTriggerLine(id);
List<RouteCross> routeCrosses = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteCrooDao().getAllRouteCross(id);
for (RouteTriggerLine line:routeTriggerLines){
+ List<Double> xy = new ArrayList<>();
RouteCollect.TriggerLineBean triggerLineBean = new RouteCollect.TriggerLineBean();
int road = line.getRoad();
int type = line.getType();
double x = line.getX();
double y = line.getY();
+ Log.i(TAG,String.format("x=%f,y=%f",x,y));
+ Log.i(TAG, "before add"+FileUtil.ListToString(xy));
xy.clear();
xy.add(x);
xy.add(y);
+ Log.i(TAG, FileUtil.ListToString(xy));
triggerLineBean.setRoad(road);
triggerLineBean.setType(type);
triggerLineBean.setX_y(xy);
--
Gitblit v1.8.0