From a95ed2b4ab5cb3d2663b8a8346f2630991ff22ec Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 26 十一月 2020 17:32:47 +0800
Subject: [PATCH] 修改获取不到地图时 hashmap可能为空的问题
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 9 +++++++--
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
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 9cbdb96..85bcc23 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -42,6 +42,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
@@ -667,10 +668,14 @@
private String getArcGisUrl(int examType) {
MapInfoHead mapInfoHead;
+ HashMap<BaseDataUIBean.TYPE_, MapInfoHead> mapInfoHeads = ExamPlatformData.getInstance().getMapInfoHeads();
+ if (mapInfoHeads == null){
+ return null;
+ }
if (examType>ExamPlatformData.EXAM_TYPE_ChangKAO){
- mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
+ mapInfoHead= mapInfoHeads.get(BaseDataUIBean.TYPE_.road);
}else{
- mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
+ mapInfoHead= mapInfoHeads.get(BaseDataUIBean.TYPE_.yard);
}
if (mapInfoHead != null){
return mapInfoHead.getArcgis_url();
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 effc8f8..c0e025d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -61,6 +61,7 @@
import safeluck.drive.evaluation.DB.route.RouteCross;
import safeluck.drive.evaluation.DB.route.RouteLineViewModel;
import safeluck.drive.evaluation.DB.route.RouteTriggerLine;
+import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
@@ -883,10 +884,14 @@
private String getArcGisUrl(int examType) {
MapInfoHead mapInfoHead;
+ HashMap<BaseDataUIBean.TYPE_, MapInfoHead> mapInfoHeads = ExamPlatformData.getInstance().getMapInfoHeads();
+ if (mapInfoHeads == null){
+ return null;
+ }
if (examType>ExamPlatformData.EXAM_TYPE_ChangKAO){
- mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.road);
+ mapInfoHead= mapInfoHeads.get(BaseDataUIBean.TYPE_.road);
}else{
- mapInfoHead= ExamPlatformData.getInstance().getMapInfoHeads().get(BaseDataUIBean.TYPE_.yard);
+ mapInfoHead= mapInfoHeads.get(BaseDataUIBean.TYPE_.yard);
}
if (mapInfoHead != null){
return mapInfoHead.getArcgis_url();
--
Gitblit v1.8.0