endian11
2020-11-26 a95ed2b4ab5cb3d2663b8a8346f2630991ff22ec
修改获取不到地图时 hashmap可能为空的问题
2个文件已修改
18 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
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();