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/BaseSettingFragment.java | 27 ++++++---
app/src/main/res/mipmap-xhdpi/conn_status.png | 0
app/src/main/res/drawable/list_divider.xml | 8 ++
app/src/main/res/drawable/tab_bg.xml | 6 ++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 29 ++++-----
app/src/main/res/layout/gps_info_item_rightarrow.xml | 4 +
app/src/main/res/layout/layout_base_set.xml | 83 +++++++++++++++++----------
app/src/main/res/layout/layout_gps_info.xml | 2
app/src/main/res/drawable/right_arrow.png | 0
app/src/main/res/layout/inspect_signal_head.xml | 4 +
app/src/main/res/mipmap-xhdpi/click_it.png | 0
app/src/main/res/values/dimens.xml | 4 +
12 files changed, 110 insertions(+), 57 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()));
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
index 66fd5a1..8021279 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
@@ -1,12 +1,16 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
+import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.viewpager.widget.ViewPager;
+import android.text.SpannableString;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.ForegroundColorSpan;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -60,15 +64,20 @@
tabLayout.addTab(tabLayout.newTab());
// tabLayout.addTab(tabLayout.newTab());
tb = view.findViewById(R.id.toolbar);
- tb.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp);
- tb.setNavigationOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- _mActivity.onBackPressed();
- }
- });
- tb.setTitle(R.string.sys_setting);
- tb.setSubtitle(R.string.sys_setting_sub);
+
+ String str = "绯荤粺閰嶇疆 鏅鸿兘鑰冨煿锛屽姪鍔涢┚鑰冩柊鏃呯▼";
+
+ SpannableString spannableString = new SpannableString(str);
+ spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFFFFF")),
+ 0,4, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ spannableString.setSpan(new AbsoluteSizeSpan(28),
+ 0,4, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tb.setTitle(spannableString);
+ spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#ffa1a1a3")),
+ 5,str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ spannableString.setSpan(new AbsoluteSizeSpan(18),
+ 5,str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tb.setTitle(spannableString);
}
@Override
diff --git a/app/src/main/res/drawable/list_divider.xml b/app/src/main/res/drawable/list_divider.xml
new file mode 100644
index 0000000..51d4631
--- /dev/null
+++ b/app/src/main/res/drawable/list_divider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="line">
+<size android:height="1px" />
+ <stroke
+ android:width="1dp"
+ android:color="@android:color/holo_red_dark"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/right_arrow.png b/app/src/main/res/drawable/right_arrow.png
index 83a27d0..7194690 100644
--- a/app/src/main/res/drawable/right_arrow.png
+++ b/app/src/main/res/drawable/right_arrow.png
Binary files differ
diff --git a/app/src/main/res/drawable/tab_bg.xml b/app/src/main/res/drawable/tab_bg.xml
new file mode 100644
index 0000000..9bdd3f9
--- /dev/null
+++ b/app/src/main/res/drawable/tab_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+<solid android:color="#ff1e4a89"/>
+ <corners android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gps_info_item_rightarrow.xml b/app/src/main/res/layout/gps_info_item_rightarrow.xml
index e8a7a9b..1d668dc 100644
--- a/app/src/main/res/layout/gps_info_item_rightarrow.xml
+++ b/app/src/main/res/layout/gps_info_item_rightarrow.xml
@@ -6,6 +6,10 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:text="璁剧疆鍙傛暟"
+ android:textColor="#A8AAA7"
+ android:textSize="18sp"
+ android:drawableLeft="@mipmap/click_it"
+ android:drawablePadding="@dimen/ui_margin_5dp"
android:drawableRight="@drawable/right_arrow"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
diff --git a/app/src/main/res/layout/inspect_signal_head.xml b/app/src/main/res/layout/inspect_signal_head.xml
index 0048d3d..18f447b 100644
--- a/app/src/main/res/layout/inspect_signal_head.xml
+++ b/app/src/main/res/layout/inspect_signal_head.xml
@@ -6,6 +6,10 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:text="杞﹁浇淇″彿"
+ android:textColor="#A8AAA7"
+ android:drawablePadding="@dimen/ui_margin_5dp"
+ android:drawableLeft="@mipmap/click_it"
+ android:textSize="@dimen/network_train_textsize22px"
android:drawableRight="@drawable/right_arrow"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
diff --git a/app/src/main/res/layout/layout_base_set.xml b/app/src/main/res/layout/layout_base_set.xml
index 38db05d..992ae8d 100644
--- a/app/src/main/res/layout/layout_base_set.xml
+++ b/app/src/main/res/layout/layout_base_set.xml
@@ -1,36 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <com.google.android.material.appbar.AppBarLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
- app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
- <com.google.android.material.tabs.TabLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tab_base_set"
-
- android:background="@color/profile_bg"
- android:layout_below="@+id/toolbar_set">
- </com.google.android.material.tabs.TabLayout>
- </com.google.android.material.appbar.AppBarLayout>
- <androidx.viewpager.widget.ViewPager
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent" android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/vp_base_set">
+ android:orientation="vertical"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:background="@drawable/stu_score_bg"
+ >
+ <com.google.android.material.appbar.AppBarLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay">
- </androidx.viewpager.widget.ViewPager>
-</LinearLayout>
\ No newline at end of file
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
+ app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
+ <com.google.android.material.tabs.TabLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tab_base_set"
+
+ android:layout_below="@+id/toolbar_set">
+ </com.google.android.material.tabs.TabLayout>
+ </com.google.android.material.appbar.AppBarLayout>
+ <androidx.viewpager.widget.ViewPager
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/vp_base_set">
+
+ </androidx.viewpager.widget.ViewPager>
+
+ </LinearLayout>
+
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="@dimen/ui_margin_25dp"
+ android:layout_marginTop="@dimen/ui_margin_50dp"
+ android:background="@drawable/stu_score_bg"
+ />
+</FrameLayout>
diff --git a/app/src/main/res/layout/layout_gps_info.xml b/app/src/main/res/layout/layout_gps_info.xml
index 3f24621..3ae55fb 100644
--- a/app/src/main/res/layout/layout_gps_info.xml
+++ b/app/src/main/res/layout/layout_gps_info.xml
@@ -5,5 +5,7 @@
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:id="@+id/lv_gpsinfo"></ListView>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/click_it.png b/app/src/main/res/mipmap-xhdpi/click_it.png
new file mode 100644
index 0000000..29fef8c
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/click_it.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/conn_status.png b/app/src/main/res/mipmap-xhdpi/conn_status.png
new file mode 100644
index 0000000..0edb8e5
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/conn_status.png
Binary files differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 376d5c3..5f12cc2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,4 +14,8 @@
<dimen name="width_160px_dp">127dp</dimen>
<dimen name="network_train_textsize21px">17sp</dimen>
<dimen name="network_train_textsize25px">19sp</dimen>
+ <dimen name="ui_margin_30dp">30dp</dimen>
+ <dimen name="ui_margin_25dp">25dp</dimen>
+ <dimen name="ui_margin_80dp">80dp</dimen>
+ <dimen name="ui_margin_50dp">50dp</dimen>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0