From dd069631189d426e1d5c934cd3f917581b3fb021 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 22 四月 2020 11:45:29 +0800
Subject: [PATCH] 完成系统配置界面
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 40c1934..6954618 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
@@ -96,19 +97,13 @@
if (fields[i].getName().equalsIgnoreCase("version")){
version= (String) fields[i].get(mcuInfo);
version = new String(BytesUtils.hexStringToBytes(version),"GBK");
- versionDes= "鐗堟湰鍙凤細";
+ versionDes= "鐗堟湰鍙� ";
version = version+"#"+ BuildConfig.VERSION_NAME;
- version = versionDes+version;
- 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,R.mipmap.version_pic));
+ setitemInfo(versionDes,version,R.mipmap.version_pic);
}else if(fields[i].getName().equalsIgnoreCase("sn")){
- setitemInfo("璁惧搴忓垪鍙凤細", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
+ setitemInfo("璁惧搴忓垪鍙� ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.device_sn);
}else if(fields[i].getName().equalsIgnoreCase("selftest")){
- setitemInfo("鑷鐘舵�侊細", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
+ setitemInfo("鑷鐘舵�� ", String.valueOf(fields[i].get(mcuInfo)),R.mipmap.auto_check_status);
}
} catch (IllegalAccessException e) {
@@ -122,17 +117,17 @@
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()
+ 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);
}
if (appStatus != null){
- setitemInfo("RTK骞冲彴鐘舵�侊細", appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"宸茬櫥褰�":"鏈櫥褰�"):"鏈繛鎺�",R.mipmap.province_id);
- setitemInfo("鑰冭瘯骞冲彴鐘舵�侊細", ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()),R.mipmap.province_id);
+ 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);
}
gpsInfoAdapter.addAll(datas);
}
@@ -175,6 +170,8 @@
View headView = inflater.inflate(R.layout.inspect_signal_head,null);
lv.addFooterView(footView);
lv.addHeaderView(headView);
+ lv.setDivider(new ColorDrawable(Color.parseColor("#2A344B")));
+ lv.setDividerHeight(1);
footView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(SetArgumentsFragment.newInstance()));
headView.setOnClickListener(v -> ((BaseSettingFragment)getParentFragment()).startBrotherFragment(InspectSignalFragment.newInstance()));
--
Gitblit v1.8.0