From eb2d40974f8025fb04bffaeca6f13351cc6dc0a9 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 27 八月 2020 17:28:57 +0800
Subject: [PATCH] 在简单地图里切换web地图

---
 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