From 98508eb8eb40e2e995045a7b9fb5b69bbd0e7c8c Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期四, 27 八月 2020 17:31:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 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 39c56a7..ed112ef 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -596,37 +596,37 @@
case R.id.view_map:
if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
-// RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
+ RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
MyLog.i(TAG,"鏌ョ湅璺�冨湴鍥�");
-// if (mapFragment == null) {
-// mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
-// }
-// start(mapFragment);
-
- MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
- String url = mapInfoHead.getGps_moinitor_url();
- Log.i(TAG,"map head lulao gps url="+url);
- VPFragment jiaXiaoFragment = findFragment(VPFragment.class);
- if (jiaXiaoFragment == null) {
- jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url);
+ if (mapFragment == null) {
+ mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
}
- start(jiaXiaoFragment);
+ start(mapFragment);
+
+// MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
+// String url = mapInfoHead.getGps_moinitor_url();
+// Log.i(TAG,"map head lulao gps url="+url);
+// VPFragment jiaXiaoFragment = findFragment(VPFragment.class);
+// if (jiaXiaoFragment == null) {
+// jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url);
+// }
+// start(jiaXiaoFragment);
}else{
-// MapFragment mapFragment = findFragment(MapFragment.class);
+ MapFragment mapFragment = findFragment(MapFragment.class);
MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
-// if (mapFragment == null) {
-// mapFragment = (MapFragment) MapFragment.newInstance();
-// }
-// start(mapFragment);
-
- VPFragment jiaXiaoFragment = findFragment(VPFragment.class);
- if (jiaXiaoFragment == null) {
- MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
- String url = mapInfoHead.getGps_moinitor_url();
- Log.i(TAG,"map head gps url="+url);
- jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url);
+ if (mapFragment == null) {
+ mapFragment = (MapFragment) MapFragment.newInstance();
}
- start(jiaXiaoFragment);
+ start(mapFragment);
+
+// VPFragment jiaXiaoFragment = findFragment(VPFragment.class);
+// if (jiaXiaoFragment == null) {
+// MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
+// String url = mapInfoHead.getGps_moinitor_url();
+// Log.i(TAG,"map head gps url="+url);
+// jiaXiaoFragment = (VPFragment) VPFragment.newInstance(url);
+// }
+// start(jiaXiaoFragment);
}
break;
case R.id.iv_head:
--
Gitblit v1.8.0