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/res/layout/layout_mapfragment.xml | 9 --
app/src/main/res/values/strings.xml | 22 +++++++
app/src/main/res/layout/map_car_info_update.xml | 15 +++--
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 42 +++++---------
app/src/main/res/layout/layout_arc_gis.xml | 12 +++
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 16 +++++
app/src/main/res/layout/layout_base_datas.xml | 43 ++++++++++++++
7 files changed, 116 insertions(+), 43 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;
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index 68efb0f..388600a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -59,6 +59,7 @@
import safeluck.drive.evaluation.customview.MyArgEditText;
import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
+import safeluck.drive.evaluation.util.DataInitKt;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
@@ -162,6 +163,9 @@
btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
btn_map_select = view.findViewById(R.id.btn_map_select);
view.findViewById(R.id.btn_car_select).setOnClickListener(this);
+ view.findViewById(R.id.btn_car_upgrade).setOnClickListener(this);
+ view.findViewById(R.id.btn_yard_update).setOnClickListener(this);
+ view.findViewById(R.id.btn_road_update).setOnClickListener(this);
btn_mcu_upgrade.setOnClickListener(this);
btn_map_select.setOnClickListener(this);
btn_config_signal = view.findViewById(R.id.btn_signal_conf);
@@ -262,6 +266,18 @@
}
});
break;
+ case R.id.btn_car_upgrade:
+ Toast.makeText(_mActivity, "鏇存柊杞︽ā鍨�", Toast.LENGTH_SHORT).show();
+ DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");
+ break;
+ case R.id.btn_yard_update:
+ Toast.makeText(_mActivity, "鏇存柊鍦哄湴鍦板浘", Toast.LENGTH_SHORT).show();
+ DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
+ break;
+ case R.id.btn_road_update:
+ Toast.makeText(_mActivity, "鏇存柊閬撹矾鍦板浘", Toast.LENGTH_SHORT).show();
+ DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");
+ break;
default:
break;
}
diff --git a/app/src/main/res/layout/layout_arc_gis.xml b/app/src/main/res/layout/layout_arc_gis.xml
index 8f56f7d..58a2d20 100644
--- a/app/src/main/res/layout/layout_arc_gis.xml
+++ b/app/src/main/res/layout/layout_arc_gis.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_main"
android:layout_width="match_parent"
@@ -11,4 +11,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
</com.esri.arcgisruntime.mapping.view.MapView>
-</RelativeLayout>
\ No newline at end of file
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|left"
+ android:id="@+id/btn_change_map"
+ android:background="@drawable/btn_state_save"
+
+ android:text="鍒囨崲鍦板浘"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 90e75cd..7b3b3a0 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -215,6 +215,49 @@
</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_marginBottom="10dp"
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize25px"
+ android:text="鍦板浘鍗囩骇锛�"/>
+
+
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="杞﹁締妯″瀷鍗囩骇"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:layout_marginLeft="60dp"
+ android:id="@+id/btn_car_upgrade"
+ android:background="@drawable/btn_bg_baseset"/>
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="鍦哄湴鍦板浘鍗囩骇"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:id="@+id/btn_yard_update"
+ android:layout_marginLeft="8dp"
+ android:background="@drawable/btn_bg_baseset"/>
+ <Button android:layout_width="129dp"
+ android:layout_height="@dimen/ui_margin_50dp"
+ android:text="閬撹矾鍦板浘鍗囩骇"
+ android:padding="5dp"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize21px"
+ android:id="@+id/btn_road_update"
+ android:layout_marginLeft="8dp"
+ android:background="@drawable/btn_bg_baseset"/>
+
+ </LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/layout_mapfragment.xml b/app/src/main/res/layout/layout_mapfragment.xml
index cd9b7a4..a13685c 100644
--- a/app/src/main/res/layout/layout_mapfragment.xml
+++ b/app/src/main/res/layout/layout_mapfragment.xml
@@ -22,12 +22,5 @@
android:background="@drawable/btn_state_save"
android:layout_marginLeft="120dp"
android:text="缂╁皬"/>
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|left"
- android:id="@+id/btn_change_map"
- android:background="@drawable/btn_state_save"
- android:layout_marginLeft="240dp"
- android:text="鍒囨崲鍦板浘"/>
+
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/map_car_info_update.xml b/app/src/main/res/layout/map_car_info_update.xml
index 95726e9..d6b518b 100644
--- a/app/src/main/res/layout/map_car_info_update.xml
+++ b/app/src/main/res/layout/map_car_info_update.xml
@@ -4,14 +4,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal">
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical">
<TextView
android:id="@+id/tv_map_name"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="娑櫟浜ら�氶┚鏍�"
- android:layout_weight="3"
+ android:layout_weight="1"
android:drawablePadding="@dimen/ui_margin_5dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -21,10 +23,10 @@
<TextView
android:id="@+id/tv_version"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/mapversion"
- android:layout_weight="1"
+ android:layout_weight="2"
android:textColor="@android:color/white"
/>
@@ -34,7 +36,8 @@
android:text="鏇存柊杞﹁締妯″瀷"
android:textColor="@android:color/white"
android:background="@drawable/bg_rgb_dlg"
- android:layout_weight="2"
+ android:layout_weight="0"
+ android:visibility="gone"
android:id="@+id/btn_update_map_car"
/>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8e87bb..f37080b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,4 +57,26 @@
<item>涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�</item>
<item>妯℃嫙澶滈棿鑰冭瘯瀹屾垚璇峰叧闂墍鏈夌伅鍏夛紝璇疯捣姝ョ户缁畬鎴愯�冭瘯</item>
</array>
+
+
+
+
+
+
+
+ <!-- 鍒锋柊 -->
+ <string name="pull_to_refresh">涓嬫媺鍒锋柊</string>
+ <string name="release_to_refresh">閲婃斁绔嬪嵆鍒锋柊</string>
+ <string name="refreshing">姝ｅ湪鍒锋柊...</string>
+ <string name="refresh_fail">鍒锋柊澶辫触</string>
+ <string name="pullup_to_load">涓婃媺鍔犺浇鏇村</string>
+ <string name="release_to_load">閲婃斁绔嬪嵆鍔犺浇</string>
+ <string name="loading">姝ｅ湪鍔犺浇...</string>
+ <string name="load_succeed">鍔犺浇鎴愬姛</string>
+ <string name="load_fail">鍔犺浇澶辫触</string>
+
+
+ <string name="auto_act_to_select">璇烽�夋嫨闇�瑕佽繛鎺ョ殑钃濈墮璁惧</string>
+ <string name="auto_act_to_refresh">璇峰皾璇曚笅鎷夊埛鏂�</string>
+
</resources>
--
Gitblit v1.8.0