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/util/DataInit.kt | 22 +++++++++++++++++++---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 36 +++++++++++++++++++++++++++++++++---
2 files changed, 52 insertions(+), 6 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){
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
index 85633f0..1d0ceb8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -262,8 +262,8 @@
MyLog.i(PlatFormConstant.HTTPTAG,str)
jsonObject1 = JSONObject(str)
val result = jsonObject1!!.getBoolean("result")
- if (result) {
var mapInfoHead: MapInfoHead = MapInfoHead("","", BaseDataUIBean.TYPE_.car,"","")
+ if (result) {
when(type){
"road" ->{
@@ -294,6 +294,8 @@
}else{
MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勯亾璺枃浠�")
+ mapInfoHead.version = ""
+ mapInfoHead.str = "鑾峰彇閬撹矾鍦板浘澶辫触"
sendRoadMapInfo()
}}
"yard" ->{
@@ -316,6 +318,8 @@
})
}
}else{
+ mapInfoHead.version = ""
+ mapInfoHead.str = "鑾峰彇鍦哄湴鍦板浘澶辫触"
MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勫満鍦版枃浠�")
sendMapInfo()
}
@@ -344,6 +348,8 @@
}
}else{
+ mapInfoHead.version = ""
+ mapInfoHead.str = "鑾峰彇杞﹁締妯″瀷澶辫触"
MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勮溅杈嗘ā鍨嬫枃浠�")
sendVehicleInfo()
}
@@ -352,14 +358,24 @@
ExamPlatformData.getInstance().setMapHeadInfo(mapInfoHead)
} else {
if (str.contains("car")){
+ mapInfoHead.type= BaseDataUIBean.TYPE_.car
+ mapInfoHead.version = ""
+ mapInfoHead.str = "浠庡钩鍙拌幏鍙栬溅杈嗘ā鍨嬪け璐�"
+ ExamPlatformData.getInstance().setMapHeadInfo(mapInfoHead)
sendVehicleInfo()
}
if (str.contains("yard")){
+ mapInfoHead.type= BaseDataUIBean.TYPE_.yard
+ mapInfoHead.version = ""
+ mapInfoHead.str = "浠庡钩鍙拌幏鍙栧満鍦板湴鍥惧け璐�"
+ ExamPlatformData.getInstance().setMapHeadInfo(mapInfoHead)
sendMapInfo()
}
if (str.contains("road")){
-
-
+ mapInfoHead.type= BaseDataUIBean.TYPE_.road
+ mapInfoHead.version = ""
+ mapInfoHead.str = "浠庡钩鍙拌幏鍙栭亾璺湴鍥惧け璐�"
+ ExamPlatformData.getInstance().setMapHeadInfo(mapInfoHead)
sendRoadMapInfo()
}
--
Gitblit v1.8.0