From ab72f8ee3179da36dde53eb16f55a3ef98d9ac26 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 28 四月 2021 22:21:18 +0800
Subject: [PATCH] 修改线路
---
app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java b/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
index 4f6f1f9..9006ca0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
@@ -51,27 +51,32 @@
RouteBean routeBean = new RouteBean();
routeBean.setRouteName(mstus.get(i).getName());
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteBeanDao().insertRouteBean(routeBean);
+ RouteBean route = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteBeanDao().getLastRoute();
RouteCollect routeCollect = mstus.get(i);
List<RouteCollect.CrossingActiveBean>crossingActiveBeans = routeCollect.getCrossing_active();
List<RouteCollect.TriggerLineBean> triggerLineBeans = routeCollect.getTrigger_line();
+ Log.i(TAG,String.format("triggerLineBeans.size=%d,crossingActiveBeans.size=%d",triggerLineBeans.size(),crossingActiveBeans.size()));
for (RouteCollect.TriggerLineBean bean:triggerLineBeans){
RouteTriggerLine routeTriggerLine = new RouteTriggerLine();
routeTriggerLine.setRoad(bean.getRoad());
- routeTriggerLine.setRouteline_id(i+1);
+ routeTriggerLine.setRouteline_id(route.getId());
routeTriggerLine.setType(bean.getType());
routeTriggerLine.setX(bean.getX_y().get(0));
routeTriggerLine.setY(bean.getX_y().get(1));
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteTriggerLineDao().insertTriggerLine(routeTriggerLine);
}
- for (RouteCollect.CrossingActiveBean bean:crossingActiveBeans){
- RouteCross routeCross = new RouteCross();
- routeCross.setActive(bean.getActive());
- routeCross.setIdx(bean.getIdx());
- routeCross.setRoad(bean.getRoad());
- routeCross.setRouteline_id(i+1);
- WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteCrooDao().insertRouteCross(routeCross);
+ if (crossingActiveBeans != null && crossingActiveBeans.size()>0){
+ for (RouteCollect.CrossingActiveBean bean:crossingActiveBeans){
+ RouteCross routeCross = new RouteCross();
+ routeCross.setActive(bean.getActive());
+ routeCross.setIdx(bean.getIdx());
+ routeCross.setRoad(bean.getRoad());
+ routeCross.setRouteline_id(i+1);
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteCrooDao().insertRouteCross(routeCross);
+ }
}
+
}
} catch (IOException e) {
--
Gitblit v1.8.0