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/DB/rtktb/RTKConfigUpdateWorker.kt | 20 +++++-----
app/src/main/res/layout/layout_mapfragment.xml | 8 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 52 +++++++++++++-------------
app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java | 13 ++++++
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 14 +++++++
5 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
index 2311b5a..fa17849 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
@@ -87,7 +87,7 @@
"yard" -> fileName = safeluck.drive.evaluation.Constant.MAP
else -> fileName = safeluck.drive.evaluation.Constant.VEHICLE
}
- if (!FileUtil.isMapExist(applicationContext,fileName)) {
+// if (!FileUtil.isMapExist(applicationContext,fileName)) {
getRestService().getMapsAndVehicleModel(HttpRequetBean(sn, type)).enqueue(object : Callback<ResponseBody> {
override fun onFailure(call: Call<ResponseBody>, t: Throwable) {
MyLog.i(PlatFormConstant.HTTPTAG,t.localizedMessage)
@@ -189,15 +189,15 @@
}
})
- }else{
- MyLog.i(PlatFormConstant.HTTPTAG,"宸插瓨鍦ㄧ洿鎺ュ彂閫佽溅杈嗗拰鍦板浘"+fileName)
- when(type){
- "road" -> sendRoadMapInfo()
- "yard" -> sendMapInfo()
- else -> sendVehicleInfo()
- }
-
- }
+// }else{
+// MyLog.i(PlatFormConstant.HTTPTAG,"宸插瓨鍦ㄧ洿鎺ュ彂閫佽溅杈嗗拰鍦板浘"+fileName)
+// when(type){
+// "road" -> sendRoadMapInfo()
+// "yard" -> sendMapInfo()
+// else -> sendVehicleInfo()
+// }
+//
+// }
}
private fun sendRoadMapInfo(){
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 e3723ef..af77c99 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -44,8 +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.ExamMap;
import safeluck.drive.evaluation.bean.ExamPlatformData;
+import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.RealTimeCarPos;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
@@ -169,6 +171,7 @@
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() {
@@ -447,6 +450,17 @@
pixels+=5;
}
break;
+
+ case R.id.btn_change_map:
+ MapInfoHead mapInfoHead = ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
+ 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);
+ break;
}
}
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 57dd56f..447aa4d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
@@ -46,7 +46,9 @@
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.MapInfoHead;
import safeluck.drive.evaluation.bean.RealTimeCarPos;
import safeluck.drive.evaluation.bean.RoadExamMap;
import safeluck.drive.evaluation.bean.RoadExamMap2;
@@ -156,6 +158,7 @@
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,6 +1495,16 @@
pixels+=5;
}
break;
+ case R.id.btn_change_map:
+ 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);
+ 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 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:
diff --git a/app/src/main/res/layout/layout_mapfragment.xml b/app/src/main/res/layout/layout_mapfragment.xml
index edc85b3..cd9b7a4 100644
--- a/app/src/main/res/layout/layout_mapfragment.xml
+++ b/app/src/main/res/layout/layout_mapfragment.xml
@@ -22,4 +22,12 @@
android:background="@drawable/btn_state_save"
android:layout_marginLeft="120dp"
android:text="缂╁皬"/>
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|left"
+ android:id="@+id/btn_change_map"
+ android:background="@drawable/btn_state_save"
+ android:layout_marginLeft="240dp"
+ android:text="鍒囨崲鍦板浘"/>
</FrameLayout>
\ No newline at end of file
--
Gitblit v1.8.0