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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/Constant.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt

app/src/main/res/layout/activity_main.xml

@@ -63,6 +63,61 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageView
+            android:id="@+id/main_activity_sign_more_info_bg"
+            android:layout_width="240dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="260dp"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/main_sign_moreinfo_bg"
+            android:minHeight="140dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_top_sign_recyclerview" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
+            android:drawablePadding="4dp"
+            android:text="条件点限速"
+            android:textColor="@color/orange"
+            app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toTopOf="@id/main_activity_sign_more_info_bg" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:text="条件点限速"
+            android:textColor="@color/white"
+            app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_title" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_text2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:singleLine="false"
+            android:text="条件点限速"
+            android:textColor="@color/white"
+            app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_text1" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_sign_more_info_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="main_activity_sign_more_info_bg,main_activity_sign_more_info_text2,main_activity_sign_more_info_text1,main_activity_sign_more_info_title" />
+
         <androidx.constraintlayout.helper.widget.Flow
             android:id="@+id/main_activity_flow"
             android:layout_width="0dp"
@@ -408,8 +463,8 @@
         <ImageView
             android:id="@+id/main_bottom_offline_map"
             style="@style/main_activity_bottom_sheet_icon"
-            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             android:background="@drawable/icon_main_bottom_offline_map"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             app:layout_constraintBottom_toTopOf="@id/main_bottom_offline_map_text"
             app:layout_constraintLeft_toRightOf="@id/main_bottom_home"
             app:layout_constraintRight_toLeftOf="@id/main_bottom_route"
@@ -420,10 +475,10 @@
             android:id="@+id/main_bottom_offline_map_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             android:text="离线地图"
             android:textColor="@color/blue"
             android:textSize="10sp"
-            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
             app:layout_constraintLeft_toLeftOf="@id/main_bottom_offline_map"
             app:layout_constraintRight_toRightOf="@id/main_bottom_offline_map"
@@ -435,6 +490,7 @@
             android:background="@drawable/icon_main_bottom_route"
             app:layout_constraintBottom_toTopOf="@id/main_bottom_route_text"
             app:layout_constraintLeft_toRightOf="@id/main_bottom_offline_map"
+            android:onClick="@{()->mainActivity.onClickRouteFragment()}"
             app:layout_constraintRight_toRightOf="@id/main_activity_bottom_sheet_bg"
             app:layout_constraintTop_toTopOf="@id/main_bottom_task"
             app:layout_constraintVertical_chainStyle="packed" />
@@ -446,6 +502,7 @@
             android:text="路径规划"
             android:textColor="@color/blue"
             android:textSize="10sp"
+            android:onClick="@{()->mainActivity.onClickRouteFragment()}"
             app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
             app:layout_constraintLeft_toLeftOf="@id/main_bottom_route"
             app:layout_constraintRight_toRightOf="@id/main_bottom_route"
@@ -455,7 +512,7 @@
             android:id="@+id/main_activity_bottom_sheet_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="visible"
+            android:visibility="gone"
             app:constraint_referenced_ids="
             main_bottom_route_text,
             main_bottom_offline_map_text,
@@ -476,5 +533,4 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </layout>

app/src/main/res/layout/adapter_sign.xml

@@ -46,10 +46,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/sign_bottom_text"
-        android:layout_alignParentRight="true"
         android:layout_marginRight="15dp"
         android:gravity="center"
         android:text="其他信息"
+        android:layout_alignRight="@id/sign_main_bg"
         android:textColor="@color/white"
         android:textSize="14sp" />
 

app/src/main/res/layout/adapter_task_list.xml

@@ -97,7 +97,6 @@
 
     <TextView
         android:id="@+id/task_progress_text"
-        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/task_download_btn"

app/src/main/res/layout/console_off.xml

@@ -5,7 +5,6 @@
     android:id="@+id/console_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/console_bg"
     tools:context=".ui.fragment.console.ConsoleFragment">
 
     <androidx.constraintlayout.widget.Guideline

app/src/main/res/layout/console_on.xml

@@ -128,12 +128,16 @@
         android:src="@drawable/icon_console_task"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_task_bg"
-        app:layout_constraintTop_toTopOf="@id/console_task_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_task_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_task_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_task_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评任务"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_task_icon"
         app:layout_constraintRight_toRightOf="@id/console_task_bg"
         app:layout_constraintTop_toTopOf="@id/console_task_bg" />
 
@@ -154,12 +158,16 @@
         android:src="@drawable/icon_console_evaluation"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_evaluation_bg"
-        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_evaluation_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_evaluation_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评结果"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_evaluation_icon"
         app:layout_constraintRight_toRightOf="@id/console_evaluation_bg"
         app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
 
@@ -180,12 +188,16 @@
         android:src="@drawable/icon_console_offline_map"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_offline_map_bg"
-        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_offline_map_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_offline_map_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="离线地图"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_offline_map_icon"
         app:layout_constraintRight_toRightOf="@id/console_offline_map_bg"
         app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
 
@@ -205,12 +217,16 @@
         android:src="@drawable/icon_console_route"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_route_bg"
-        app:layout_constraintTop_toTopOf="@id/console_route_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_route_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_route_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_route_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="路径规划"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_route_icon"
         app:layout_constraintRight_toRightOf="@id/console_route_bg"
         app:layout_constraintTop_toTopOf="@id/console_route_bg" />
 
@@ -232,12 +248,16 @@
         android:src="@drawable/icon_console_layer_setting"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_layer_setting_bg"
-        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_layer_setting_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_layer_setting_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="图层设置"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_layer_setting_icon"
         app:layout_constraintRight_toRightOf="@id/console_layer_setting_bg"
         app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
 
@@ -257,12 +277,16 @@
         android:src="@drawable/icon_console_personal_center"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_personal_center_bg"
-        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_personal_center_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_personal_center_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="个人中心"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_personal_center_icon"
         app:layout_constraintRight_toRightOf="@id/console_personal_center_bg"
         app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
 
@@ -469,7 +493,7 @@
         app:layout_constraintLeft_toLeftOf="@id/console_track_bg"
         app:layout_constraintRight_toLeftOf="@id/console_track_text"
         app:layout_constraintTop_toTopOf="@id/console_track_bg"
-        app:layout_constraintVertical_chainStyle="spread" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <ImageView
         android:id="@+id/console_track_icon"

app/src/main/res/layout/fragment_offline_map.xml

@@ -46,8 +46,8 @@
         app:tabGravity="center"
         app:tabIndicator="@null"
         app:tabIndicatorHeight="0dp"
-        app:tabMaxWidth="150dp"
-        app:tabMinWidth="150dp"
+        app:tabMaxWidth="110dp"
+        app:tabMinWidth="110dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="6dp"
         app:tabPaddingStart="6dp"

app/src/main/res/layout/fragment_task_manager.xml

@@ -45,8 +45,8 @@
         app:tabGravity="center"
         app:tabIndicator="@null"
         app:tabIndicatorHeight="0dp"
-        app:tabMaxWidth="150dp"
-        app:tabMinWidth="150dp"
+        app:tabMaxWidth="110dp"
+        app:tabMinWidth="110dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="6dp"
         app:tabPaddingStart="6dp"