From f0920856dbceac454e10de0a69f70fc47f790518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E4=B8=96=E8=8E=B2?= <you@example.com>
Date: Tue, 8 Jan 2019 23:15:22 +0800
Subject: [PATCH] first commit

---
 .../src/main/res/layout/activity_login.xml    | 20 ++++++---
 database/v/app/src/main/res/layout/regist.xml | 43 ++++++++++---------
 .../app/src/main/res/layout/res_password.xml  | 43 +++++++++----------
 .../src/main/res/layout/activity_login.xml    | 20 ++++++---
 .../app/src/main/res/layout/regist.xml        | 43 ++++++++++---------
 .../app/src/main/res/layout/res_password.xml  | 43 +++++++++----------
 6 files changed, 112 insertions(+), 100 deletions(-)

diff --git a/database/v/app/src/main/res/layout/activity_login.xml b/database/v/app/src/main/res/layout/activity_login.xml
index 4dbc115..e41147a 100644
--- a/database/v/app/src/main/res/layout/activity_login.xml
+++ b/database/v/app/src/main/res/layout/activity_login.xml
@@ -11,21 +11,28 @@
     <EditText
         android:id="@+id/et_username"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="用户名"
         android:inputType="textPersonName"
         android:singleLine="true"
         app:layout_constraintBottom_toTopOf="@+id/et_pwd"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="16dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="MissingConstraints" />
     <!-- input pwd -->
     <EditText
         android:id="@+id/et_pwd"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
@@ -34,9 +41,10 @@
         android:password="true"
         android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="5dp" />
+        tools:ignore="MissingConstraints" />
     <!-- the login button -->
     <Button
         android:id="@+id/btn_login"
diff --git a/database/v/app/src/main/res/layout/regist.xml b/database/v/app/src/main/res/layout/regist.xml
index 2c06769..8cfaba8 100644
--- a/database/v/app/src/main/res/layout/regist.xml
+++ b/database/v/app/src/main/res/layout/regist.xml
@@ -7,19 +7,20 @@
     tools:layout_editor_absoluteY="81dp"
     android:background="@drawable/allbackground">
 
-        <ImageView
-            android:id="@+id/reg_head"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:src="@mipmap/choosehead"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="MissingConstraints" />
+    <ImageView
+        android:id="@+id/reg_head"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:src="@mipmap/choosehead"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/tvShowDialog"
@@ -56,16 +57,20 @@
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
+        app:layout_constraintBottom_toTopOf="@+id/tvShowDialog"
         app:layout_constraintEnd_toEndOf="@+id/editName"
         app:layout_constraintStart_toStartOf="@+id/editName"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="124dp" />
+        app:layout_constraintTop_toBottomOf="@+id/editName"
+        tools:ignore="MissingConstraints" />
         <!-- the regist button -->
     <Button
         android:id="@+id/btnRegist"
@@ -73,10 +78,8 @@
         android:layout_width="fill_parent"
         android:layout_height="50dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyRegistClick"
@@ -86,7 +89,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editCode"
+        app:layout_constraintTop_toBottomOf="@+id/btnGetcord"
         tools:ignore="MissingConstraints" />
 
     <EditText
@@ -127,12 +130,10 @@
     <EditText
         android:id="@+id/editName"
         android:layout_width="250dp"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:background="#ceefecec"
         android:ems="10"
         android:gravity="center"
diff --git a/database/v/app/src/main/res/layout/res_password.xml b/database/v/app/src/main/res/layout/res_password.xml
index 840a8bc..a2214a8 100644
--- a/database/v/app/src/main/res/layout/res_password.xml
+++ b/database/v/app/src/main/res/layout/res_password.xml
@@ -29,31 +29,34 @@
         android:id="@+id/editName"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="47dp"
-        android:layout_marginTop="12dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入用户名"
         android:inputType="number"
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/editResPwd"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/editResPwd"
-        app:layout_constraintTop_toBottomOf="@+id/editResPwd"
-        tools:ignore="MissingConstraints" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="55dp" />
     <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_marginTop="72dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入新密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
+        app:layout_constraintBottom_toTopOf="@+id/editName"
         app:layout_constraintTop_toBottomOf="@+id/textView"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="55dp" />
@@ -62,38 +65,32 @@
         android:id="@+id/editResPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请再次输入新密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/editPwd"
-        app:layout_constraintStart_toStartOf="@+id/editPwd"
+        app:layout_constraintBottom_toTopOf="@+id/editName"
         app:layout_constraintTop_toBottomOf="@+id/editPwd"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="55dp" />
     <!-- the confirm button -->
     <Button
         android:id="@+id/btnConfirm"
         style="@style/textstyle"
         android:layout_width="fill_parent"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_height="50dp"
         android:background="#e137b7b5"
         android:onClick="OnMyConfirmClick"
         android:text="@string/confirm"
         android:textColor="#fff"
         android:textSize="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editName"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="391dp" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/前端/myvoice/app/src/main/res/layout/activity_login.xml b/前端/myvoice/app/src/main/res/layout/activity_login.xml
index 4dbc115..e41147a 100644
--- a/前端/myvoice/app/src/main/res/layout/activity_login.xml
+++ b/前端/myvoice/app/src/main/res/layout/activity_login.xml
@@ -11,21 +11,28 @@
     <EditText
         android:id="@+id/et_username"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="用户名"
         android:inputType="textPersonName"
         android:singleLine="true"
         app:layout_constraintBottom_toTopOf="@+id/et_pwd"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="16dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="MissingConstraints" />
     <!-- input pwd -->
     <EditText
         android:id="@+id/et_pwd"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
@@ -34,9 +41,10 @@
         android:password="true"
         android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="5dp" />
+        tools:ignore="MissingConstraints" />
     <!-- the login button -->
     <Button
         android:id="@+id/btn_login"
diff --git a/前端/myvoice/app/src/main/res/layout/regist.xml b/前端/myvoice/app/src/main/res/layout/regist.xml
index 2c06769..8cfaba8 100644
--- a/前端/myvoice/app/src/main/res/layout/regist.xml
+++ b/前端/myvoice/app/src/main/res/layout/regist.xml
@@ -7,19 +7,20 @@
     tools:layout_editor_absoluteY="81dp"
     android:background="@drawable/allbackground">
 
-        <ImageView
-            android:id="@+id/reg_head"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:src="@mipmap/choosehead"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="MissingConstraints" />
+    <ImageView
+        android:id="@+id/reg_head"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:src="@mipmap/choosehead"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/tvShowDialog"
@@ -56,16 +57,20 @@
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
+        app:layout_constraintBottom_toTopOf="@+id/tvShowDialog"
         app:layout_constraintEnd_toEndOf="@+id/editName"
         app:layout_constraintStart_toStartOf="@+id/editName"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="124dp" />
+        app:layout_constraintTop_toBottomOf="@+id/editName"
+        tools:ignore="MissingConstraints" />
         <!-- the regist button -->
     <Button
         android:id="@+id/btnRegist"
@@ -73,10 +78,8 @@
         android:layout_width="fill_parent"
         android:layout_height="50dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyRegistClick"
@@ -86,7 +89,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editCode"
+        app:layout_constraintTop_toBottomOf="@+id/btnGetcord"
         tools:ignore="MissingConstraints" />
 
     <EditText
@@ -127,12 +130,10 @@
     <EditText
         android:id="@+id/editName"
         android:layout_width="250dp"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:background="#ceefecec"
         android:ems="10"
         android:gravity="center"
diff --git a/前端/myvoice/app/src/main/res/layout/res_password.xml b/前端/myvoice/app/src/main/res/layout/res_password.xml
index 840a8bc..a2214a8 100644
--- a/前端/myvoice/app/src/main/res/layout/res_password.xml
+++ b/前端/myvoice/app/src/main/res/layout/res_password.xml
@@ -29,31 +29,34 @@
         android:id="@+id/editName"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="47dp"
-        android:layout_marginTop="12dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入用户名"
         android:inputType="number"
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/editResPwd"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/editResPwd"
-        app:layout_constraintTop_toBottomOf="@+id/editResPwd"
-        tools:ignore="MissingConstraints" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="55dp" />
     <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_marginTop="72dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入新密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
+        app:layout_constraintBottom_toTopOf="@+id/editName"
         app:layout_constraintTop_toBottomOf="@+id/textView"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="55dp" />
@@ -62,38 +65,32 @@
         android:id="@+id/editResPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请再次输入新密码"
         android:lines="1"
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/editPwd"
-        app:layout_constraintStart_toStartOf="@+id/editPwd"
+        app:layout_constraintBottom_toTopOf="@+id/editName"
         app:layout_constraintTop_toBottomOf="@+id/editPwd"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="55dp" />
     <!-- the confirm button -->
     <Button
         android:id="@+id/btnConfirm"
         style="@style/textstyle"
         android:layout_width="fill_parent"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_height="50dp"
         android:background="#e137b7b5"
         android:onClick="OnMyConfirmClick"
         android:text="@string/confirm"
         android:textColor="#fff"
         android:textSize="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editName"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="391dp" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file