From 65463f956e67cc0589072e501fb4a3b5e5d4c36a Mon Sep 17 00:00:00 2001 From: Admin <Dana_Lee1016@126.com> Date: 星期一, 12 四月 2021 10:10:52 +0800 Subject: [PATCH] gengxinditu cheliang --- app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java index 4efe7b2..f41c093 100644 --- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java +++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java @@ -161,10 +161,26 @@ Iterator<Map .Entry<BaseDataUIBean.TYPE_,MapInfoHead>> iterator = hashMaps.entrySet().iterator(); while (iterator.hasNext()){ Map.Entry<BaseDataUIBean.TYPE_,MapInfoHead>entry = iterator.next(); + MapInfoHead mapInfoHead = entry.getValue(); Log.i(TAG,"key= " + entry.getKey() + " and value= " + entry.getValue()); - datas.add(new BaseDataUIBean(str2SpannableString(entry.getValue().getStr()),R.mipmap.province_id,str2FouregourdSpannableString(getResources().getString(R.string.mapversion)+entry.getValue().getVersion()), - entry.getKey()== BaseDataUIBean.TYPE_.car?"鏇存柊杞﹁締妯″瀷":(entry.getKey()== BaseDataUIBean.TYPE_.road?"鏇存柊閬撹矾鍦板浘":"鏇存柊鍦哄湴鍦板浘") - ,1, entry.getKey())); + if (mapInfoHead!=null){ + String str = mapInfoHead.getStr(); + if (!TextUtils.isEmpty(str)){ + datas.add(new BaseDataUIBean(str2SpannableString(entry.getValue().getStr()),R.mipmap.province_id,str2FouregourdSpannableString(getResources().getString(R.string.mapversion)+entry.getValue().getVersion()), + entry.getKey()== BaseDataUIBean.TYPE_.car?"鏇存柊杞﹁締妯″瀷":(entry.getKey()== BaseDataUIBean.TYPE_.road?"鏇存柊閬撹矾鍦板浘":"鏇存柊鍦哄湴鍦板浘") + ,1, entry.getKey())); + if (str.contains("澶辫触")){ + showMannualMapCar(); + + } + }else{ + showMannualMapCar(); + } + }else{ + showMannualMapCar(); + } + + } } @@ -179,6 +195,20 @@ } }; + private void showMannualMapCar() { + String roadMapPath = ExamPlatformData.getInstance().getRoadMapPath(); + String MapPath = ExamPlatformData.getInstance().getMapPath(); + String carModelPath = ExamPlatformData.getInstance().getCarModelPath(); + if (!TextUtils.isEmpty(roadMapPath)){ + datas.add(new BaseDataUIBean(str2SpannableString("鎵嬪姩璁剧疆閬撹矾 "),R.mipmap.platform_pic,str2FouregourdSpannableString(roadMapPath),"",1,null)); + } + if (!TextUtils.isEmpty(MapPath)){ + datas.add(new BaseDataUIBean(str2SpannableString("鎵嬪姩璁剧疆鍦哄湴 "),R.mipmap.platform_pic,str2FouregourdSpannableString(MapPath),"",1,null)); + } + if (!TextUtils.isEmpty(carModelPath)){ + datas.add(new BaseDataUIBean(str2SpannableString("鎵嬪姩璁剧疆杞﹁締 "),R.mipmap.platform_pic,str2FouregourdSpannableString(carModelPath),"",1,null)); + } + } private String left(String s,int pos){ -- Gitblit v1.8.0