From 12d8a62ad4e26b21d2abfe54bb5dab4eef6435f2 Mon Sep 17 00:00:00 2001 From: endian11 <Dana_Lee1016@126.com> Date: 星期四, 17 九月 2020 14:51:02 +0800 Subject: [PATCH] 加入删除线路功能;选择好线路之后才开始 训练;数据库表增加删除功能 --- app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 94 +++++++++++++++++++++++++++-------------------- 1 files changed, 54 insertions(+), 40 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 d2b8b6d..eb04c8d 100644 --- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java +++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java @@ -384,8 +384,9 @@ routeLineViewModel.getRouteBeans().observe(this, new Observer<List<RouteBean>>() { @Override public void onChanged(List<RouteBean> routeBeans) { - if (routeBeans.size()>0){ + mRouteBeans.clear(); + if (routeBeans.size()>0){ mRouteBeans.addAll(routeBeans); } } @@ -779,19 +780,25 @@ private void sendJK0202(int type) { + exam_type = type; + if (type==3|| type==4){ sendRouteLine(); + }else{ + changeUi(type); } + } + + private void changeUi(int type) { //闅愯棌閲囬泦椤圭洰 items_score.setVisibility(View.VISIBLE); items.setVisibility(View.VISIBLE); - route_collect.setVisibility(View.GONE); - - exam_type = type; - ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE); + route_collect.setVisibility(View.GONE); ExamPlatformData.getInstance().setExamType(exam_type); + ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE); + examStatusViewModel.updateStartExam(exam_type); ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�"); } @@ -832,50 +839,57 @@ RouteCollect routeCollect = new RouteCollect(); List<RouteCollect> routeCollects = new ArrayList<>(); int id = res; + changeUi(exam_type); CThreadPoolExecutor.runInBackground(new Runnable() { @Override public void run() { + for (RouteBean bean:mRouteBeans){ + if (id==bean.getId()){ - routeCollect.setName(mRouteBeans.get(id).getRouteName()); - List<RouteTriggerLine> routeTriggerLines = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteTriggerLineDao().getAllRouteTriggerLine(id); - List<RouteCross> routeCrosses = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteCrooDao().getAllRouteCross(id); - for (RouteTriggerLine line:routeTriggerLines){ - RouteCollect.TriggerLineBean triggerLineBean = new RouteCollect.TriggerLineBean(); - int road = line.getRoad(); - int type = line.getType(); + routeCollect.setName(bean.getRouteName()); + List<RouteTriggerLine> routeTriggerLines = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteTriggerLineDao().getAllRouteTriggerLine(id); + List<RouteCross> routeCrosses = WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getRouteCrooDao().getAllRouteCross(id); + for (RouteTriggerLine line:routeTriggerLines){ + RouteCollect.TriggerLineBean triggerLineBean = new RouteCollect.TriggerLineBean(); + int road = line.getRoad(); + int type = line.getType(); - double x = line.getX(); - double y = line.getY(); - xy.clear(); - xy.add(x); - xy.add(y); - triggerLineBean.setRoad(road); - triggerLineBean.setType(type); - triggerLineBean.setX_y(xy); - triggerLineBeans.add(triggerLineBean); + double x = line.getX(); + double y = line.getY(); + xy.clear(); + xy.add(x); + xy.add(y); + triggerLineBean.setRoad(road); + triggerLineBean.setType(type); + triggerLineBean.setX_y(xy); + triggerLineBeans.add(triggerLineBean); + } + routeCollect.setTrigger_line(triggerLineBeans); + + for (RouteCross routeCross:routeCrosses){ + int idx = routeCross.getIdx(); + int road = routeCross.getRoad(); + int active = routeCross.getActive(); + RouteCollect.CrossingActiveBean crossingActiveBean = new RouteCollect.CrossingActiveBean(); + crossingActiveBean.setActive(active); + crossingActiveBean.setIdx(idx); + crossingActiveBean.setRoad(road); + crossingActiveBeans.add(crossingActiveBean); + } + routeCollect.setCrossing_active(crossingActiveBeans); + routeCollects.add(routeCollect); + + remoteRouteCollect.setScheme(routeCollects); + String str = new Gson().toJson(remoteRouteCollect); + Log.i(TAG,"json====="+str); + //todo 鍙戦�佺嚎璺� + sendMessage(); + break; + } } - routeCollect.setTrigger_line(triggerLineBeans); - for (RouteCross routeCross:routeCrosses){ - int idx = routeCross.getIdx(); - int road = routeCross.getRoad(); - int active = routeCross.getActive(); - RouteCollect.CrossingActiveBean crossingActiveBean = new RouteCollect.CrossingActiveBean(); - crossingActiveBean.setActive(active); - crossingActiveBean.setIdx(idx); - crossingActiveBean.setRoad(road); - crossingActiveBeans.add(crossingActiveBean); - } - routeCollect.setCrossing_active(crossingActiveBeans); - routeCollects.add(routeCollect); - - remoteRouteCollect.setScheme(routeCollects); - String str = new Gson().toJson(remoteRouteCollect); - Log.i(TAG,"json====="+str); - //todo 鍙戦�佺嚎璺� - sendMessage(); } }); } -- Gitblit v1.8.0