Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into dev_1.1.0

app/src/main/java/com/mints/street/login/LoginActivity.kt

@@ -94,6 +94,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>(), View
 
         tv_title.text = "手机号登录"
         tv_title.setTextColor(Color.WHITE)
+        tv_title.setTextSize(16F)
         iv_left_icon.setImageResource(R.mipmap.ic_arrow_back_white)
         iv_left_icon.setPadding(
             AppUtils.dp2Px(this, 15F),
@@ -101,6 +102,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>(), View
             AppUtils.dp2Px(this, 15F),
             AppUtils.dp2Px(this, 15F)
         )
+        iv_left_icon.setMaxWidth(AppUtils.dp2Px(this, 10F))
+        iv_left_icon.setMaxHeight(AppUtils.dp2Px(this, 17F))
+
         header_line.visibility = View.GONE
         iv_left_icon.visibility = View.VISIBLE
 

app/src/main/java/com/mints/street/main/my/MyFragment.kt

@@ -118,9 +118,11 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
             if (userManager.getVipFlag()) {
                 tv_tips.text = "恭喜您，成为全球会员啦~"
                 bt_try.visibility = View.INVISIBLE
+                rty_vip_bg.setBackgroundResource(R.mipmap.iv_rty_vip_bg)
             } else {
                 tv_tips.text = "恭喜你被全球会员卡砸中~"
                 bt_try.visibility = View.VISIBLE
+                rty_vip_bg.setBackgroundResource(R.mipmap.iv_rty_isvip_bg)
             }
         } else {
             // 未登录

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

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
+    <solid android:color="@android:color/transparent" />
     <corners android:radius="8dp" />
     <stroke android:color="#99FF9800" android:width="1dp"/>
 </shape>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#66EDA412"/>
+    <solid android:color="#FDFAF3"/>
     <corners android:radius="8dp"/>
-    <stroke android:color="#99FF9800" android:width="1dp"/>
+    <stroke android:color="#EFCF82" android:width="1dp"/>
 </shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:endColor="#FFA575"
+        android:startColor="#FF6222" />
+    <corners android:radius="30dp" />
+
+</shape>
\ No newline at end of file

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

@@ -5,8 +5,8 @@
     <corners
         android:topLeftRadius="10dp"
         android:topRightRadius="10dp"
-        android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="0dp" />
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp" />
     <!-- 填充的颜色 -->
     <solid android:color="@color/black" />
 </shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#4DFFFFFF" />
+    <solid android:color="#00FFFFFF" />
     <corners android:radius="30dip" />
+    <stroke
+        android:width="1dp"
+        android:color="#4DFFFFFF" />
 </shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#4DFFFFFF" />
+    <corners android:radius="30dip" />
+</shape>
\ No newline at end of file

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

@@ -4,7 +4,7 @@
     <gradient
         android:startColor="#3A98F7"
         android:endColor="#76BAFF"
-        android:angle="90"/>
+        android:angle="180"/>
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
     <corners android:radius="30dip" />

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

@@ -32,11 +32,14 @@
 
         <ImageView
             android:id="@+id/image_location_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
             android:layout_marginTop="15dp"
             android:layout_marginBottom="220dp"
+            android:background="@drawable/shape_location_bg"
             android:src="@mipmap/location_icon"
+            android:padding="10dp"
+            android:layout_marginRight="3dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
@@ -57,7 +60,6 @@
             android:layout_height="40dp"
             android:layout_marginTop="10dp"
             android:padding="3dp"
-
             android:src="@mipmap/icon_hotview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
@@ -71,15 +73,13 @@
             android:background="@drawable/shape_gold_card"
             android:orientation="vertical"
             app:layout_constraintBottom_toTopOf="@id/image_location_icon"
-            app:layout_constraintEnd_toEndOf="parent"
-
-            >
+            app:layout_constraintEnd_toEndOf="parent">
 
             <ImageView
                 android:id="@+id/image_in"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:padding="10dp"
+                android:padding="11dp"
                 android:src="@mipmap/scale_add_icon" />
 
             <View
@@ -94,7 +94,7 @@
                 android:id="@+id/image_out"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:padding="10dp"
+                android:padding="11dp"
                 android:src="@mipmap/scale_shrink_icon" />
 
 

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

@@ -25,21 +25,21 @@
             android:layout_marginLeft="30dp"
             android:layout_marginTop="180dp"
             android:layout_marginRight="30dp"
-            android:background="@drawable/shape_login_bg"
+            android:background="@drawable/shape_login_phone_bg"
             android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginStart="10dp"
+                android:layout_marginStart="14dp"
                 android:src="@mipmap/iv_phone" />
 
             <com.mints.street.widget.ClearEditText
                 android:id="@+id/et_phone"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:layout_marginStart="10dp"
+                android:layout_marginStart="19dp"
                 android:background="@null"
                 android:gravity="center_vertical"
                 android:hint="@string/str_input_phone"
@@ -62,11 +62,12 @@
             android:background="@drawable/shape_login_bg"
             android:orientation="horizontal">
 
-            <TextView
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:text="@string/str_sms_code_1" />
+                android:layout_gravity="center"
+                android:layout_marginStart="14dp"
+                android:src="@mipmap/iv_code" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -127,6 +128,7 @@
             android:layout_gravity="bottom"
             android:layout_marginLeft="30dp"
             android:layout_marginTop="20dp"
+            android:textSize="11sp"
             android:layout_marginRight="30dp"
             android:paddingBottom="10dp"
             android:text="@string/str_login_tint" />

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

@@ -221,6 +221,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
+            android:layout_marginBottom="10dp"
             android:gravity="bottom|center_horizontal"
             android:orientation="horizontal">
 

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

@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:elevation="5dp"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="4dp"
             android:text="3D高清街景会员吗？"
             android:textColor="#8E5832"
             android:textSize="26sp"
@@ -64,7 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="你有可能错过以下权益"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="4dp"
             android:textColor="#C19161"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.501"

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

@@ -66,8 +66,9 @@
                 android:orientation="vertical">
 
                 <RelativeLayout
+                    android:id="@+id/rty_vip_bg"
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
+                    android:layout_height="57dp"
                     android:background="@drawable/shape_gold"
                     android:orientation="horizontal"
                     android:paddingStart="10pt">
@@ -90,7 +91,7 @@
                         android:layout_toRightOf="@id/iv_flag"
                         android:gravity="center"
                         android:text="恭喜你被全球会员卡砸中~"
-                        android:textColor="@color/white" />
+                        android:textColor="#F9F9F9" />
 
                     <Button
                         android:id="@+id/bt_try"

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

@@ -10,8 +10,8 @@
 
     <FrameLayout
         android:id="@+id/bg"
-        android:layout_width="80dp"
-        android:layout_height="130dp">
+        android:layout_width="106dp"
+        android:layout_height="125dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -23,23 +23,25 @@
             <TextView
                 android:id="@+id/tv_days"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="24dp"
                 android:textColor="@color/black"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:textSize="17sp"/>
 
             <TextView
                 android:id="@+id/tv_price"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="35dp"
                 android:textColor="#FF5722"
-                android:textSize="28dp"
+                android:textSize="30sp"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/tv_oldprice"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="17dp"
                 android:textColor="#25000000"
+                android:layout_marginTop="3dp"
                 android:textSize="10dp" />
         </LinearLayout>
         <ImageView

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

@@ -5,48 +5,51 @@
     android:background="@drawable/shape_upgrade_bg">
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="296dp"
+        android:layout_height="308dp"
         android:background="@mipmap/ic_bg_upvip"
         android:gravity="bottom"
         android:orientation="vertical">
 
         <TextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="25dp"
             android:layout_gravity="center"
-            android:layout_marginTop="30dp"
+            android:gravity="center"
+            android:textStyle="bold"
+            android:layout_marginLeft="11dp"
             android:text="想要继续无限缩放又不模糊？"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
+            android:textColor="#FE550C"
+            android:textSize="16sp" />
 
         <TextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="21dp"
             android:layout_gravity="center"
-            android:layout_marginTop="30dp"
-            android:text="升级全球会员，连地面小车也能看清"
+            android:gravity="center"
+            android:layout_marginTop="21dp"
+            android:text="升级全球会员，连地面小车也能看清!"
             android:textColor="#B3000000"
-            android:textSize="12sp" />
+            android:textSize="13sp" />
 
         <Button
             android:id="@+id/bt_upgrade"
             android:layout_width="200dp"
             android:layout_height="50dp"
             android:layout_gravity="center"
-            android:layout_marginTop="30dp"
-            android:background="@mipmap/ic_btn_upvip_bg"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/shape_btn_upvip_bg"
             android:text="继续升级"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="20dp"
             android:textColor="@color/white"
             android:textSize="16sp" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/iv_close"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_margin="10dp"
+        android:layout_width="12.5dp"
+        android:layout_height="12.5dp"
+        android:layout_margin="13dp"
         android:layout_gravity="end|top"
         android:src="@mipmap/icon_upgrade_close" />
 </FrameLayout>
\ No newline at end of file