add 优化页面

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeCircleActivity.kt

@@ -9,7 +9,7 @@ import com.yidian.shenghuoquan.newscontent.utils.CountDownTimerUtils
 /**
  * Author: sym
  * Date: 2021/5/18 5:14 PM
- * Describe:
+ * Describe:短信登陆页面
  */
 class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
     private lateinit var mCountDownTimerUtils: CountDownTimerUtils
@@ -29,7 +29,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
     }
 
     private fun initView() {
-        mCountDownTimerUtils = CountDownTimerUtils(viewBind.getBtn, 6000, 1000)
+        mCountDownTimerUtils = CountDownTimerUtils(viewBind.getBtn, 60000, 1000)
     }
 
     private fun setOnListener() {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/CountDownTimerUtils.kt

@@ -18,11 +18,15 @@ class CountDownTimerUtils : CountDownTimer {
     override fun onTick(millisUntilFinished: Long) {
         mTextView!!.isClickable = false //设置不可点击
         var temp: Long = millisUntilFinished / 1000
-        mTextView!!.text = temp.toString() + "秒后可重新发送"//设置倒计时时间
+        if (temp.toString() != "0") {
+            mTextView!!.text = temp.toString() + "s后重新获取"//设置倒计时时间
+        } else {
+            mTextView!!.text = "获取验证码"
+        }
     }
 
     override fun onFinish() {
-        mTextView!!.text = "重新获取验证码"
+        mTextView!!.text = "获取验证码"
         mTextView!!.isClickable = true //重新获得点击
     }
 }
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_login.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <EditText
-        android:id="@+id/phone_number_edit"
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="141dp"
-        android:layout_marginStart="40dp"
-        android:ems="10"
-        android:hint="请输入手机号">
-
-        <requestFocus />
-    </EditText>
+        android:layout_gravity="center"
+        android:layout_marginTop="130dp"
+        android:text="加入生活圈升级为生活号" />
 
-    <EditText
-        android:id="@+id/number_edit"
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/phone_number_edit"
-        android:layout_marginTop="26dp"
-        android:layout_marginStart="40dp"
-        android:ems="10"
-        android:hint="请输入验证码" />
+        android:layout_gravity="center"
+        android:layout_marginTop="30dp"
+        android:text="为你提供更多更优的服务"
+        android:textSize="24sp" />
 
-    <TextView
-        android:id="@+id/get_btn"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="260dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="60dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="手机号"
+            android:textSize="18sp" />
+
+        <EditText
+            android:id="@+id/phone_number_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:background="@null"
+            android:text="13888888888"
+            android:textColor="#555555"
+            android:textSize="18sp"></EditText>
+    </LinearLayout>
+
+    <View
+        android:layout_width="260dp"
+        android:layout_height="1dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="15dp"
+        android:background="#989998" />
+
+    <LinearLayout
+        android:layout_width="260dp"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/number_edit"
-        android:layout_alignParentRight="true"
-        android:text="获取验证码" />
+        android:layout_gravity="center"
+        android:layout_marginTop="60dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="验证码"
+            android:textSize="18sp" />
+
+        <EditText
+            android:id="@+id/number_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:background="@null"
+            android:text="3f9k"
+            android:textColor="#555555"
+            android:textSize="18sp" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/get_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="获取验证码" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="260dp"
+        android:layout_height="1dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="15dp"
+        android:background="#989998" />
 
     <Button
         android:id="@+id/login_btn"
-        android:layout_width="wrap_content"
+        android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="登陆" />
+        android:layout_marginTop="50dp"
+        android:layout_gravity="center"
+        android:text="登录" />
 
-</RelativeLayout>
+</LinearLayout>
\ No newline at end of file