...

.idea/misc.xml

@@ -84,10 +84,13 @@
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_collection_detail.xml" value="0.3185121846943138" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_details_first.xml" value="0.33133817870884996" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_edit_password.xml" value="0.3828125" />
+        <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_forget_password.xml" value="0.30055579307396324" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_give_away.xml" value="0.33133817870884996" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_input_return.xml" value="0.33133817870884996" />
+        <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_login.xml" value="0.3317657118426678" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_main.xml" value="0.327445652173913" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_refund_detail.xml" value="0.33133817870884996" />
+        <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_registration.xml" value="0.30055579307396324" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_resale.xml" value="0.33133817870884996" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_resale_success.xml" value="0.33133817870884996" />
         <entry key="..\:/AndroidWorkPlace/XiangLian/app/src/main/res/layout/activity_splash.xml" value="0.33133817870884996" />

app/src/main/java/com/hdl/xl/ui/activitys/ActivityForgetPassword.kt

@@ -16,11 +16,6 @@ import com.hdl.xl.R
 import com.hdl.xl.databinding.ActivityForgetPasswordBinding
 import com.hdl.xl.service.HttpApi_xie
 
-/**
- * @Description:忘记密码
- * @Author: xieshenghua
- * @Date: 2020/6/28 14:54
- */
 class ActivityForgetPassword : BaseActivity(), View.OnClickListener {
     private val TAG = ActivityForgetPassword::class.java.simpleName
     private var mBinding: ActivityForgetPasswordBinding? = null
@@ -36,7 +31,6 @@ class ActivityForgetPassword : BaseActivity(), View.OnClickListener {
         mBinding = DataBindingUtil.setContentView(mActivity, R.layout.activity_forget_password)
         mBinding?.run {
             clickListener = this@ActivityForgetPassword
-            includeTitle.textTitleTitle.text = "忘记密码"
             includeTitle.layoutTitle.setPadding(
                 0,
                 StatusBarCommon.findStatusBarHeight(mActivity),
@@ -49,8 +43,8 @@ class ActivityForgetPassword : BaseActivity(), View.OnClickListener {
     override fun onClick(v: View?) {
         phone = mBinding?.inputPhone?.text.toString()
         code = mBinding?.inputCode?.text.toString()
-        newPassword = mBinding?.password?.text.toString()
-        newPassword2 = mBinding?.password2?.text.toString()
+        newPassword = mBinding?.inputPwd?.text.toString()
+        newPassword2 = mBinding?.inputPwdAgain?.text.toString()
 
         when (v?.id) {
             R.id.go_back -> {

app/src/main/java/com/hdl/xl/ui/activitys/ActivityRegistration.kt

@@ -1,6 +1,9 @@
 package com.hdl.xl.ui.activitys
 
 import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
@@ -25,8 +28,11 @@ class ActivityRegistration : BaseActivity(), View.OnClickListener {
     var mBinding: ActivityRegistrationBinding? = null
     var phone: String? = ""
     var code: String? = ""
-    var password: String? = ""
-    var password_cf: String? = ""
+    var pwd: String? = ""
+    var pwdAgain: String? = ""
+    var secondPwd: String? = ""
+    var secondPwdAgain: String? = ""
+
     var yao_code: String? = ""
     val handler = Handler()
     var mCountNum = 60
@@ -35,22 +41,68 @@ class ActivityRegistration : BaseActivity(), View.OnClickListener {
         mBinding = DataBindingUtil.setContentView(mActivity, R.layout.activity_registration)
         mBinding?.run {
             clickListener = this@ActivityRegistration
-            includeTitle.textTitleTitle.text = "注册"
             includeTitle.layoutTitle.setPadding(
                 0,
                 StatusBarCommon.findStatusBarHeight(mActivity),
                 0,
                 0
             )
+            setGradientColor()
+        }
+    }
+
+    private fun setGradientColor() {
+        mBinding?.run {
+            val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+            val position = floatArrayOf(0f, 1.0f,2.0f)
+            val mLinearGradient = LinearGradient(
+                0f,
+                0f,
+                getCaptcha?.text?.length?.let { getCaptcha?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+            )
+            getCaptcha?.paint?.shader = mLinearGradient
+            getCaptcha?.invalidate()
+
+            val mLinearGradient1 = LinearGradient(
+                0f,
+                0f,
+                yonghuXieyi?.text?.length?.let { yonghuXieyi?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+            )
+            yonghuXieyi?.paint?.shader = mLinearGradient1
+            yonghuXieyi?.invalidate()
+
+            val mLinearGradient2 = LinearGradient(
+                0f,
+                0f,
+                yinsiXieyi?.text?.length?.let { yinsiXieyi?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+            )
+            yinsiXieyi?.paint?.shader = mLinearGradient2
+            yinsiXieyi?.invalidate()
         }
     }
 
     override fun onClick(v: View?) {
         phone = mBinding?.inputPhone?.text.toString()
         code = mBinding?.inputCode?.text.toString()
-        password = mBinding?.inputPassword?.text.toString()
-        password_cf = mBinding?.inputPasswordCf?.text.toString()
-        yao_code = mBinding?.inputYaoqing?.text.toString()
+        pwd = mBinding?.inputPwd?.text.toString()
+        pwdAgain = mBinding?.inputPwdAgain?.text.toString()
+
+        secondPwd = mBinding?.inputSecondPwd?.text.toString()
+        secondPwdAgain = mBinding?.inputSecondPwdAgain?.text.toString()
+
+        yao_code = mBinding?.inputInvitationCode?.text.toString()
         when (v?.id) {
             R.id.go_back -> {
                 finish()
@@ -67,18 +119,26 @@ class ActivityRegistration : BaseActivity(), View.OnClickListener {
                     Toast.makeText(mContext, "请输入11位手机号", Toast.LENGTH_SHORT).show()
                 } else if (code == null || code?.length == 0) {
                     Toast.makeText(mContext, "请输入短信验证码", Toast.LENGTH_SHORT).show()
-                } else if (password == null || password?.length == 0) {
+                } else if (pwd == null || pwd?.length == 0) {
                     Toast.makeText(mContext, "请输入密码", Toast.LENGTH_SHORT).show()
-                }else if (password_cf == null || password_cf?.length == 0) {
+                }else if (pwdAgain == null || pwdAgain?.length == 0) {
                     Toast.makeText(mContext, "请再次输入密码", Toast.LENGTH_SHORT).show()
                 }
-                else if (password!=password_cf) {
+                else if (pwd!=pwdAgain) {
                     Toast.makeText(mContext, "两次输入的密码不一样", Toast.LENGTH_SHORT).show()
                 }
+                else if (secondPwd.isNullOrEmpty()) {
+                    Toast.makeText(mContext, "请输入二级密码", Toast.LENGTH_SHORT).show()
+                }else if (secondPwdAgain.isNullOrEmpty()) {
+                    Toast.makeText(mContext, "请再次输入二级密码", Toast.LENGTH_SHORT).show()
+                }
+                else if (secondPwd!=secondPwdAgain) {
+                    Toast.makeText(mContext, "两次输入二级的密码不一样", Toast.LENGTH_SHORT).show()
+                }
                 else if (yao_code == null || yao_code?.length == 0) {
                     Toast.makeText(mContext, "请输入注册邀请码", Toast.LENGTH_SHORT).show()
                 }else {
-                    registered(phone?:"", password?:"", yao_code?:"",code?:"")
+                    registered(phone?:"", pwd?:"", yao_code?:"",code?:"")
                 }
             }
         }

app/src/main/java/com/hdl/xl/ui/activitys/LoginActivity.kt

@@ -2,6 +2,9 @@ package com.hdl.xl.ui.activitys
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
 import android.os.Bundle
 import android.view.View
 import androidx.databinding.DataBindingUtil
@@ -44,7 +47,27 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
         supportActionBar?.hide()
         mBinding?.clickListener = this
         SessionUtil.get().update(null,null)
+        setGradientColor()
         mBinding?.run { }
+
+    }
+
+    private fun setGradientColor() {
+        mBinding?.run {
+            val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+            val position = floatArrayOf(0f, 1.0f,2.0f)
+            val mLinearGradient = LinearGradient(
+                0f,
+                0f,
+                lijiZhuce?.text?.length?.let { lijiZhuce?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+            )
+            lijiZhuce?.paint?.shader = mLinearGradient
+            lijiZhuce?.invalidate()
+        }
     }
 
     override fun onClick(v: View) {
@@ -59,7 +82,7 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
                 }
                 mViewModel.phoneLogin(phone, password)
             }
-            R.id.goto_reg -> {//注册
+            R.id.liji_zhuce -> {//注册
                 startKtActivityOrForResult<ActivityRegistration>()
             }
             R.id.forget_password -> {//忘记密码

app/src/main/java/com/hdl/xl/ui/fragments/HomeFragment.kt

@@ -2,6 +2,9 @@ package com.hdl.xl.ui.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
 import android.graphics.Typeface
 import android.os.Bundle
 import android.os.Handler
@@ -14,21 +17,22 @@ import android.view.*
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import com.google.android.material.tabs.TabLayout
-import com.laike.basekt.BaseFragment
-import com.laike.basekt.FragmentAdapter
-import com.laike.basekt.coremodel.datemodel.client.HttpRetrofitRequest
-import com.laike.basekt.coremodel.datemodel.client.RxSchedulers
-import com.laike.basekt.utils.HawkConstant
-import com.laike.basekt.utils.StatusBarCommon
 import com.hdl.xl.R
 import com.hdl.xl.bean.BannerBean
 import com.hdl.xl.bean.CommodityBean
 import com.hdl.xl.databinding.HomeFragmentBinding
 import com.hdl.xl.service.HttpApi_xie
 import com.hdl.xl.ui.activitys.ActivityProductCategory
+import com.laike.basekt.BaseFragment
+import com.laike.basekt.FragmentAdapter
+import com.laike.basekt.coremodel.datemodel.client.HttpRetrofitRequest
+import com.laike.basekt.coremodel.datemodel.client.RxSchedulers
+import com.laike.basekt.utils.HawkConstant
+import com.laike.basekt.utils.StatusBarCommon
 import com.orhanobut.hawk.Hawk
 import com.youth.banner.listener.OnBannerListener
 
+
 /**
  * @Description:首页
  * @Author: wuxing
@@ -93,10 +97,28 @@ class HomeFragment : BaseFragment(), View.OnClickListener, OnBannerListener<Bann
 
             })
 
+            setGradientColor()
+
             searchHomeData()
         }
     }
 
+    private fun setGradientColor() {
+        val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+        val position = floatArrayOf(0f, 1.0f,2.0f)
+        val mLinearGradient = LinearGradient(
+            0f,
+            0f,
+            mBinding?.titleText?.text?.length?.let { mBinding?.titleText?.paint?.textSize?.times(it) }!!,
+            0f,
+            colors,
+            position,
+            Shader.TileMode.CLAMP
+        )
+        mBinding?.titleText?.paint?.shader = mLinearGradient
+        mBinding?.titleText?.invalidate()
+    }
+
     fun loadFragmentDetail(type:Int) {
         fragments.add(FragmentRecommend().apply {
             mFragmentRecommend=this

app/src/main/java/com/hdl/xl/ui/fragments/MineFragment.kt

@@ -67,6 +67,9 @@ class MineFragment : BaseFragment(), View.OnClickListener {
     override fun onClick(v: View?) {
         var bundle = Bundle()
         when (v?.id) {
+            R.id.set_btn->{
+                startKtActivityOrForResult<LoginActivity>()
+            }
             R.id.my_wallet_btn -> {
                 startKtActivityOrForResult<ActivityMyWallet>()
             }

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

@@ -15,127 +15,126 @@
         android:id="@+id/main_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFE6E6E6"
-        android:orientation="vertical">
+        android:background="@color/black"
 
+        android:orientation="vertical">
         <include
             android:id="@+id/include_title"
             layout="@layout/include_title_bar"
             app:clickListener="@{clickListener}" />
 
-
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:layout_marginTop="10dp"
+            android:layout_height="match_parent"
+            android:padding="30dp"
             android:orientation="vertical">
-
-            <EditText
-                android:id="@+id/input_phone"
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@null"
-                android:hint="请输入您的手机号"
-                android:inputType="number"
-                android:maxLength="11"
-                android:paddingLeft="16dp"
-                android:textSize="12sp" />
-
-            <View
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp50"
+                android:text="忘记密码"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold" />
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:background="@color/gray_AD" />
-
+                android:layout_height="wrap_content"
+                android:text="请输入您的手机号和验证码找回密码"
+                android:layout_marginTop="6dp"
+                android:textColor="@color/black_alpha20"/>
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:layout_marginTop="46dp"
+                android:orientation="vertical">
 
                 <EditText
-                    android:id="@+id/input_code"
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:hint="请输入验证码"
-                    android:paddingLeft="16dp"
-                    android:textSize="12sp" />
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="25dp"
-                    android:layout_marginRight="16dp"
-                    android:background="#FFE9E9E9" />
+                    android:id="@+id/inputPhone"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入手机号"
+                    android:inputType="phone"
+                    android:paddingLeft="30dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:layout_marginTop="14dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <EditText
+                        android:id="@+id/inputCode"
+                        android:layout_width="0dp"
+                        android:layout_height="46dp"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:hint="请输入验证码"
+                        android:inputType="textPassword"
+                        android:paddingLeft="30dp"
+                        android:textColorHint="#666666"
+                        android:textColor="@color/white"
+                        android:layout_marginRight="10dp"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/get_captcha"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="23dp"
+                        android:onClick="@{clickListener}"
+                        android:text="获取验证码" />
+
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/get_captcha"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="16dp"
-                    android:onClick="@{clickListener}"
-                    android:text="获取验证码"
-                    android:textColor="#FF507DAF" />
-            </LinearLayout>
+                <EditText
+                    android:id="@+id/input_pwd"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入新密码"
+                    android:paddingLeft="30dp"
+                    android:layout_marginTop="14dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
+                <EditText
+                    android:id="@+id/input_pwd_again"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请再次输入新密码"
+                    android:paddingLeft="30dp"
+                    android:layout_marginTop="14dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:background="@color/gray_AD" />
 
-            <EditText
-                android:id="@+id/password"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@null"
-                android:hint="请输入新密码"
-                android:paddingLeft="16dp"
-                android:textSize="12sp" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:background="@color/gray_AD" />
 
-            <EditText
-                android:id="@+id/password2"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@null"
-                android:hint="请再次输入新密码"
-                android:paddingLeft="16dp"
-                android:textSize="12sp" />
-        </LinearLayout>
 
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/gray_AD" />
+                <TextView
+                    android:id="@+id/button_registered"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp50"
+                    android:layout_marginTop="38dp"
+                    android:background="@drawable/bg_mine_withdraw_copy"
+                    android:elevation="2dp"
+                    android:gravity="center"
+                    android:onClick="@{clickListener}"
+                    android:text="确认"
+                    android:textColor="#151314"
+                    android:textSize="20sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="请设置6位及以上包含数字字母和特殊符号中至少两种组合的密码"
-            android:textSize="10dp" />
-
-        <TextView
-            android:id="@+id/button_finish"
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:layout_marginLeft="80dp"
-            android:layout_marginTop="60dp"
-            android:layout_marginRight="80dp"
-            android:background="@drawable/bg_finish_button"
-            android:gravity="center"
-            android:onClick="@{clickListener}"
-            android:text="完成"
-            android:textColor="@color/white"
-            android:textSize="18dp" />
+            </LinearLayout>
+        </LinearLayout>
 
-    </LinearLayout>
 
+    </LinearLayout>
 </layout>

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

@@ -2,7 +2,9 @@
 <layout 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">
+
     <data>
+
         <variable
             name="clickListener"
             type="android.view.View.OnClickListener" />
@@ -11,146 +13,139 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#151314"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        tools:context=".ui.login.LoginActivity">
+        android:padding="30dp">
 
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/title"
-            android:gravity="center"
-            android:textColor="#000"
-            android:textSize="18sp"
-            android:text="登录"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@android:color/black" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="53dp"
-            android:layout_height="53dp"
-            android:layout_marginTop="27dp"
-            android:src="@mipmap/logo"/>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="90dp"
+            android:text="登录"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            android:textStyle="bold" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
-            android:padding="15dp"
-            android:textColor="#333333"
-            android:text="你好，\n欢迎来到国鑫商城"
-            android:textSize="23sp" />
+            android:layout_marginTop="6dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="还没有账号，"
+                android:textColor="#F2F2F2"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/liji_zhuce"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="@{clickListener}"
+                android:text="立即注册"
+                android:textSize="12sp" />
+        </LinearLayout>
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="17dp">
+            android:layout_marginTop="@dimen/dp50"
+            android:orientation="vertical">
 
             <EditText
                 android:id="@+id/input_tel_number"
                 android:layout_width="match_parent"
                 android:layout_height="46dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/bg_login_frame"
-                android:drawableLeft="@mipmap/ic_phone"
-                android:hint="请输入账号"
-                android:text="13615393270"
+                android:background="@drawable/bg_mine_gray"
+                android:hint="请输入手机号"
                 android:inputType="phone"
-                android:textSize="16sp" />
+                android:paddingLeft="30dp"
+                android:textColorHint="#666666"
+                android:textColor="@color/white"
+                android:textSize="15sp" />
 
-            <EditText
-                android:id="@+id/input_pwd"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="46dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/bg_login_frame"
-                android:drawableLeft="@mipmap/ic_password"
-                android:drawablePadding="10dp"
-                android:hint="请输入密码"
-                android:text="a123456"
-                android:inputType="textPassword"
-                android:textSize="16sp" />
+                android:layout_marginTop="22dp"
+                android:background="@drawable/bg_mine_gray"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <EditText
+                    android:id="@+id/input_pwd"
+                    android:layout_width="0dp"
+                    android:layout_height="46dp"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入登录密码"
+                    android:inputType="textPassword"
+                    android:paddingLeft="30dp"
+                    android:textColorHint="#666666"
+                    android:textColor="@color/white"
+                    android:layout_marginRight="10dp"
+                    android:textSize="16sp" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="20dp"
+                    android:layout_height="12dp"
+                    android:src="@mipmap/password_yincang"
+                    android:layout_marginRight="30dp"/>
+
+            </LinearLayout>
 
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/go_login"
-            android:onClick="@{clickListener}"
-            android:layout_width="315dp"
-            android:layout_height="45dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/bg_login_btn"
-            android:backgroundTint="#FF443D"
-            android:text="登 录"
-            android:textColor="@android:color/white"
-            android:textSize="16sp" />
 
+        </LinearLayout>
         <FrameLayout
-            android:layout_width="315dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/goto_reg"
-                android:onClick="@{clickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:paddingVertical="13dp"
-                android:text="注册账户"
-                android:textColor="#ff333333"
-                android:textSize="14sp" />
-
             <TextView
                 android:id="@+id/forget_password"
-                android:onClick="@{clickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
-                android:paddingVertical="13dp"
-                android:text="忘记密码"
-                android:textColor="#ff333333"
+                android:onClick="@{clickListener}"
+                android:paddingVertical="20dp"
+                android:text="忘记密码?"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
         </FrameLayout>
-
-
+        <Button
+            android:id="@+id/go_login"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp50"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_mine_withdraw_copy"
+            android:onClick="@{clickListener}"
+            android:text="登 录"
+            android:textColor="#151314"
+            android:textSize="20sp" />
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="wrap_content"
-            android:layout_marginTop="15dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="登录即代表阅读并同意"
-                android:textColor="#ff808080"
+                android:textColor="@color/white"
                 android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/fuwu_xieyi"
-                android:onClick="@{clickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:onClick="@{clickListener}"
                 android:text="服务协议"
                 android:textColor="#372EF7"
                 android:textSize="12sp" />
         </LinearLayout>
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="山东省来客科技提供技术服务"
-            android:layout_marginBottom="8dp"
-            android:textColor="#808080"
-            android:textSize="12sp"/>
 
 
 

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

@@ -23,6 +23,7 @@
             android:layout_width="match_parent"
             android:layout_alignParentBottom="true"
             android:background="@color/black"
+            android:paddingBottom="10dp"
             android:layout_height="wrap_content">
             <RadioGroup
                 android:layout_marginTop="10dp"

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

@@ -15,199 +15,205 @@
         android:id="@+id/main_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFE6E6E6"
-        android:orientation="vertical">
+        android:background="@color/black"
 
+        android:orientation="vertical">
         <include
             android:id="@+id/include_title"
             layout="@layout/include_title_bar"
             app:clickListener="@{clickListener}" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="30dp"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp50"
+                android:text="注册"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="46dp"
                 android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:background="@color/white"
-                    android:gravity="center_vertical">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="16dp"
-                        android:src="@mipmap/tel_phone"/>
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        android:id="@+id/input_phone"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:layout_marginLeft="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="16dp"
-                        android:background="@null"
-                        android:hint="请输入手机号"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
+                <EditText
+                    android:id="@+id/inputPhone"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/gray_AD" />
-
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入手机号"
+                    android:inputType="phone"
+                    android:paddingLeft="30dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:background="@color/white"
-                    android:gravity="center_vertical">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="16sp"
-                        android:src="@mipmap/code"/>
+                    android:layout_height="46dp"
+                    android:layout_marginTop="14dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
                     <EditText
-                        android:id="@+id/input_code"
+                        android:id="@+id/inputCode"
                         android:layout_width="0dp"
+                        android:layout_height="46dp"
                         android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="10dp"
                         android:background="@null"
                         android:hint="请输入验证码"
-                        android:layout_marginLeft="10dp"
-                        android:inputType="number"
-                        android:textSize="14sp" />
-                    <View
-                        android:layout_width="1dp"
-                        android:layout_height="25dp"
-                        android:background="#FFE9E9E9"
-                        android:layout_marginRight="16sp"/>
+                        android:inputType="textPassword"
+                        android:paddingLeft="30dp"
+                        android:textColorHint="#666666"
+                        android:textColor="@color/white"
+                        android:layout_marginRight="10dp"
+                        android:textSize="16sp" />
+
                     <TextView
                         android:id="@+id/get_captcha"
-                        android:onClick="@{clickListener}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="16sp"
-                        android:textColor="#FF999999"
-                        android:text="获取验证码"/>
+                        android:layout_marginRight="23dp"
+                        android:onClick="@{clickListener}"
+                        android:text="获取验证码" />
+
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/gray_AD" />
 
+                <EditText
+                    android:id="@+id/input_pwd"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入密码"
+                    android:paddingLeft="30dp"
+                    android:layout_marginTop="14dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
+                <EditText
+                    android:id="@+id/input_pwd_again"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请再次输入密码"
+                    android:paddingLeft="30dp"
+                    android:layout_marginTop="14dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
+                <EditText
+                    android:id="@+id/input_second_pwd"
+                    android:layout_width="match_parent"
+                    android:layout_height="46dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入二级密码"
+                    android:paddingLeft="30dp"
+                    android:layout_marginTop="14dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:background="@color/white"
-                    android:gravity="center_vertical">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="16sp"
-                        android:src="@mipmap/login_password"/>
-
+                    android:layout_height="46dp"
+                    android:layout_marginTop="14dp"
+                    android:gravity="center_vertical"
+                    android:background="@drawable/bg_mine_gray">
                     <EditText
-                        android:id="@+id/input_password"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="16sp"
+                        android:id="@+id/input_second_pwd_again"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="46dp"
                         android:background="@null"
-                        android:layout_marginLeft="10dp"
-                        android:hint="请设置登录密码"
-                        android:textSize="14sp" />
-
+                        android:hint="请再次输入二级密码"
+                        android:paddingLeft="30dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="#666666"
+                        android:textSize="15sp" />
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="20dp"
+                        android:layout_height="12dp"
+                        android:src="@mipmap/password_yincang"
+                        android:layout_marginRight="30dp"/>
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/gray_AD" />
-                <LinearLayout
+                <EditText
+                    android:id="@+id/input_invitation_code"
                     android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:background="@color/white"
-                    android:gravity="center_vertical">
+                    android:layout_height="46dp"
+                    android:layout_marginTop="14dp"
+                    android:background="@drawable/bg_mine_gray"
+                    android:hint="请输入邀请码(选填)"
+                    android:inputType="phone"
+                    android:paddingLeft="30dp"
+                    android:textColor="@color/white"
+                    android:textColorHint="#666666"
+                    android:textSize="15sp" />
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="16sp"
-                        android:src="@mipmap/login_password"/>
 
-                    <EditText
-                        android:id="@+id/input_password_cf"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="16sp"
-                        android:background="@null"
-                        android:layout_marginLeft="10dp"
-                        android:hint="请再次输入密码"
-                        android:textSize="14sp" />
 
-                </LinearLayout>
-                <View
+                <TextView
+                    android:id="@+id/button_registered"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/gray_AD" />
+                    android:layout_height="@dimen/dp50"
+                    android:layout_marginTop="38dp"
+                    android:background="@drawable/bg_mine_withdraw_copy"
+                    android:elevation="2dp"
+                    android:gravity="center"
+                    android:onClick="@{clickListener}"
+                    android:text="注册"
+                    android:textColor="#151314"
+                    android:textSize="20sp" />
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:background="@color/white"
-                    android:gravity="center_vertical">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="43dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_marginLeft="16sp"
-                        android:src="@mipmap/code"/>
-
-                    <EditText
-                        android:id="@+id/input_yaoqing"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:src="@mipmap/select_no"/>
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="16sp"
-                        android:background="@null"
-                        android:layout_marginLeft="10dp"
-                        android:hint="请输入注册邀请码"
-                        android:textSize="14sp" />
+                        android:text="阅读并同意"
+                        android:layout_marginLeft="5dp"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
 
+                    <TextView
+                        android:id="@+id/yonghu_xieyi"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:onClick="@{clickListener}"
+                        android:text="《用户协议》"
+                        android:textSize="10sp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="和"
+                        android:layout_marginLeft="5dp"
+                        android:textColor="@color/white"
+                        android:textSize="10sp" />
+                    <TextView
+                        android:id="@+id/yinsi_xieyi"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:onClick="@{clickListener}"
+                        android:text="《隐私政策》"
+                        android:layout_marginLeft="5dp"
+                        android:textSize="10sp" />
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/gray_AD" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="11sp"
-                    android:gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:text="请设置6位及以上包含数字字母和特殊符号中至少两种组合的密码"/>
-
-                <TextView
-                    android:id="@+id/button_registered"
-                    android:onClick="@{clickListener}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:text="完成"
-                    android:elevation="2dp"
-                    android:layout_marginTop="80dp"
-                    android:layout_marginLeft="80dp"
-                    android:layout_marginRight="80dp"
-                    android:textColor="#fff"
-                    android:textSize="18dp"
-                    android:gravity="center"
-                    android:background="@drawable/bg_finish_button" />
 
             </LinearLayout>
+        </LinearLayout>
+
 
     </LinearLayout>
 </layout>

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

@@ -46,6 +46,7 @@
                 android:onClick="@{clickListener}"
                 android:text="象链"
                 android:textColor="@color/white"
+                style="@style/fontColor"
                 android:textSize="18sp" />
         </LinearLayout>
 

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

@@ -37,6 +37,8 @@
                 android:src="@mipmap/mine_news" />
 
             <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/set_btn"
+                android:onClick="@{clickListener}"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginLeft="20dp"

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

@@ -43,5 +43,11 @@
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
+    <style name="fontColor" >
+        <item name="android:textSize">14dp</item>
+        <item name="android:startColor">#FFDA4E</item>
+        <item name="android:centerColor">#59FFF1</item>
+        <item name="android:endColor">#2BA3FF</item>
+    </style>
 
 </resources>