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/ArcGisMapFragment.java | 29 +++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 59 +++++++++----------
app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java | 12 ---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 61 ++++++++------------
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 12 ----
5 files changed, 82 insertions(+), 91 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
index baa85fd..e9aecf6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -44,7 +44,10 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.BaseDataUIBean;
+import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.GisCarModel;
+import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.RTKInfoBean;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
@@ -58,7 +61,7 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-public class ArcGisMapFragment extends SupportFragment {
+public class ArcGisMapFragment extends SupportFragment implements View.OnClickListener {
private static final String TAG = ArcGisMapFragment.class.getSimpleName();
@@ -129,6 +132,7 @@
View view = inflater.inflate(R.layout.layout_arc_gis,container,false);
mMapView = view.findViewById(R.id.mapView);
+ view.findViewById(R.id.btn_change_map).setOnClickListener(this);
Log.i(TAG,String.format("褰撳墠绾跨▼鍙�%d,json=%s",Thread.currentThread().getId(),"onCreateView"));
url = getArguments().getString("arcgis_url");
CThreadPoolExecutor.runInBackground(()->{
@@ -150,6 +154,29 @@
RTKInfoBean rtkInfoBean;
boolean flag = true;
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.btn_change_map:
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ RoadDriveMapFragmentaa jiaXiaoFragment = findFragment(RoadDriveMapFragmentaa.class);
+ if (jiaXiaoFragment == null) {
+ jiaXiaoFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
+ }
+ startWithPop(jiaXiaoFragment);
+ }else{
+ MapFragment jiaXiaoFragment = findFragment(MapFragment.class);
+ if (jiaXiaoFragment == null) {
+ jiaXiaoFragment = (MapFragment) MapFragment.newInstance();
+ }
+ startWithPop(jiaXiaoFragment);
+ }
+
+ break;
+ }
+ }
+
class CalRunnable implements Runnable{
@Override
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index b69f76e..93b3b90 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -169,7 +169,6 @@
mSurfaceView = view.findViewById(R.id.surfaceview);
view.findViewById(R.id.btn_reduce).setOnClickListener(this);
view.findViewById(R.id.btn_amplify).setOnClickListener(this);
- view.findViewById(R.id.btn_change_map).setOnClickListener(this);
holder = mSurfaceView.getHolder();
holder.addCallback(new SurfaceHolder.Callback() {
@@ -449,18 +448,7 @@
}
break;
- case R.id.btn_change_map:
- MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
- String url = mapInfoHead.getArcgis_url();
- Log.i(TAG,"map head lulao gps url="+url);
- ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
- if (jiaXiaoFragment == null) {
- jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url);
- }
- startWithPop(jiaXiaoFragment);
-
- break;
}
}
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 b4442f8..9cbdb96 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -614,43 +614,8 @@
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);
-
- 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);
- }
-
+ startArcGisMapFragment(getArcGisUrl(ExamPlatformData.getInstance().getExamType()));
break;
case R.id.iv_head:
@@ -688,6 +653,30 @@
break;
}
}
+ 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");
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
index 934a11d..548df2f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
@@ -155,7 +155,6 @@
mSurfaceView = view.findViewById(R.id.surfaceview);
view.findViewById(R.id.btn_reduce).setOnClickListener(this);
view.findViewById(R.id.btn_amplify).setOnClickListener(this);
- view.findViewById(R.id.btn_change_map).setOnClickListener(this);
holder = mSurfaceView.getHolder();
holder.addCallback(new SurfaceHolder.Callback() {
@@ -1492,16 +1491,7 @@
pixels+=5;
}
break;
- case R.id.btn_change_map:
- MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
- String url = mapInfoHead.getArcgis_url();
- Log.i(TAG,"map head lulao gps url="+url);
- ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
- if (jiaXiaoFragment == null) {
- jiaXiaoFragment = (ArcGisMapFragment) ArcGisMapFragment.newInstance(url);
- }
- startWithPop(jiaXiaoFragment);
- break;
+
}
}
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