From 9f4af8f45a67819d32f1c403025b7090c027c457 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 10 九月 2020 15:54:04 +0800
Subject: [PATCH] 把道路、场地、模型更新功能放到设置参数；修改基础数据，使之对齐
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 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 d7faece..651b909 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -104,11 +104,12 @@
version = new String(BytesUtils.hexStringToBytes(version),"GBK");
versionDes= "鐗堟湰鍙� ";
version = version+"#"+ BuildConfig.VERSION_NAME;
- setitemInfo(versionDes,version,R.mipmap.version_pic);
+
+ datas.add(new BaseDataUIBean(str2SpannableString(versionDes),R.mipmap.version_pic,str2FouregourdSpannableString(version),"",1,null));
}else if(fields[i].getName().equalsIgnoreCase("sn")){
- setitemInfo("璁惧搴忓垪鍙� ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
+ datas.add(new BaseDataUIBean(str2SpannableString("璁惧搴忓垪鍙�"),R.mipmap.device_sn,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
}else if(fields[i].getName().equalsIgnoreCase("selftest")){
- setitemInfo("鑷鐘舵�� ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
+ datas.add(new BaseDataUIBean(str2SpannableString("鑷鐘舵�� "),R.mipmap.auto_check_status,str2FouregourdSpannableString(String.valueOf(fields[i].get(mcuInfo))),"",1,null));
}
} catch (IllegalAccessException e) {
@@ -122,17 +123,16 @@
public void run() {
if (mRtkConfig != null){
- setitemInfo("鐪両D ", String.valueOf(mRtkConfig.getProvince()),R.mipmap.province_id);
- setitemInfo("甯侷D ", String.valueOf(mRtkConfig.getCity()),R.mipmap.province_id);
- setitemInfo("RTK骞冲彴鍦板潃 ", mRtkConfig.getIp()+":"+mRtkConfig.getPort(),R.mipmap.platform_pic);
- setitemInfo("鑰冭瘯骞冲彴鍦板潃 ",ExamPlatformData.getInstance().getPlatformIP()
- +":"+ExamPlatformData.getInstance().getPlatformPort(),R.mipmap.platform_pic);
-
+ datas.add(new BaseDataUIBean(str2SpannableString("鐪両D "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getProvince())),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("甯侷D "),R.mipmap.province_id,str2FouregourdSpannableString(String.valueOf(mRtkConfig.getCity())),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("RTK骞冲彴鍦板潃 "),R.mipmap.platform_pic,str2FouregourdSpannableString(mRtkConfig.getIp()+":"+mRtkConfig.getPort()),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("鑰冭瘯骞冲彴鍦板潃 "),R.mipmap.platform_pic,str2FouregourdSpannableString(ExamPlatformData.getInstance().getPlatformIP()
+ +":"+ExamPlatformData.getInstance().getPlatformPort()),"",1,null));
}
if (appStatus != null){
- setitemInfo("RTK骞冲彴鐘舵�� ", appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�",R.mipmap.conn_status);
- setitemInfo("鑰冭瘯骞冲彴鐘舵�� ", ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()),R.mipmap.conn_status);
+ datas.add(new BaseDataUIBean(str2SpannableString("RTK骞冲彴鐘舵��"),R.mipmap.conn_status,str2FouregourdSpannableString(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�"),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("鑰冭瘯骞冲彴鐘舵��"),R.mipmap.conn_status,str2FouregourdSpannableString(ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus())),"",1,null));
}
HashMap<BaseDataUIBean.TYPE_, MapInfoHead> hashMaps = ExamPlatformData.getInstance().getMapInfoHeads();
if (hashMaps != null){
@@ -163,16 +163,7 @@
return spannableString;
}
- private void setitemInfo(String des, String str, int id){
- versionDes=des;
- version= versionDes+str;
- spannableString = new SpannableString(version);
- spannableString.setSpan(new AbsoluteSizeSpan(22),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#A8AAA7")),0,versionDes.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- spannableString.setSpan(new AbsoluteSizeSpan(28),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFFFFF")),versionDes.length()-1,version.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- datas.add(new BaseDataUIBean( spannableString,id));
- }
+
public static SupportFragment newInstance() {
return new BaseDatasFragment();
@@ -271,16 +262,13 @@
BaseDataUIBean.TYPE_ type = datas.get((int)view.getTag()).getType_();
switch (type){
case car:
- Toast.makeText(_mActivity, "鏇存柊杞︽ā鍨�", Toast.LENGTH_SHORT).show();
- DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");
+
break;
case road:
- Toast.makeText(_mActivity, "鏇存柊閬撹矾鍦板浘", Toast.LENGTH_SHORT).show();
- DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");
+
break;
case yard:
- Toast.makeText(_mActivity, "鏇存柊鍦哄湴鍦板浘", Toast.LENGTH_SHORT).show();
- DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
+
break;
}
}
--
Gitblit v1.8.0