Merge branch 'master' of gitee.com:navinfo-out-door/navinfo-out-door-data-collect

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F6F4F4"
+    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="M10.01,21.01c0,1.1 0.89,1.99 1.99,1.99s1.99,-0.89 1.99,-1.99h-3.98zM18.88,16.82L18.88,11c0,-3.25 -2.25,-5.97 -5.29,-6.69v-0.72C13.59,2.71 12.88,2 12,2s-1.59,0.71 -1.59,1.59v0.72C7.37,5.03 5.12,7.75 5.12,11v5.82L3,18.94L3,20h18v-1.06l-2.12,-2.12zM16,13.01h-3v3h-2v-3L8,13.01L8,11h3L11,8h2v3h3v2.01z"/>
+</vector>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<!--<corners android:radius="50dp"/>-->
+<!--    <solid android:color="@color/colorRed"/>-->
+    <corners android:radius="180dip" />
+    <solid android:color="#FF0000" />
+    <padding
+        android:left="4dip"
+        android:right="4dip" />
+
+</shape>

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

@@ -4,14 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/ic_launcher_background"
+    android:background="@drawable/start_bg"
     tools:context="activity.MainActivity">
 
     <TextView
         android:id="@+id/tv_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="启动页"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

@@ -23,9 +23,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="?attr/actionBarSize"
-            android:focusable="false"
             android:focusableInTouchMode="false"
             android:gravity="center"
+            android:focusable="false"
             app:layout_constraintBottom_toTopOf="@+id/frame_layout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
@@ -35,15 +35,24 @@
         </com.tencent.tencentmap.mapsdk.maps.MapView>
         <ImageView
             android:id="@+id/iv_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_marginTop="60dp"
             android:layout_marginLeft="20dp"
-            android:background="@drawable/fuwu"
+            android:background="@drawable/ic_baseline_add_alert"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
-
         </ImageView>
+
+        <!--<TextView-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="10"-->
+        <!--android:background="@drawable/small_bell_text"-->
+        <!--android:textColor="@color/white"-->
+        <!--app:layout_constraintTop_toTopOf="@+id/iv_message"-->
+        <!--app:layout_constraintLeft_toRightOf="@+id/iv_message"/>-->
+
         <FrameLayout
             android:id="@+id/frame_layout"
             android:layout_width="match_parent"
@@ -52,7 +61,8 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            />
 
         <CheckBox
             android:id="@+id/cb_map_type"
@@ -64,7 +74,8 @@
             android:checked="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            />
 
         <CheckBox
             android:id="@+id/cb_foot_type"
@@ -75,7 +86,8 @@
             android:button="@null"
             android:checked="false"
             app:layout_constraintRight_toRightOf="@id/cb_map_type"
-            app:layout_constraintTop_toBottomOf="@id/cb_map_type" />
+            app:layout_constraintTop_toBottomOf="@id/cb_map_type"
+            />
 
         <ImageView
             android:id="@+id/iv_submit"
@@ -84,7 +96,8 @@
             android:src="@mipmap/submit"
             app:layout_constraintBottom_toBottomOf="@id/iv_refrish"
             app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
-            app:layout_constraintTop_toTopOf="@id/iv_zoom_del" />
+            app:layout_constraintTop_toTopOf="@id/iv_zoom_del"
+            />
 
         <ImageView
             android:id="@+id/iv_filter"
@@ -93,7 +106,8 @@
             android:layout_marginTop="15dp"
             android:src="@mipmap/filter"
             app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
-            app:layout_constraintTop_toBottomOf="@id/iv_submit" />
+            app:layout_constraintTop_toBottomOf="@id/iv_submit"
+            />
 
         <ImageView
             android:id="@+id/iv_zoom_add"
@@ -103,7 +117,8 @@
             android:layout_marginTop="15dp"
             android:src="@mipmap/zoom_add"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cb_foot_type" />
+            app:layout_constraintTop_toBottomOf="@id/cb_foot_type"
+            />
 
         <ImageView
             android:id="@+id/iv_zoom_del"
@@ -112,7 +127,8 @@
             android:layout_marginTop="15dp"
             android:src="@mipmap/zoom_del"
             app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
-            app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
+            app:layout_constraintTop_toBottomOf="@id/iv_zoom_add"
+            />
 
         <ImageView
             android:id="@+id/iv_refrish"
@@ -121,7 +137,8 @@
             android:layout_marginTop="15dp"
             android:src="@mipmap/refresh"
             app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
-            app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
+            app:layout_constraintTop_toBottomOf="@id/iv_zoom_del"
+            />
 
         <ImageView
             android:id="@+id/iv_location"
@@ -130,7 +147,8 @@
             android:layout_marginTop="15dp"
             android:src="@mipmap/mine_location"
             app:layout_constraintLeft_toLeftOf="@id/iv_refrish"
-            app:layout_constraintTop_toBottomOf="@id/iv_refrish" />
+            app:layout_constraintTop_toBottomOf="@id/iv_refrish"
+            />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout

app/src/main/res/values/colors.xml

@@ -15,5 +15,6 @@
     <color name="colorHui">#95CAF6</color>
     <color name="colorRed">#F44236</color>
     <color name="colorText">#87CDF6</color>
+    <color name="colorRead">#ED1931</color>
 
 </resources>