From 3be3637ae5a3e763ba99c8f6a1bb0cb144b7647f Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 25 八月 2020 17:21:12 +0800
Subject: [PATCH] 查看地图改为web 新增gps_monitor_url
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 8609a49..39c56a7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -59,7 +59,9 @@
import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
+import safeluck.drive.evaluation.bean.BaseDataUIBean;
import safeluck.drive.evaluation.bean.ExamPlatformData;
+import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.ScoreBean;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
@@ -594,19 +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();
+// 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);
}
- start(mapFragment);
+ start(jiaXiaoFragment);
}else{
- MapFragment mapFragment = findFragment(MapFragment.class);
+// MapFragment mapFragment = findFragment(MapFragment.class);
MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
- if (mapFragment == null) {
- mapFragment = (MapFragment) MapFragment.newInstance();
+// 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);
}
- start(mapFragment);
+ start(jiaXiaoFragment);
}
break;
case R.id.iv_head:
--
Gitblit v1.8.0