Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Conflicts: app/src/main/res/layout/adapter_task_list.xml
2023-05-06 15:39:31 +08:00
parent 3733634eb5 be9e582048
commit 8e4d1c7e0e
37 changed files with 245 additions and 75 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -116,7 +116,7 @@ class LoginViewModel @Inject constructor(
        //文件夹初始化
        try {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT)
-            createUserFolder(context, "1")
+            createUserFolder(context, "02911")
        } catch (e: IOException) {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
        }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -313,6 +313,7 @@ class EvaluationResultViewModel @Inject constructor(
    fun saveData() {
        viewModelScope.launch(Dispatchers.IO) {
            val realm = Realm.getDefaultInstance()
+            liveDataQsRecordBean.value!!.checkTime  = DateTimeUtil.getDataTime()
            realm.executeTransaction {
                it.copyToRealmOrUpdate(liveDataQsRecordBean.value)
            }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
@@ -51,14 +51,18 @@ class QsRecordListAdapter(
        holder.itemView.setOnClickListener {
            itemClickListener!!.onItemClickListener(position)
        }
-        changeViews(binding, qsRecordBean)
+        changeViews(position, binding, qsRecordBean)
    }

-    private fun changeViews(binding: AdapterQsRecordListBinding, qsRecordBean: QsRecordBean) {
+    private fun changeViews(position: Int,binding: AdapterQsRecordListBinding, qsRecordBean: QsRecordBean) {
+        if(position<99)
+           binding.qsRecordIndex.text = (position+1).toString()
+        else
+            binding.qsRecordIndex.text = "99."
        binding.qsRecordClassType.text = qsRecordBean.classType
        binding.qsRecordProblemType.text = qsRecordBean.problemType
        binding.qsRecordPhenomenon.text = qsRecordBean.phenomenon
-        binding.qsRecordProblemLink.text = qsRecordBean.problemLink
+        binding.qsRecordTime.text = qsRecordBean.checkTime
    }

    override fun getItemViewRes(position: Int): Int {
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
@@ -44,6 +44,7 @@ class QsRecordListFragment : BaseFragment(){
        binding.qsRecyclerview.adapter = adapter
        viewModel.liveDataQSList.observe(viewLifecycleOwner) {
            adapter.refreshData(it)
+            binding.tvTitleCount.text = "共"+adapter.data.size+"条"
        }
        val itemDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
        itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator))
@@ -57,7 +58,7 @@ class QsRecordListFragment : BaseFragment(){
            }
        })

-        binding.recordBack.setOnClickListener{
+        binding.imgBack.setOnClickListener{
            findNavController().navigateUp()
        }
    }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.TaskBean
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
@@ -36,7 +37,7 @@ class TaskListViewModel @Inject constructor(
        viewModelScope.launch(Dispatchers.IO) {

            var taskList: List<TaskBean> = mutableListOf()
-            when (val result = networkService.getTaskList("02911")) {
+            when (val result = networkService.getTaskList(Constant.USER_ID)) {
                is NetResult.Success -> {
                    if (result.data != null) {
                        val realm = Realm.getDefaultInstance()
--- a/app/src/main/res/color/selector_default_primary_press_secondary.xml
+++ b/app/src/main/res/color/selector_default_primary_press_secondary.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/gray"/>
+    <item android:state_checked="true" android:color="@color/colorSecondary"></item>
+    <item android:state_selected="true" android:color="@color/colorSecondary"></item>
+    <item android:state_pressed="true" android:color="@color/colorSecondary"></item>
+    <item android:color="@color/colorPrimary"></item>
+</selector>
--- a/app/src/main/res/drawable-v24/baseline_person_24.xml
+++ b/app/src/main/res/drawable-v24/baseline_person_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#18FD00"
+<vector android:height="24dp" android:tint="@color/icon_blue"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
--- a/app/src/main/res/drawable-xhdpi/icon_filter.png
+++ b/app/src/main/res/drawable-xhdpi/icon_filter.png
--- a/app/src/main/res/drawable-xhdpi/icon_order.png
+++ b/app/src/main/res/drawable-xhdpi/icon_order.png
--- a/app/src/main/res/drawable-xhdpi/icon_refrush.png
+++ b/app/src/main/res/drawable-xhdpi/icon_refrush.png
--- a/app/src/main/res/drawable-xxhdpi/icon_filter.png
+++ b/app/src/main/res/drawable-xxhdpi/icon_filter.png
--- a/app/src/main/res/drawable-xxhdpi/icon_order.png
+++ b/app/src/main/res/drawable-xxhdpi/icon_order.png
--- a/app/src/main/res/drawable-xxhdpi/icon_refrush.png
+++ b/app/src/main/res/drawable-xxhdpi/icon_refrush.png
--- a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml
+++ b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml
@@ -4,6 +4,7 @@
        <shape>
            <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
            <solid android:color="@color/cv_gray_153" />
+            <corners android:radius="@dimen/default_btn_corner"></corners>
            <stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
        </shape>
    </item>
@@ -11,13 +12,23 @@
        <shape>
            <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
            <solid android:color="@color/white" />
-            <stroke android:width="1.1dp" android:color="@color/white" />
+            <corners android:radius="@dimen/default_btn_corner"></corners>
+            <stroke android:width="1.1dp" android:color="@color/colorSecondary" />
+        </shape>
+    </item>
+    <item android:state_checked="true">
+        <shape>
+            <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+            <solid android:color="@color/white" />
+            <corners android:radius="@dimen/default_btn_corner"></corners>
+            <stroke android:width="1.1dp" android:color="@color/colorSecondary" />
        </shape>
    </item>
    <item android:state_selected="true">
        <shape>
            <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
            <solid android:color="@color/cvm_red" />
+            <corners android:radius="@dimen/default_btn_corner"></corners>
            <stroke android:width="1.1dp" android:color="@color/cvm_red" />
        </shape>
    </item>
@@ -25,7 +36,8 @@
        <shape>
            <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
            <solid android:color="@color/transp" />
-            <stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
+            <corners android:radius="@dimen/default_btn_corner"></corners>
+            <stroke android:width="1.1dp" android:color="@color/colorPrimary" />
        </shape>
    </item>

--- a/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#2C2C2C" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8C17,7.58 13.42,4 9,4zM12,10.5h-2v5H8v-5H6V9h6V10.5zM20.25,3.75L23,5l-2.75,1.25L19,9l-1.25,-2.75L15,5l2.75,-1.25L19,1L20.25,3.75zM20.25,17.75L23,19l-2.75,1.25L19,23l-1.25,-2.75L15,19l2.75,-1.25L19,15L20.25,17.75z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_layers_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_layers_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml
@@ -0,0 +1,8 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#2C2C2C" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,10h11v2h-11z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M3,6h11v2h-11z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M3,14h7v2h-7z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20.59,11.93l-4.25,4.24l-2.12,-2.12l-1.41,1.41l3.53,3.54l5.66,-5.66z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7,14m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+    <path android:fillColor="@android:color/white" android:pathData="M11,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16.6,17.6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM12,17l-4,-4h3V9.02L13,9v4h3L12,17z"/>
+</vector>
--- a/app/src/main/res/drawable/separator.xml
+++ b/app/src/main/res/drawable/separator.xml
@@ -2,8 +2,8 @@
    android:shape="line">
    <size android:height="2dp"/>
    <stroke
-        android:color="@color/skyblue"
-        android:dashWidth="2px"
-        android:dashGap="2px"
+        android:color="@color/bg_gray2"
+        android:dashWidth="1px"
+        android:dashGap="1px"
        android:width="1dp"/>
 </shape>
--- a/app/src/main/res/layout/adapter_offline_map_city.xml
+++ b/app/src/main/res/layout/adapter_offline_map_city.xml
@@ -39,7 +39,6 @@
        android:gravity="center"
        android:shadowColor="@android:color/transparent"
        android:text="下载"
-        android:textColor="@color/btn_blue_solid"
        android:textSize="@dimen/card_title_font_2size" />

    <TextView
--- a/app/src/main/res/layout/adapter_qs_record_list.xml
+++ b/app/src/main/res/layout/adapter_qs_record_list.xml
@@ -1,53 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="@color/ivory"
    android:paddingLeft="10dp"
    android:paddingRight="10dp"
    android:paddingTop="5dp"
    android:paddingBottom="5dp"
    tools:context="com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListAdapter">

+    <TextView
+        android:id="@+id/qs_record_index"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@mipmap/marker"
+        android:maxLength="3"
+        android:text=""
+        android:layout_marginRight="@dimen/default_widget_padding"
+        style="@style/content_font_default_size_13sp" />
+
    <TextView
        android:id="@+id/qs_record_classType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@mipmap/point_blue"
-        android:text="问题分类"
-        style="@style/content_font_default"
-        android:textSize="@dimen/default_font_size" />
-
-    <TextView
-        android:id="@+id/qs_record_problemLink"
-        style="@style/content_font_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/qs_record_classType"
-        android:drawableLeft="@mipmap/point_blue"
-        android:layout_marginLeft="@dimen/default_widget_padding"
-        android:text="问题环节" />
-
-    <TextView
-        android:id="@+id/qs_record_problem_type"
        style="@style/content_font_default_size_13sp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:maxEms="6"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:layout_toRightOf="@id/qs_record_index"
+        android:text="问题分类" />
+
+    <TextView
+        android:id="@+id/qs_record_time"
+        style="@style/content_font_default_size_13sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/default_widget_padding"
+        android:layout_toRightOf="@id/qs_record_classType"
+        android:maxLines="1"
+        android:text="" />
+
+    <TextView
+        android:id="@+id/qs_record_problem_type"
+        style="@style/content_font_default_size_10sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
        android:layout_below="@id/qs_record_classType"
-        android:drawableLeft="@mipmap/point_blue"
+        android:layout_toRightOf="@id/qs_record_index"
        android:layout_marginTop="5dp"
        android:text="问题类型" />

    <TextView
        android:id="@+id/qs_record_phenomenon"
-        style="@style/content_font_default_size_13sp"
+        style="@style/content_font_default_size_10sp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_toRightOf="@id/qs_record_problem_type"
+        android:maxLines="2"
        android:layout_below="@id/qs_record_classType"
-        android:drawableLeft="@mipmap/point_blue"
        android:layout_marginLeft="@dimen/default_widget_padding"
        android:layout_marginTop="5dp"
        android:text="问题现象" />
--- a/app/src/main/res/layout/adapter_task_list.xml
+++ b/app/src/main/res/layout/adapter_task_list.xml
@@ -26,6 +26,7 @@
        android:layout_height="wrap_content"
        android:layout_below="@id/task_name"
        android:layout_marginTop="5dp"
+        android:textColor="@color/gray_121"
        android:text="省市名称"
        android:textSize="@dimen/card_title_font_3size" />

--- a/app/src/main/res/layout/fragment_qs_record_list.xml
+++ b/app/src/main/res/layout/fragment_qs_record_list.xml
@@ -13,30 +13,85 @@
        android:layout_height="wrap_content"
        app:layout_constraintTop_toTopOf="parent"
        style="@style/left_pannel_title_layout">
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/record_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:background="@drawable/selector_bg_round_button"
-            android:foreground="@drawable/ripple_btn_press"
-            style="@style/btn_round"
-            android:src="@drawable/ic_baseline_keyboard_arrow_left_24"></androidx.appcompat.widget.AppCompatImageView>

-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/record_title"
-            android:layout_width="wrap_content"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/evaluation_appbar_layout"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textSize="@dimen/left_pannel_title_font"
-            android:textStyle="bold"
-            android:text="我的数据"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"></androidx.appcompat.widget.AppCompatTextView>
+            app:layout_constraintTop_toTopOf="parent">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/img_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/eight"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/btn_back_xml" />
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:paddingTop="@dimen/ten"
+                    android:paddingBottom="@dimen/five"
+                    android:text="测评结果"
+                    android:textColor="@color/highFontColor"
+                    android:textSize="@dimen/default_font_size" />
+
+                <TextView
+                    android:id="@+id/tv_title_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title"
+                    android:paddingLeft="@dimen/ten"
+                    android:layout_alignStart="@+id/tv_title"
+                    android:paddingBottom="@dimen/ten"
+                    android:textSize="@dimen/card_title_font_3size"
+                    android:text="（共0个）"
+                    android:textColor="@color/cv_gray_153" />
+
+                <ImageView
+                    android:id="@+id/img_refrush"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:padding="@dimen/eight"
+                    android:layout_centerInParent="true"
+                    android:layout_marginRight="@dimen/eight"
+                    android:background="@drawable/icon_refrush" />
+
+                <ImageView
+                    android:id="@+id/img_order"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:padding="@dimen/eight"
+                    android:layout_marginRight="@dimen/eight"
+                    android:layout_toLeftOf="@+id/img_refrush"
+                    android:background="@drawable/icon_order" />
+
+                <ImageView
+                    android:id="@+id/img_filter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:padding="@dimen/eight"
+                    android:layout_marginRight="@dimen/eight"
+                    android:layout_toLeftOf="@+id/img_order"
+                    android:background="@drawable/icon_filter" />
+
+
+            </RelativeLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.cardview.widget.CardView
--- a/app/src/main/res/layout/personal_center_head.xml
+++ b/app/src/main/res/layout/personal_center_head.xml
@@ -3,33 +3,36 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/nav_header_height"
-    android:background="@color/blue"
+    android:background="@color/colorPrimary"
    android:gravity="bottom"
    android:orientation="vertical"
    android:paddingLeft="@dimen/activity_horizontal_margin"
    android:paddingTop="@dimen/activity_vertical_margin"
    android:paddingRight="@dimen/activity_horizontal_margin"
    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
+    android:theme="@style/Theme.AppCompat.Light">

    <ImageView
        android:id="@+id/imageView"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:contentDescription="@string/nav_header_desc"
+        android:contentDescription="@string/app_name"
        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        app:srcCompat="@mipmap/logo" />

    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/nav_header_title"
+        android:text="@string/app_name"
+        style="@style/TextAppearance.AppCompat.Title"
+        android:textColor="@color/white"
        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />

    <TextView
        android:id="@+id/textView"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:textColor="@color/line_gray"
        android:text="@string/nav_header_subtitle" />
 </LinearLayout>
--- a/app/src/main/res/menu/evaluation_list_bar_mean.xml
+++ b/app/src/main/res/menu/evaluation_list_bar_mean.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/filter"
+        android:contentDescription="筛选"
+        android:icon="@drawable/icon_filter"
+        android:title="筛选"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/order"
+        android:contentDescription="排序"
+        android:icon="@drawable/icon_order"
+        android:title="排序"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/refrush"
+        android:contentDescription="刷新"
+        android:icon="@drawable/icon_refrush"
+        android:title="刷新"
+        app:showAsAction="ifRoom" />
+
+</menu>
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -12,19 +12,21 @@
            android:title="离线地图" />
        <item
            android:id="@+id/personal_center_menu_obtain_data"
-            android:icon="@drawable/ic_baseline_import_export_24"
+            android:icon="@drawable/ic_baseline_generating_tokens_24"
+            android:visible="false"
            android:title="生成数据" />
        <item
            android:id="@+id/personal_center_menu_import_data"
            android:icon="@drawable/ic_baseline_import_export_24"
+            android:visible="false"
            android:title="导入数据" />
        <item
            android:id="@+id/personal_center_menu_import_yuan_data"
-            android:icon="@drawable/ic_baseline_import_export_24"
+            android:icon="@drawable/ic_baseline_scatter_plot_24"
            android:title="导入元数据" />
        <item
            android:id="@+id/personal_center_menu_realm_data_backup"
-            android:icon="@drawable/ic_baseline_import_export_24"
+            android:icon="@drawable/ic_baseline_sim_card_download_24"
            android:title="备份数据" />
    </group>
    <group
@@ -34,20 +36,21 @@
            <menu>
                <item
                    android:id="@+id/personal_center_menu_task_list"
-                    android:icon="@drawable/baseline_person_24"
+                    android:icon="@drawable/ic_baseline_format_list_bulleted_24"
                    android:title="任务列表" />
                <item
                    android:id="@+id/personal_center_menu_qs_record_list"
-                    android:icon="@drawable/baseline_person_24"
-                    android:title="我的数据" />
+                    android:icon="@drawable/ic_baseline_playlist_add_check_24"
+                    android:title="测评结果" />
                <item
                    android:id="@+id/personal_center_menu_layer_manager"
-                    android:icon="@drawable/baseline_person_24"
+                    android:icon="@drawable/ic_baseline_layers_24"
                    android:title="图层管理" />

                <item
                    android:id="@+id/personal_center_menu_test"
                    android:icon="@drawable/baseline_person_24"
+                    android:visible="false"
                    android:title="测试" />
            </menu>
        </item>
--- a/app/src/main/res/mipmap-xhdpi/icon_back_n.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_back_n.png
--- a/app/src/main/res/mipmap-xhdpi/icon_back_p.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_back_p.png
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -166,6 +166,7 @@
    <color name="highFontColor">#2631DD</color>
    <color name="high_item_color">#FFF5F7FE</color>
    <color name="contentColor">#000000</color>
+    <color name="icon_blue">#FF4263EB</color>
    <!-- 一键连接对话框背景色 -->
    <color name="bg_gray2">#d1d1d1</color>
    <!-- 一键连接时间显示区域背景色 -->
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,4 +37,5 @@
    <!-- 相机设置窗体IV高度-->
    <dimen name="camear_dialog_iv_hight" comment="相机设置窗体高度">75dp</dimen>
    <dimen name="head_img_width">48dp</dimen>
+    <dimen name="default_btn_corner">6dp</dimen>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
    <string name="navigation_drawer_open">Open navigation drawer</string>
    <string name="navigation_drawer_close">Close navigation drawer</string>
    <string name="nav_header_title">Android Studio</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_subtitle">Navinfo Mobile</string>
    <string name="nav_header_desc">Navigation header</string>

    <string name="menu_home">Home</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,6 +63,15 @@
        <item name="android:layout_height">wrap_content</item>
    </style>

+    <!-- 默认字体 -->
+    <style name="content_font_default_size_10sp">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">@dimen/card_title_font_3size</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
    <!-- 输入框基本样式 -->
    <style name="input_blue_type" parent="content_font_default">
        <item name="android:textSize">16sp</item>
@@ -85,14 +94,15 @@
        <item name="android:clickable">false</item>
    </style>

-    <style name="map_download_style_btn" comment="离线地图下载的按钮样式">
+    <style name="map_download_style_btn" comment="离线地图下载的按钮样式" parent="ThemeOverlay.Material3.AutoCompleteTextView">
        <item name="android:layout_width">wrap_content</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_gravity">center_vertical</item>
        <item name="android:padding">@dimen/default_widget_padding</item>
        <item name="android:background">@drawable/fm_card_map_down_status_bg</item>
+        <item name="android:foreground">@drawable/ripple_btn_press</item>
        <item name="android:gravity">center_horizontal</item>
-        <item name="android:textColor">@color/btn_blue_white</item>
+        <item name="android:textColor">@color/selector_default_primary_press_secondary</item>
        <item name="android:textSize">15sp</item>
    </style>