From a45036d4003974f8e78eb819a932895291d677d6 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:14:41 +0800
Subject: [PATCH] [*]

---
 app/src/main/res/layout/ac_login_layout.xml |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/ac_login_layout.xml b/app/src/main/res/layout/ac_login_layout.xml
index f61bfa9..d5a903d 100644
--- a/app/src/main/res/layout/ac_login_layout.xml
+++ b/app/src/main/res/layout/ac_login_layout.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/bg_login"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_register"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="@dimen/x10"
+        android:layout_marginRight="@dimen/x10"
+        android:layout_marginBottom="@dimen/x30"
+        android:gravity="center|center_horizontal"
+        android:text="������"
+        android:textColor="@color/white"
+        android:textSize="16sp" />
 
     <ImageView
         android:layout_width="100dp"
@@ -17,8 +31,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/x40"
-        android:layout_marginRight="@dimen/x40"
         android:layout_marginTop="@dimen/x24"
+        android:layout_marginRight="@dimen/x40"
         android:layout_marginBottom="@dimen/x20"
         android:background="@mipmap/bg_edit"
         android:padding="@dimen/x14">
@@ -43,13 +57,13 @@
             android:id="@+id/et_phone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_toRightOf="@+id/line1"
             android:background="@null"
             android:hint="���������������������"
             android:inputType="number"
             android:paddingLeft="@dimen/x10"
             android:paddingRight="@dimen/x10"
-            android:layout_centerVertical="true"
             android:textColor="@color/blue_txt"
             android:textColorHint="@color/blue_txt"
             android:textSize="16sp" />
@@ -83,8 +97,8 @@
             android:id="@+id/et_pwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/line2"
             android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/line2"
             android:background="@null"
             android:hint="���������������"
             android:inputType="textPassword"
@@ -94,36 +108,37 @@
             android:textColorHint="@color/blue_txt"
             android:textSize="16sp" />
     </RelativeLayout>
+
     <TextView
         android:id="@+id/tv_forget"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:text="���������������"
-        android:layout_marginRight="@dimen/x40"
         android:layout_marginTop="@dimen/x24"
+        android:layout_marginRight="@dimen/x40"
         android:gravity="right"
+        android:text="���������������"
         android:textColor="@color/dark_gray_txt"
         android:textSize="15sp" />
+
     <Button
         android:id="@+id/bt_sure"
         android:layout_width="match_parent"
         android:layout_height="@dimen/x40"
         android:layout_marginLeft="@dimen/x40"
+        android:layout_marginTop="@dimen/x12"
         android:layout_marginRight="@dimen/x40"
-        android:layout_marginTop="@dimen/x24"
         android:background="@mipmap/bt_blue"
         android:text="������"
-        android:gravity="center"
         android:textColor="@color/white"
         android:textSize="16sp" />
-    <TextView
-        android:id="@+id/tv_register"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="���������������"
-        android:gravity="bottom|center_horizontal"
-        android:textColor="@color/blue_txt"
-        android:layout_marginBottom="@dimen/x30"
-        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/weixinlogin"
+        android:layout_width="@dimen/x44"
+        android:layout_height="@dimen/x44"
+        android:layout_gravity="bottom|center"
+        android:layout_marginTop="@dimen/x2"
+        android:background="@mipmap/weixin"
+        android:stateListAnimator="@anim/progress" />
 </LinearLayout>
\ No newline at end of file

--
Gitblit v1.8.0