From 26776f09752b5aa6197e158a5a772cb3694996ac Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 10 九月 2020 13:49:16 +0800
Subject: [PATCH] 修改地图默认是arcgis的地图
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 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 b3f0ff7..46d1402 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -598,39 +598,11 @@
break;
case R.id.view_map:
- 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);
-// 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);
- MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
- if (mapFragment == null) {
- mapFragment = (MapFragment) MapFragment.newInstance();
- }
- start(mapFragment);
+ String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
+ Log.i(TAG,"map head lulao gps url="+url);
+ startArcGisMapFragment(url);
-// 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:
MyLog.i(TAG,"瀛﹀憳绛惧埌");
@@ -666,6 +638,31 @@
}
}
+ private void startArcGisMapFragment(String url) {
+ if (!TextUtils.isEmpty(url)) {
+ ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
+ if (jiaXiaoFragment == null) {
+ jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url);
+ }
+ start(jiaXiaoFragment);
+ }else{
+ Toast.makeText(_mActivity, "閿欒锛欰rcGIS URL 涓虹┖锛�", Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ private String getArcGisUrl(int examType) {
+ MapInfoHead mapInfoHead;
+ if (examType>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
+ }else{
+ mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
+ }
+ if (mapInfoHead != null){
+ return mapInfoHead.getArcgis_url();
+ }
+ return null;
+ }
+
private void qrcode(int type,boolean isSign) {
content = "87,"+String.valueOf(type)+ ","+ExamPlatformData.getInstance().getPhone()
+(isSign?",signin":",signout");
--
Gitblit v1.8.0