修改poi录像、充电站的上传接口、修改部分bug

app/src/main/res/drawable/ic_baseline_search.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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorTransparent" />
+    <solid android:color="@color/white" />
     <corners android:radius="50dp" />
 </shape>

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

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:background="#ECECEC"
     android:layout_height="match_parent">
 
     <LinearLayout
@@ -46,6 +47,7 @@
         android:layout_height="wrap_content"
         android:background="@color/white"
         android:orientation="vertical"
+        android:padding="15dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/view1">
@@ -86,10 +88,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:background="@color/white"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/view2">
@@ -121,6 +122,8 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:background="#F1F0F0" />
 
         <RelativeLayout
@@ -150,6 +153,8 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:background="#F1F0F0" />
 
         <RelativeLayout
@@ -175,11 +180,6 @@
                 android:gravity="center"
                 android:textSize="16sp" />
         </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="#F1F0F0" />
     </LinearLayout>
 
 

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

@@ -86,12 +86,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/login_paw" />
 
-    <ImageView
+    <CheckBox
         android:id="@+id/iv_login_check"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
-        android:background="@drawable/select_check"
+        android:buttonTint="@color/white"
         app:layout_constraintLeft_toLeftOf="@id/et_login_paw"
         app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
 
@@ -132,9 +132,11 @@
         style="@style/login_style"
         android:layout_width="300dp"
         android:layout_height="50dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginBottom="261dp"
         android:gravity="center"
         android:text="登录"
-        android:layout_marginTop="30dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/et_login_paw"
         app:layout_constraintStart_toStartOf="@+id/et_login_paw"
         app:layout_constraintTop_toBottomOf="@+id/textView" />

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

@@ -5,25 +5,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FF444444">
-
-    <com.otaliastudios.cameraview.CameraView
-        android:id="@+id/camera"
+    <FrameLayout
+        android:id="@+id/layer_change"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:keepScreenOn="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent">
+        <com.otaliastudios.cameraview.CameraView
+            android:id="@+id/camera"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:keepScreenOn="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.tencent.tencentmap.mapsdk.maps.TextureMapView
+            android:id="@+id/iv_map"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
+            app:layout_constraintHeight_default="percent"
+            app:layout_constraintHeight_percent="0.4"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_default="percent"
+            app:layout_constraintWidth_percent="0.4" />
+    </FrameLayout>
 
-    <com.tencent.tencentmap.mapsdk.maps.TextureMapView
-        android:id="@+id/iv_map"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintHeight_default="percent"
-        app:layout_constraintHeight_percent="0.4"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="percent"
-        app:layout_constraintWidth_percent="0.4" />
 
     <Button
         android:id="@+id/btn_switch"

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

@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_stay_type"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="80dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -63,7 +63,7 @@
             android:id="@+id/tv_stay_result"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="20dp"
+            android:layout_margin="15dp"
             android:text="筛选结果"
             android:textSize="25sp"
             android:textStyle="bold" />

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

@@ -47,10 +47,19 @@
             android:layout_height="40dp"
             android:layout_margin="5dp"
             android:layout_weight="1"
-            android:background="#fff" />
+            android:background="#fff" >
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_baseline_search"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"/>
+        </LinearLayout>
+
+
 
         <Button
-            android:layout_width="wrap_content"
+            android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
             android:background="#FF5722"

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

@@ -23,7 +23,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="140dp"
+        android:layout_height="145dp"
         android:background="@mipmap/bg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -58,7 +58,7 @@
             android:layout_height="30dp"
             android:layout_marginRight="15dp"
             android:layout_marginTop="10dp"
-            android:background="@drawable/icon_event_prefecture"
+            android:background="@drawable/shares"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -67,7 +67,7 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_marginTop="15dp"
-            android:background="@drawable/icon_capacity_evaluation"
+            android:background="@drawable/sign"
             app:layout_constraintBottom_toBottomOf="@+id/image_heard"
             app:layout_constraintEnd_toEndOf="@+id/image_share"
             app:layout_constraintTop_toBottomOf="@+id/image_share" />
@@ -127,9 +127,9 @@
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginLeft="35dp"
-        android:layout_marginTop="60dp"
-        android:layout_marginRight="35dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginRight="25dp"
         android:layout_marginBottom="20dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -141,7 +141,7 @@
             android:id="@+id/rl_grade"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginTop="18dp"
+            android:layout_marginTop="10dp"
             android:gravity="center_vertical"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackground">
@@ -150,6 +150,7 @@
                 style="@style/main_text_style"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+
                 android:text="我的等级" />
 
             <TextView

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

@@ -47,9 +47,10 @@
                 android:textColor="@color/black"
                 android:textSize="15sp" />
 
-            <EditText
+            <TextView
                 android:id="@+id/et_poi_video_name"
                 android:layout_width="200dp"
+                android:textSize="14sp"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:background="@null" />

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

@@ -35,11 +35,11 @@
         </com.tencent.tencentmap.mapsdk.maps.MapView>
         <ImageView
             android:id="@+id/iv_message"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
             android:layout_marginTop="60dp"
             android:layout_marginLeft="20dp"
-            android:background="@drawable/ic_baseline_add_alert"
+            android:background="@drawable/iv_message"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
         </ImageView>

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

@@ -192,7 +192,7 @@
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="15dp"
         android:text="银行卡"
         app:layout_constraintStart_toStartOf="@+id/relativeLayout2"
         app:layout_constraintTop_toBottomOf="@+id/relativeLayout2" />
@@ -224,9 +224,9 @@
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginRight="10dp"
         android:background="#fff"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -236,7 +236,8 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
 
             <ImageView
@@ -275,7 +276,8 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
 
             <ImageView
@@ -313,7 +315,8 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_way"
@@ -350,7 +353,8 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_way_report"
@@ -387,7 +391,8 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_charging"
@@ -424,7 +429,8 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_charge_report"
@@ -461,12 +467,13 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_other"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
                 android:layout_centerVertical="true"
                 android:layout_margin="2dp"
                 android:background="@drawable/push_qingbao" />
@@ -498,12 +505,13 @@
             android:background="#F1F0F0" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="65dp"
+            android:padding="5dp"
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/image_other_report"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
                 android:layout_centerVertical="true"
                 android:layout_margin="2dp"
                 android:background="@drawable/push_qingbao" />

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

@@ -97,7 +97,7 @@
     <style name="login_style">
         <item name="android:textSize">18sp</item>
         <item name="android:background">@drawable/login_ripple</item>
-        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/colorBlue</item>
     </style>
 <!--'注册'hint设置-->
     <style name="register_hint_style">