From 40eb16208b55967ec994c00b4e873db9a1e175d0 Mon Sep 17 00:00:00 2001 From: lizhanwei <Dana_Lee1016@126.com> Date: 星期日, 22 三月 2020 11:15:27 +0800 Subject: [PATCH] 优化log;实现联网考试、单机训练科二科三考试 --- app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java index c47883a..4527745 100644 --- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java +++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java @@ -426,7 +426,6 @@ return view; } - private List<Integer> sns =new ArrayList<>(); @@ -540,8 +539,6 @@ } }); - //娓呯┖sns - sns.clear(); @@ -552,18 +549,22 @@ break; case R.id.view_map: -// MapFragment mapFragment = findFragment(MapFragment.class); -// MyLog.i(TAG,"鏌ョ湅鍦板浘"); -// if (mapFragment == null) { -// mapFragment = (MapFragment) MapFragment.newInstance(); -// } -// start(mapFragment); - RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class); - MyLog.i(TAG,"鏌ョ湅鍦板浘"); - if (mapFragment == null) { - mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance(); + if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){ + RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class); + MyLog.i(TAG,"鏌ョ湅璺�冨湴鍥�"); + if (mapFragment == null) { + mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance(); + } + start(mapFragment); + }else{ + MapFragment mapFragment = findFragment(MapFragment.class); + MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�"); + if (mapFragment == null) { + mapFragment = (MapFragment) MapFragment.newInstance(); + } + start(mapFragment); } - start(mapFragment); + break; case R.id.btn_return: _mActivity.onBackPressed(); @@ -594,7 +595,6 @@ private void stopExam() { MyLog.i(TAG,"缁撴潫鑰冭瘯"); - sns.clear(); //璁剧疆妯″紡涓篘ONE 0 ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE); -- Gitblit v1.8.0