Merge branch 'master' of C:\Users\wds81\StudioProjects\NavinfoOutDoorDataCollect with conflicts.

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

@@ -7,7 +7,7 @@
             android:id="@+id/rl_find"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#fff"
+            android:background="#1BA5F1"
             android:paddingTop="@dimen/top_pind_sp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -31,7 +31,7 @@
                 android:layout_toRightOf="@id/iv_find_task"
                 android:gravity="center"
                 android:text="任务说明"
-                android:textColor="#000"
+                android:textColor="#fff"
                 android:textSize="17sp"
                 android:textStyle="bold" />
         </LinearLayout>