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

app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <solid android:color="@color/black" />
+    <solid android:color="@color/white" />
     <stroke
         android:width="1dp"
-        android:color="@color/deepskyblue" />
+        android:color="@color/highFontColor" />
     <corners
         android:bottomLeftRadius="5dp"
         android:bottomRightRadius="5dp"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/ivory"
+    android:background="@color/white"
     android:paddingLeft="10dp"
     android:paddingTop="5dp"
     android:paddingRight="10dp"

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

@@ -13,7 +13,7 @@
         android:id="@+id/qs_record_index"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableLeft="@mipmap/marker"
+        android:drawableLeft="@mipmap/marker2"
         android:maxLength="3"
         android:text=""
         android:layout_marginRight="@dimen/default_widget_padding"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/ivory"
+    android:background="@color/white"
     android:paddingLeft="10dp"
     android:paddingTop="5dp"
     android:paddingRight="10dp"

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

@@ -16,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:background="@drawable/drawable_bg_blue_frame_black_bg_4_radius"
+            android:background="@drawable/drawable_bg_blue_frame_white_bg_4_radius"
             android:orientation="horizontal"
             >
             <ImageView