提交界面代码

app/build.gradle

@@ -150,6 +150,8 @@ dependencies {
     api project(':shareSdkLib')
     // switchbutton
     implementation 'com.github.iielse:switchbutton:1.0.4'
+    // BottomDialog
+    implementation 'com.google.android.material:material:1.0.0'
 
 
     // 三方接入

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

 package com.mints.street.login
 
 import android.os.Bundle
+import android.view.View
 import com.fry.base.base.BaseActivity
 import com.mints.street.BR
 import com.mints.street.R
 import com.mints.street.databinding.ActivityLoginBinding
+import kotlinx.android.synthetic.main.include_header.*
 
 /**
  * Created by 冯瑞雨 on 2021/7/2.
  */
-class LoginActivity:BaseActivity<ActivityLoginBinding,LoginViewModel>() {
+class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>(), View.OnClickListener {
     override fun initContentView(savedInstanceState: Bundle?) = R.layout.activity_login
 
     override fun initVariableId() = BR.viewModel
@@ -17,9 +19,23 @@ class LoginActivity:BaseActivity<ActivityLoginBinding,LoginViewModel>() {
 
     override fun initData() {
         super.initData()
+        initView()
+    }
 
+    private fun initView() {
         binding.button.setOnClickListener {
             viewModel.login()
         }
+        iv_left_icon.setImageResource(R.mipmap.iv_return_white)
+//        iv_left_icon.visibility = View.VISIBLE
+        iv_left_icon.setOnClickListener(this)
+    }
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.iv_left_icon -> {
+                finish()
+            }
+        }
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.fry.base.base.BaseActivity
 import com.mints.street.BR
 import com.mints.street.R
 import kotlinx.android.synthetic.main.activity_aboutus.*
-import kotlinx.android.synthetic.main.header_layout.*
+import kotlinx.android.synthetic.main.include_header.*
 
 class AboutusActivity :BaseActivity<ActivityAboutusBinding, AboutusViewModel>(), View.OnClickListener {
 
@@ -23,6 +23,7 @@ class AboutusActivity :BaseActivity<ActivityAboutusBinding, AboutusViewModel>(),
         tv_title.text="关于我们"
         tv_title.setTextColor(Color.BLACK)
         iv_left_icon.setImageResource(R.mipmap.iv_return)
+        iv_left_icon.visibility=View.VISIBLE
         tv_user.setOnClickListener(this)
         tv_privacy.setOnClickListener(this)
     }

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

@@ -2,11 +2,12 @@ package com.mints.street.main.my
 
 import android.graphics.Color
 import android.os.Bundle
+import android.view.View
 import com.fry.base.base.BaseActivity
 import com.mints.street.BR
 import com.mints.street.R
 import com.mints.street.databinding.ActivityMoresettingsBinding
-import kotlinx.android.synthetic.main.header_layout.*
+import kotlinx.android.synthetic.main.include_header.*
 
 class MoresettingsActivity: BaseActivity<ActivityMoresettingsBinding, MoresettingsViewModel>() {
 
@@ -21,6 +22,7 @@ class MoresettingsActivity: BaseActivity<ActivityMoresettingsBinding, Moresettin
         tv_title.text="更多设置"
         tv_title.setTextColor(Color.BLACK)
         iv_left_icon.setImageResource(R.mipmap.iv_return)
+        iv_left_icon.visibility= View.VISIBLE
     }
 
 

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

 package com.mints.street.main.my
 
 import android.graphics.Color
-import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.util.Log
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupWindow
+import android.widget.CheckBox
+import android.widget.ImageView
 import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.widget.LinearLayoutCompat
 import com.fry.base.base.BaseFragment
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.mints.street.BR
 import com.mints.street.R
 import com.mints.street.databinding.FragmentMyBinding
+import com.mints.street.login.LoginActivity
 import kotlinx.android.synthetic.main.fragment_my.*
-import kotlinx.android.synthetic.main.header_layout.*
 
 
 /**
@@ -24,8 +24,14 @@ import kotlinx.android.synthetic.main.header_layout.*
  * 个人中心页面
  */
 class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), View.OnClickListener {
-    private var popupWindow: PopupWindow? = null
-    private var contentView: View? = null
+    //弹窗
+    private var mBottomSheetDialog: BottomSheetDialog? = null
+    private var iv_weixin: ImageView? = null
+    private var ly_phone: LinearLayoutCompat? = null
+    private var cb_checked: CheckBox? = null
+
+    //checkbox是否选中
+    private var ischecked = false
     override fun initContentView(inflater: LayoutInflater?,
                                  container: ViewGroup?,
                                  savedInstanceState: Bundle?) = R.layout.fragment_my
@@ -33,26 +39,34 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), View.OnClickL
     override fun initVariableId() = BR.viewModel
     override fun initData() {
         super.initData()
+        initView()
+
+    }
 
+    private fun initView() {
+
+        //设置登录点击事件
         binding.llMyLogin.setOnClickListener {
-//            showPopwindow();
-            startActivity(PermissionsActivity::class.java)
+            //创建弹窗
+            mBottomSheetDialog = BottomSheetDialog(context!!)
+            val view1: View = layoutInflater.inflate(R.layout.layout_popupwindow, null)
+            mBottomSheetDialog!!.setContentView(view1)
+            mBottomSheetDialog!!.window!!.findViewById<View>(R.id.design_bottom_sheet).setBackgroundColor(Color.TRANSPARENT)
+            mBottomSheetDialog!!.show()
+            iv_weixin = view1.findViewById(R.id.iv_weixin)
+            ly_phone = view1.findViewById(R.id.ly_phone)
+            cb_checked = view1.findViewById(R.id.cb_checked)
+            iv_weixin?.setOnClickListener(this)
+            ly_phone?.setOnClickListener(this)
         }
+
+        //设置立即领取点击事件
         binding.btTry.setOnClickListener {
-            Toast.makeText(context,"点击事件响应了",Toast.LENGTH_SHORT).show()
+            startActivity(PermissionsActivity::class.java)
         }
+
         ly_aboutus.setOnClickListener(this)
         ly_moresettings.setOnClickListener(this)
-        requireActivity().onBackPressedDispatcher.addCallback(
-                this,
-                object : OnBackPressedCallback(true) {
-                    override fun handleOnBackPressed() {
-                        //监听到后要执行的逻辑
-                        if (popupWindow != null && popupWindow!!.isShowing()) {
-                            popupWindow?.dismiss();
-                        }
-                    }
-                })
     }
 
 
@@ -64,37 +78,26 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), View.OnClickL
             R.id.ly_moresettings -> {
                 startActivity(MoresettingsActivity::class.java)
             }
-        }
-    }
-
-    private fun showPopwindow() {
-        //加载弹出框的布局
-        contentView = LayoutInflater.from(context).inflate(
-                R.layout.layout_popupwindow, null);
-        // 设置按钮的点击事件
-
-        popupWindow = PopupWindow(contentView,
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT)
-        popupWindow!!.isFocusable = true // 取得焦点
-
-        //注意  要是点击外部空白处弹框消息  那么必须给弹框设置一个背景色  不然是不起作用的
-        //注意  要是点击外部空白处弹框消息  那么必须给弹框设置一个背景色  不然是不起作用的
-        popupWindow!!.setBackgroundDrawable(BitmapDrawable())
-        //点击外部消失
-        //点击外部消失
-        popupWindow!!.isOutsideTouchable = true
-        //设置可以点击
-        //设置可以点击
-        popupWindow!!.isTouchable = true
-        //进入退出的动画，指定刚才定义的style
-        //进入退出的动画，指定刚才定义的style
-        popupWindow!!.animationStyle = R.style.ipopwindow_anim_style
+            R.id.ll_my_login -> {
+                Log.e("aaa", "aaaaaa")
+            }
+            R.id.iv_weixin -> {
+                if (cb_checked!!.isChecked) {
+                    Toast.makeText(context, "未完成微信登录对接", Toast.LENGTH_SHORT).show()
+                }else {
+                    Toast.makeText(context, "请先同意用户协议与隐私政策", Toast.LENGTH_SHORT).show()
+                }
+            }
+            R.id.ly_phone -> {
+                if (cb_checked!!.isChecked) {
+                    startActivity(LoginActivity::class.java)
+                    mBottomSheetDialog!!.dismiss()
+                } else {
+                    Toast.makeText(context, "请先同意用户协议与隐私政策", Toast.LENGTH_SHORT).show()
+                }
+            }
 
-    }
-    fun openPopWindow(v: View?) {
-        //从底部显示
-        popupWindow!!.showAtLocation(contentView, Gravity.BOTTOM, 0, 0)
+        }
     }
 
 }

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

@@ -2,10 +2,12 @@ package com.mints.street.main.my
 
 import android.os.Bundle
 import com.fry.base.base.BaseActivity
+import com.github.iielse.switchbutton.SwitchView
 import com.mints.street.BR
 import com.mints.street.R
 import com.mints.street.databinding.ActivityMoresettingsBinding
 import com.mints.street.databinding.ActivityPermissionsBinding
+import kotlinx.android.synthetic.main.activity_permissions.*
 
 class PermissionsActivity  : BaseActivity<ActivityPermissionsBinding, PermissionsViewModel>() {
     override fun initVariableId() = BR.viewModel
@@ -16,6 +18,14 @@ class PermissionsActivity  : BaseActivity<ActivityPermissionsBinding, Permission
     }
 
     private fun initView() {
+        sv_positioning.setOnStateChangedListener(object : SwitchView.OnStateChangedListener {
+            override fun toggleToOn(view: SwitchView?) {
+                sv_positioning?.isOpened = true
+            }
 
+            override fun toggleToOff(view: SwitchView?) {
+                sv_positioning?.isOpened = false
+            }
+        })
     }
 }
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp" />
+    <solid android:color="#E6FFFFFF" />
+</shape>
\ No newline at end of file

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

@@ -4,7 +4,7 @@
     <!-- 边框的颜色和粗细 -->
     <stroke
         android:width="1dp"
-        android:color="@color/blue"
+        android:color="#4CAF50"
         />
     <solid android:color="#ffffffff" />
     <corners android:radius="10dp" />

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" />
+    <corners android:radius="30dip" />
+</shape>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <solid android:color="@color/color_FF9837" />
+    <solid android:color="@color/color_A7BCFE" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
     <corners android:radius="30dip" />

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

@@ -13,7 +13,7 @@
         android:layout_height="match_parent">
         <include
             android:id="@+id/header"
-            layout="@layout/header_layout" />
+            layout="@layout/include_header" />
         <TextView
             android:layout_below="@+id/header"
             android:paddingTop="30dp"

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+
     <data>
+
         <variable
             name="viewModel"
             type="com.mints.street.login.LoginViewModel" />
     </data>
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#CC000000"
         android:orientation="vertical">
 
-        <include layout="@layout/include_header" />
+        <include layout="@layout/include_header"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="60dp"
+            android:text="在国内也能用的"
+            android:textSize="24dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="全球街景地图"
+            android:textSize="32dp" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -18,18 +37,21 @@
             android:layout_marginLeft="30dp"
             android:layout_marginTop="30dp"
             android:layout_marginRight="30dp"
+            android:background="@drawable/shape_login_bg"
             android:orientation="horizontal">
 
-            <TextView
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/str_phone_num_1" />
+                android:layout_gravity="center"
+                android:layout_marginStart="10dp"
+                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="20dp"
+                android:layout_marginStart="10dp"
                 android:background="@null"
                 android:gravity="center_vertical"
                 android:hint="@string/str_input_phone"
@@ -41,10 +63,6 @@
                 android:textSize="14sp" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <View
-            style="@style/line_3"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -52,11 +70,13 @@
             android:layout_marginStart="30dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="30dp"
+            android:background="@drawable/shape_login_bg"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
                 android:text="@string/str_sms_code_1" />
 
             <RelativeLayout
@@ -86,22 +106,18 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/str_send_sms"
-                    android:textColor="@color/color_FF9837"
+                    android:textColor="@color/white"
                     android:textSize="14sp" />
 
             </RelativeLayout>
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <View
-            style="@style/line_3"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp" />
 
         <Button
             android:id="@+id/button"
             android:layout_width="match_parent"
-            android:layout_height="46dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="40dp"
             android:layout_marginTop="30dp"
             android:layout_marginEnd="40dp"
@@ -110,7 +126,12 @@
             android:textColor="@color/white"
             android:textSize="16sp" />
 
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
         <TextView
+            android:paddingBottom="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="30dp"

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

@@ -11,14 +11,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="19dp"
-        android:layout_marginEnd="15dp"
         android:background="@drawable/shape_gold_card"
         android:elevation="5dp"
         android:orientation="vertical">
-
-        <include layout="@layout/header_layout" />
+        <include layout="@layout/include_header" />
 
         <LinearLayout
             android:id="@+id/ly_aboutus"

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

@@ -9,7 +9,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="716dp"
         android:orientation="vertical">
 
         <TextView
@@ -19,7 +19,7 @@
             android:layout_marginTop="25dp"
             android:text="世界街景3D地图"
             android:textColor="@color/black"
-            android:textSize="25dp"/>
+            android:textSize="25dp" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -31,7 +31,6 @@
             android:textColor="#CD000000" />
 
         <RelativeLayout
-
             android:layout_width="match_parent"
             android:layout_height="110dp"
             android:layout_margin="10dp"
@@ -43,28 +42,32 @@
                 android:layout_height="80dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:background="@color/black" />
+                android:src="@mipmap/ic_my"/>
 
             <TextView
                 android:id="@+id/tv1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/iv1"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@id/iv1"
                 android:text="提供精准定位及导航服务"
                 android:textColor="@color/black"
-                android:textSize="18sp"/>
+                android:textSize="12sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/iv1"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@+id/iv1"
-                android:text="基于您当前位置...." />
+                android:text="基于您当前位置...."
+                android:textColor="#A9000000" />
 
             <com.github.iielse.switchbutton.SwitchView
+                android:id="@+id/sv_positioning"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:layout_alignParentEnd="true"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
@@ -83,28 +86,31 @@
                 android:layout_height="80dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:background="@color/black" />
+                android:src="@mipmap/ic_my"/>
 
             <TextView
                 android:id="@+id/tv2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/iv2"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@id/iv2"
                 android:text="提供精准定位及导航服务"
                 android:textColor="@color/black"
-                android:textSize="18sp"/>
+                android:textSize="12sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/iv2"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@+id/iv2"
-                android:text="基于您当前位置...." />
+                android:text="基于您当前位置...."
+                android:textColor="#A9000000" />
 
             <com.github.iielse.switchbutton.SwitchView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:layout_alignParentEnd="true"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
@@ -123,28 +129,31 @@
                 android:layout_height="80dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:background="@color/black" />
+                android:src="@mipmap/ic_my"/>
 
             <TextView
                 android:id="@+id/tv3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/iv3"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@id/iv3"
                 android:text="提供精准定位及导航服务"
                 android:textColor="@color/black"
-                android:textSize="18sp"/>
+                android:textSize="12sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/iv3"
+                android:layout_marginStart="20dp"
                 android:layout_toRightOf="@+id/iv3"
-                android:text="基于您当前位置...." />
+                android:text="基于您当前位置...."
+                android:textColor="#A9000000" />
 
             <com.github.iielse.switchbutton.SwitchView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:layout_alignParentEnd="true"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
@@ -178,35 +187,38 @@
                 android:text="同意并开始授权"
                 android:textColor="@color/white" />
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            />
+            android:layout_weight="1" />
 
         <LinearLayout
-            android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:text="链接网络后可查看并同意完整的"
-                android:textColor="@color/black" />
+                android:textColor="@color/black"
+                android:textSize="8sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="《隐私协议》"
-                android:textColor="@color/black" />
+                android:textColor="@color/black"
+                android:textSize="8sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="《用户协议》"
-                android:textColor="@color/black" />
+                android:textColor="@color/black"
+                android:textSize="8sp" />
         </LinearLayout>
 
     </LinearLayout>

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="viewModel"
             type="com.mints.street.main.my.MyViewModel" />
@@ -21,28 +22,28 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-            android:layout_marginBottom="15dp">
+            android:layout_marginBottom="15dp"
+            android:orientation="horizontal">
 
             <com.mints.street.widget.CircleImageView
                 android:id="@+id/item_title_avatar"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:src="@mipmap/ic_avatar_ph"/>
+                android:src="@mipmap/ic_avatar_ph" />
 
             <TextView
                 android:id="@+id/item_title_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:layout_marginStart="20dp"
                 android:ellipsize="end"
                 android:maxLength="10"
-                android:layout_gravity="center"
                 android:maxLines="1"
                 android:text="未登录"
                 android:textColor="@color/black"
                 android:textSize="20sp"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
         </LinearLayout>
 
         <LinearLayout
@@ -55,12 +56,11 @@
             android:orientation="vertical">
 
             <RelativeLayout
-                android:background="@drawable/shape_gold"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/shape_gold"
                 android:orientation="horizontal"
-                android:paddingStart="10pt"
-                android:paddingEnd="10dp">
+                android:paddingStart="10pt">
 
                 <ImageView
                     android:id="@+id/iv_flag"
@@ -68,7 +68,7 @@
                     android:layout_height="30dp"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    android:background="@color/blue" />
+                    android:src="@mipmap/iv_crown"/>
 
                 <TextView
                     android:id="@+id/tv_tips"
@@ -82,13 +82,13 @@
                 <Button
                     android:id="@+id/bt_try"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="30dp"
                     android:layout_alignParentEnd="true"
-                    android:layout_gravity="center_vertical"
+                    android:layout_centerVertical="true"
                     android:layout_marginEnd="8dp"
-                    android:background="@drawable/btn_friends_selectored"
+                    android:background="@drawable/shape_btn_friends_unenabled"
                     android:text="立即领取"
-                    android:textColor="@color/black"
+                    android:textColor="@color/white"
                     android:textSize="10sp" />
             </RelativeLayout>
 
@@ -100,10 +100,9 @@
 
                 <ImageView
                     android:id="@+id/imageView5"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="28dp"
-                    android:background="@color/blue"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/imageView4"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -120,11 +119,11 @@
 
                 <ImageView
                     android:id="@+id/imageView4"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginStart="40dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintStart_toEndOf="@+id/imageView5"
                     app:layout_constraintTop_toBottomOf="@+id/imageView16"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -141,10 +140,10 @@
 
                 <ImageView
                     android:id="@+id/imageView6"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginStart="40dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintStart_toEndOf="@+id/imageView4"
                     app:layout_constraintTop_toTopOf="@+id/imageView4"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -161,10 +160,10 @@
 
                 <ImageView
                     android:id="@+id/imageView7"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginStart="40dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintStart_toEndOf="@+id/imageView6"
                     app:layout_constraintTop_toTopOf="@+id/imageView6"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -181,11 +180,10 @@
 
                 <ImageView
                     android:id="@+id/imageView12"
-
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintEnd_toEndOf="@+id/imageView5"
                     app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toStartOf="@+id/imageView5"
@@ -206,10 +204,10 @@
                 <ImageView
                     android:id="@+id/imageView13"
 
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintEnd_toEndOf="@+id/imageView4"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="@+id/imageView4"
@@ -219,10 +217,10 @@
                 <ImageView
                     android:id="@+id/imageView14"
 
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintEnd_toEndOf="@+id/imageView6"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="@+id/imageView6"
@@ -253,11 +251,10 @@
 
                 <ImageView
                     android:id="@+id/imageView15"
-
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/blue"
+                    android:src="@mipmap/ic_avatar_ph"
                     app:layout_constraintEnd_toEndOf="@+id/imageView7"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="@+id/imageView7"
@@ -303,7 +300,8 @@
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:text="享受8大特权"
-                    android:textSize="10sp"
+                    android:textSize="20sp"
+                    android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="@+id/imageView18"
                     app:layout_constraintEnd_toStartOf="@+id/imageView18"
                     app:layout_constraintStart_toEndOf="@+id/imageView16"

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

-<?xml version="1.0" encoding="utf-8"?>
-<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:layout_height="70dp"
-    android:paddingTop="20dp">
-
-    <ImageView
-        android:id="@+id/iv_left_icon"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:padding="10dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_left_subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:lines="1"
-        android:maxLength="12"
-        android:padding="8dp"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:lines="1"
-        android:maxLength="12"
-        android:textColor="@color/color_121B32"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/iv_right_icon2"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="10dp"
-        android:scaleType="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/iv_right_icon"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/iv_right_icon"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="10dp"
-        android:scaleType="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_right_subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:textColor="@color/color_121B32"
-        android:textSize="16sp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        style="@style/view_line_E6E6E6"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/iv_right_icon" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#553b3a3a">
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_dialog_bg">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/ly_phone"
+        android:layout_alignParentRight="true"
+        android:paddingTop="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="使用手机号登录"
+            android:textColor="#E6000000" />
+
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@mipmap/bg_right" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_below="@+id/ly_phone"
+        android:id="@+id/ly_constrain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:padding="20dp">
+
+        <ImageView
+            android:id="@+id/iv_weixin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="20pt"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@mipmap/ic_my"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="微信登录"
+            android:textColor="@color/black"
+            app:layout_constraintEnd_toEndOf="@+id/iv_weixin"
+            app:layout_constraintStart_toStartOf="@+id/iv_weixin"
+            app:layout_constraintTop_toBottomOf="@+id/iv_weixin" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@android:color/white"
-        android:orientation="vertical">
+        android:layout_below="@+id/ly_constrain"
+        android:layout_centerHorizontal="true"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <CheckBox
+            android:id="@+id/cb_checked"
+            style="@style/MyCheckBox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
         <TextView
-            android:id="@+id/open_from_camera"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="相机"
-            android:textColor="#333"
-            android:textSize="15sp" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="同意"
+            android:textColor="@color/black" />
 
         <TextView
-            android:id="@+id/open_album"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginTop="1dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="打开图库"
-            android:textColor="#333"
-            android:textSize="15sp" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="《隐私政策》"
+            android:textColor="@color/black" />
 
         <TextView
-            android:id="@+id/cancel"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginTop="1dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="取消"
-            android:textColor="#333"
-            android:textSize="15sp" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="与"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="《用户协议》"
+            android:textColor="@color/black" />
     </LinearLayout>
+
+
 </RelativeLayout>
\ No newline at end of file

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

@@ -145,6 +145,9 @@
         <item name="android:windowExitAnimation">@anim/pophidden</item>
         <!-- 指定消失的动画xml -->
     </style>
-
+    <style name="MyCheckBox" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">@color/black</item>
+        <item name="colorControlActivated">@color/black</item>
+    </style>
 
 </resources>
\ No newline at end of file

library_base/version.properties

-#Fri Jul 09 19:56:02 CST 2021
-VERSION_BUILD=2724
+#Sat Jul 10 16:33:56 CST 2021
+VERSION_BUILD=2754