From fdaa850b50066fe44f2fdf76b8dcba5d4b793403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E4=B8=96=E8=8E=B2?= <you@example.com>
Date: Wed, 9 Jan 2019 00:59:51 +0800
Subject: [PATCH] first cmmit

---
 .../src/main/res/layout/activity_index.xml    |  19 ++--
 database/v/app/src/main/res/layout/regist.xml |  88 ++++++++++--------
 .../app/src/main/res/layout/res_password.xml  |  55 ++++++-----
 .../app/src/main/res/values/strings.xml       |   9 --
 前端/{myvoice => test}/.gitignore           |   0
 .../.idea/codeStyles/Project.xml              |   0
 前端/{myvoice => test}/.idea/gradle.xml     |   0
 前端/{myvoice => test}/.idea/misc.xml       |   5 +-
 .../.idea/runConfigurations.xml               |   0
 前端/{myvoice => test}/app/.gitignore       |   0
 前端/{myvoice => test}/app/build.gradle     |   4 +-
 .../{myvoice => test}/app/proguard-rules.pro  |   0
 .../test}/ExampleInstrumentedTest.java        |   4 +-
 .../app/src/main/AndroidManifest.xml          |   2 +-
 .../administrator/test}/IndexActivity.java    |   4 +-
 .../drawable-v24/ic_launcher_foreground.xml   |   0
 .../src/main/res/drawable/allbackground.png   | Bin
 .../src/main/res/drawable/allbackground30.png | Bin
 .../app/src/main/res/drawable/but.png         | Bin
 .../app/src/main/res/drawable/butterfly.png   | Bin
 .../res/drawable/ic_launcher_background.xml   |   0
 .../app/src/main/res/drawable/icon.png        | Bin
 .../app/src/main/res/drawable/indexdiary.png  | Bin
 .../app/src/main/res/drawable/indexmemo.png   | Bin
 .../app/src/main/res/drawable/indexmy.png     | Bin
 .../app/src/main/res/drawable/indexshare.png  | Bin
 .../src/main/res/layout/activity_index.xml    |  19 ++--
 .../src/main/res/layout/activity_login.xml    |   0
 .../app/src/main/res/layout/regist.xml        |  88 ++++++++++--------
 .../app/src/main/res/layout/res_password.xml  |  55 ++++++-----
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 .../src/main/res/mipmap-hdpi/choosehead.png   | Bin 0 -> 8292 bytes
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 .../app/src/main/res/values/colors.xml        |   2 +-
 .../test/app/src/main/res/values/strings.xml  |  35 +++++++
 .../app/src/main/res/values/styles.xml        |   1 +
 .../administrator/test}/ExampleUnitTest.java  |   2 +-
 前端/{myvoice => test}/build.gradle         |   0
 前端/{myvoice => test}/gradle.properties    |   0
 .../gradle/wrapper/gradle-wrapper.jar         | Bin
 .../gradle/wrapper/gradle-wrapper.properties  |   0
 前端/{myvoice => test}/gradlew              |   0
 前端/{myvoice => test}/gradlew.bat          |   0
 前端/{myvoice => test}/settings.gradle      |   0
 54 files changed, 228 insertions(+), 164 deletions(-)
 delete mode 100644 前端/myvoice/app/src/main/res/values/strings.xml
 rename 前端/{myvoice => test}/.gitignore (100%)
 rename 前端/{myvoice => test}/.idea/codeStyles/Project.xml (100%)
 rename 前端/{myvoice => test}/.idea/gradle.xml (100%)
 rename 前端/{myvoice => test}/.idea/misc.xml (90%)
 rename 前端/{myvoice => test}/.idea/runConfigurations.xml (100%)
 rename 前端/{myvoice => test}/app/.gitignore (100%)
 rename 前端/{myvoice => test}/app/build.gradle (91%)
 rename 前端/{myvoice => test}/app/proguard-rules.pro (100%)
 rename 前端/{myvoice/app/src/androidTest/java/com/example/administrator/myvoice => test/app/src/androidTest/java/com/example/administrator/test}/ExampleInstrumentedTest.java (82%)
 rename 前端/{myvoice => test}/app/src/main/AndroidManifest.xml (91%)
 rename 前端/{myvoice/app/src/main/java/com/example/administrator/myvoice => test/app/src/main/java/com/example/administrator/test}/IndexActivity.java (73%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/allbackground.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/allbackground30.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/but.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/butterfly.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/icon.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/indexdiary.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/indexmemo.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/indexmy.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/drawable/indexshare.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/layout/activity_index.xml (90%)
 rename 前端/{myvoice => test}/app/src/main/res/layout/activity_login.xml (100%)
 rename 前端/{myvoice => test}/app/src/main/res/layout/regist.xml (73%)
 rename 前端/{myvoice => test}/app/src/main/res/layout/res_password.xml (63%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 create mode 100644 前端/test/app/src/main/res/mipmap-hdpi/choosehead.png
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
 rename 前端/{myvoice => test}/app/src/main/res/values/colors.xml (83%)
 create mode 100644 前端/test/app/src/main/res/values/strings.xml
 rename 前端/{myvoice => test}/app/src/main/res/values/styles.xml (99%)
 rename 前端/{myvoice/app/src/test/java/com/example/administrator/myvoice => test/app/src/test/java/com/example/administrator/test}/ExampleUnitTest.java (88%)
 rename 前端/{myvoice => test}/build.gradle (100%)
 rename 前端/{myvoice => test}/gradle.properties (100%)
 rename 前端/{myvoice => test}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename 前端/{myvoice => test}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename 前端/{myvoice => test}/gradlew (100%)
 rename 前端/{myvoice => test}/gradlew.bat (100%)
 rename 前端/{myvoice => test}/settings.gradle (100%)

diff --git a/database/v/app/src/main/res/layout/activity_index.xml b/database/v/app/src/main/res/layout/activity_index.xml
index 332c033..a851d77 100644
--- a/database/v/app/src/main/res/layout/activity_index.xml
+++ b/database/v/app/src/main/res/layout/activity_index.xml
@@ -8,18 +8,17 @@
 
     <ImageView
         android:id="@+id/butterflypng"
-        android:layout_width="match_parent"
-        android:layout_height="96dp"
-        android:layout_marginBottom="0dp"
+        android:layout_width="463dp"
+        android:layout_height="99dp"
         android:src="@drawable/but"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/indexmemotext" />
+        app:layout_constraintHorizontal_bias="0.493"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/indexdiarypng"
-        android:layout_width="0dp"
+        android:layout_width="140dp"
         android:layout_height="140dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="102dp"
@@ -34,8 +33,8 @@
 
     <ImageView
         android:id="@+id/indexmyng"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginBottom="8dp"
@@ -46,8 +45,8 @@
 
     <ImageView
         android:id="@+id/indexsharepng"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="140dp"
+        android:layout_height="140dp"
         android:layout_marginTop="312dp"
         android:layout_marginBottom="26dp"
         android:src="@drawable/indexshare"
diff --git a/database/v/app/src/main/res/layout/regist.xml b/database/v/app/src/main/res/layout/regist.xml
index 8cfaba8..44f37ef 100644
--- a/database/v/app/src/main/res/layout/regist.xml
+++ b/database/v/app/src/main/res/layout/regist.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:layout_editor_absoluteY="81dp"
-    android:background="@drawable/allbackground">
+    android:background="@drawable/allbackground"
+    tools:layout_editor_absoluteY="25dp">
 
     <ImageView
         android:id="@+id/reg_head"
@@ -28,37 +28,47 @@
         android:layout_height="33dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:gravity="center"
         android:text="出生年月日"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:textSize="17dp"
-        app:layout_constraintEnd_toEndOf="@+id/editPwd"
-        app:layout_constraintStart_toStartOf="@+id/editPwd"
-        tools:layout_editor_absoluteY="182dp"
+        app:layout_constraintBottom_toTopOf="@+id/tableRow"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editPwd"
         tools:ignore="MissingConstraints" />
 
     <EditText
         android:id="@+id/editPhone"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
         android:background="#ceefecec"
         android:hint="手机号"
         android:inputType="number"
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/tableRow"
-        app:layout_constraintStart_toStartOf="@+id/tableRow"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="270dp" />
-        <!-- input password -->
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
+    <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
         android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
@@ -66,20 +76,17 @@
         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"
-        app:layout_constraintTop_toBottomOf="@+id/editName"
+        app:layout_constraintBottom_toTopOf="@+id/tableRow"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/editName"
         tools:ignore="MissingConstraints" />
-        <!-- the regist button -->
+    <!-- the regist button -->
     <Button
         android:id="@+id/btnRegist"
         style="@style/textstyle"
         android:layout_width="fill_parent"
         android:layout_height="50dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyRegistClick"
@@ -87,10 +94,8 @@
         android:textColor="#fff"
         android:textSize="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnGetcord"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="5dp" />
 
     <EditText
         android:id="@+id/editCode"
@@ -98,20 +103,18 @@
         android:layout_height="45dp"
         android:layout_below="@+id/editPhone"
         android:layout_alignStart="@+id/btnRegist"
+        android:layout_alignLeft="@+id/btnRegist"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:ems="10"
         android:hint="请输入验证码"
         android:inputType="textPersonName"
-        app:layout_constraintEnd_toStartOf="@+id/btnGetcord"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintBottom_toTopOf="@+id/btnRegist"
         app:layout_constraintStart_toStartOf="@+id/editPhone"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="345dp"
-        android:layout_alignLeft="@+id/btnRegist" />
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
 
     <Button
         android:id="@+id/btnGetcord"
@@ -121,11 +124,17 @@
         android:layout_alignEnd="@+id/editPhone"
         android:layout_alignRight="@+id/editPhone"
         android:layout_alignBottom="@+id/editCode"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@color/colorPrimary"
         android:text="获取验证码"
+        app:layout_constraintBottom_toTopOf="@+id/btnRegist"
         app:layout_constraintEnd_toEndOf="@+id/editPhone"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="346dp" />
+        app:layout_constraintStart_toEndOf="@+id/editCode"
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
 
     <EditText
         android:id="@+id/editName"
@@ -147,11 +156,16 @@
     <TableRow
         android:id="@+id/tableRow"
         android:layout_width="250dp"
-        android:layout_height="39dp"
+        android:layout_height="43dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
-        app:layout_constraintEnd_toEndOf="@+id/tvShowDialog"
-        app:layout_constraintStart_toStartOf="@+id/tvShowDialog"
-        tools:layout_editor_absoluteY="223dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints">
 
         <TextView
@@ -185,6 +199,4 @@
     </TableRow>
 
 
-
-
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
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 a2214a8..77a0e9e 100644
--- a/database/v/app/src/main/res/layout/res_password.xml
+++ b/database/v/app/src/main/res/layout/res_password.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout 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="@drawable/allbackground">
+    android:background="@drawable/allbackground"
+    tools:layout_editor_absoluteY="25dp">
 
     <TextView
         android:id="@+id/textView"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
-        android:layout_marginStart="0dp"
-        android:layout_marginLeft="0dp"
+        android:layout_width="match_parent"
         android:layout_marginTop="0dp"
         android:layout_marginEnd="0dp"
-        android:layout_marginRight="8dp"
         android:background="#deffffff"
         android:gravity="center"
         android:text="@string/resPwd"
@@ -29,8 +26,10 @@
         android:id="@+id/editName"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入用户名"
@@ -38,17 +37,20 @@
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/editResPwd"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="55dp" />
+        tools:ignore="MissingConstraints" />
     <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入新密码"
@@ -56,17 +58,20 @@
         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" />
+        app:layout_constraintBottom_toTopOf="@+id/editResPwd"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editName"
+        tools:ignore="MissingConstraints" />
     <!-- input password again -->
     <EditText
         android:id="@+id/editResPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请再次输入新密码"
@@ -74,23 +79,27 @@
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
-        app:layout_constraintBottom_toTopOf="@+id/editName"
-        app:layout_constraintTop_toBottomOf="@+id/editPwd"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="55dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:ignore="MissingConstraints" />
     <!-- the confirm button -->
     <Button
         android:id="@+id/btnConfirm"
         style="@style/textstyle"
         android:layout_width="fill_parent"
         android:layout_height="50dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyConfirmClick"
         android:text="@string/confirm"
         android:textColor="#fff"
         android:textSize="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editResPwd"
         tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="391dp" />
+        tools:layout_editor_absoluteX="5dp" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/前端/myvoice/app/src/main/res/values/strings.xml b/前端/myvoice/app/src/main/res/values/strings.xml
deleted file mode 100644
index a3d6f41..0000000
--- a/前端/myvoice/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string name="app_name">音之轨迹</string>
-    <string name="login">登录</string>
-    <string name="forgetPwd">忘记密码</string>
-    <string name="startRegist">开始注册</string>
-    <string name="regist">注册</string>
-    <string name="resPwd">重置密码</string>
-    <string name="confirm">确认</string>
-</resources>
diff --git a/前端/myvoice/.gitignore b/前端/test/.gitignore
similarity index 100%
rename from 前端/myvoice/.gitignore
rename to 前端/test/.gitignore
diff --git a/前端/myvoice/.idea/codeStyles/Project.xml b/前端/test/.idea/codeStyles/Project.xml
similarity index 100%
rename from 前端/myvoice/.idea/codeStyles/Project.xml
rename to 前端/test/.idea/codeStyles/Project.xml
diff --git a/前端/myvoice/.idea/gradle.xml b/前端/test/.idea/gradle.xml
similarity index 100%
rename from 前端/myvoice/.idea/gradle.xml
rename to 前端/test/.idea/gradle.xml
diff --git a/前端/myvoice/.idea/misc.xml b/前端/test/.idea/misc.xml
similarity index 90%
rename from 前端/myvoice/.idea/misc.xml
rename to 前端/test/.idea/misc.xml
index 609c2ef..b0c7b20 100644
--- a/前端/myvoice/.idea/misc.xml
+++ b/前端/test/.idea/misc.xml
@@ -29,10 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectPlainTextFileTypeManager">
-    <file url="file://$PROJECT_DIR$/app/src/main/res/layout/add_memo.xml" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/前端/myvoice/.idea/runConfigurations.xml b/前端/test/.idea/runConfigurations.xml
similarity index 100%
rename from 前端/myvoice/.idea/runConfigurations.xml
rename to 前端/test/.idea/runConfigurations.xml
diff --git a/前端/myvoice/app/.gitignore b/前端/test/app/.gitignore
similarity index 100%
rename from 前端/myvoice/app/.gitignore
rename to 前端/test/app/.gitignore
diff --git a/前端/myvoice/app/build.gradle b/前端/test/app/build.gradle
similarity index 91%
rename from 前端/myvoice/app/build.gradle
rename to 前端/test/app/build.gradle
index e2a8eda..86fbf4f 100644
--- a/前端/myvoice/app/build.gradle
+++ b/前端/test/app/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.example.administrator.myvoice"
-        minSdkVersion 26
+        applicationId "com.example.administrator.test"
+        minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
diff --git a/前端/myvoice/app/proguard-rules.pro b/前端/test/app/proguard-rules.pro
similarity index 100%
rename from 前端/myvoice/app/proguard-rules.pro
rename to 前端/test/app/proguard-rules.pro
diff --git a/前端/myvoice/app/src/androidTest/java/com/example/administrator/myvoice/ExampleInstrumentedTest.java b/前端/test/app/src/androidTest/java/com/example/administrator/test/ExampleInstrumentedTest.java
similarity index 82%
rename from 前端/myvoice/app/src/androidTest/java/com/example/administrator/myvoice/ExampleInstrumentedTest.java
rename to 前端/test/app/src/androidTest/java/com/example/administrator/test/ExampleInstrumentedTest.java
index f92b7a5..faf20db 100644
--- a/前端/myvoice/app/src/androidTest/java/com/example/administrator/myvoice/ExampleInstrumentedTest.java
+++ b/前端/test/app/src/androidTest/java/com/example/administrator/test/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.administrator.myvoice;
+package com.example.administrator.test;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.example.administrator.myvoice", appContext.getPackageName());
+        assertEquals("com.example.administrator.test", appContext.getPackageName());
     }
 }
diff --git a/前端/myvoice/app/src/main/AndroidManifest.xml b/前端/test/app/src/main/AndroidManifest.xml
similarity index 91%
rename from 前端/myvoice/app/src/main/AndroidManifest.xml
rename to 前端/test/app/src/main/AndroidManifest.xml
index 693245e..f0de77e 100644
--- a/前端/myvoice/app/src/main/AndroidManifest.xml
+++ b/前端/test/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.administrator.myvoice">
+    package="com.example.administrator.test">
 
     <application
         android:allowBackup="true"
diff --git a/前端/myvoice/app/src/main/java/com/example/administrator/myvoice/IndexActivity.java b/前端/test/app/src/main/java/com/example/administrator/test/IndexActivity.java
similarity index 73%
rename from 前端/myvoice/app/src/main/java/com/example/administrator/myvoice/IndexActivity.java
rename to 前端/test/app/src/main/java/com/example/administrator/test/IndexActivity.java
index ee24919..542cc53 100644
--- a/前端/myvoice/app/src/main/java/com/example/administrator/myvoice/IndexActivity.java
+++ b/前端/test/app/src/main/java/com/example/administrator/test/IndexActivity.java
@@ -1,4 +1,4 @@
-package com.example.administrator.myvoice;
+package com.example.administrator.test;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -8,6 +8,6 @@ public class IndexActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_index);
+        setContentView(R.layout.res_password);
     }
 }
diff --git a/前端/myvoice/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/前端/test/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to 前端/test/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/前端/myvoice/app/src/main/res/drawable/allbackground.png b/前端/test/app/src/main/res/drawable/allbackground.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/allbackground.png
rename to 前端/test/app/src/main/res/drawable/allbackground.png
diff --git a/前端/myvoice/app/src/main/res/drawable/allbackground30.png b/前端/test/app/src/main/res/drawable/allbackground30.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/allbackground30.png
rename to 前端/test/app/src/main/res/drawable/allbackground30.png
diff --git a/前端/myvoice/app/src/main/res/drawable/but.png b/前端/test/app/src/main/res/drawable/but.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/but.png
rename to 前端/test/app/src/main/res/drawable/but.png
diff --git a/前端/myvoice/app/src/main/res/drawable/butterfly.png b/前端/test/app/src/main/res/drawable/butterfly.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/butterfly.png
rename to 前端/test/app/src/main/res/drawable/butterfly.png
diff --git a/前端/myvoice/app/src/main/res/drawable/ic_launcher_background.xml b/前端/test/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/ic_launcher_background.xml
rename to 前端/test/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/前端/myvoice/app/src/main/res/drawable/icon.png b/前端/test/app/src/main/res/drawable/icon.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/icon.png
rename to 前端/test/app/src/main/res/drawable/icon.png
diff --git a/前端/myvoice/app/src/main/res/drawable/indexdiary.png b/前端/test/app/src/main/res/drawable/indexdiary.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/indexdiary.png
rename to 前端/test/app/src/main/res/drawable/indexdiary.png
diff --git a/前端/myvoice/app/src/main/res/drawable/indexmemo.png b/前端/test/app/src/main/res/drawable/indexmemo.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/indexmemo.png
rename to 前端/test/app/src/main/res/drawable/indexmemo.png
diff --git a/前端/myvoice/app/src/main/res/drawable/indexmy.png b/前端/test/app/src/main/res/drawable/indexmy.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/indexmy.png
rename to 前端/test/app/src/main/res/drawable/indexmy.png
diff --git a/前端/myvoice/app/src/main/res/drawable/indexshare.png b/前端/test/app/src/main/res/drawable/indexshare.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/drawable/indexshare.png
rename to 前端/test/app/src/main/res/drawable/indexshare.png
diff --git a/前端/myvoice/app/src/main/res/layout/activity_index.xml b/前端/test/app/src/main/res/layout/activity_index.xml
similarity index 90%
rename from 前端/myvoice/app/src/main/res/layout/activity_index.xml
rename to 前端/test/app/src/main/res/layout/activity_index.xml
index 332c033..a851d77 100644
--- a/前端/myvoice/app/src/main/res/layout/activity_index.xml
+++ b/前端/test/app/src/main/res/layout/activity_index.xml
@@ -8,18 +8,17 @@
 
     <ImageView
         android:id="@+id/butterflypng"
-        android:layout_width="match_parent"
-        android:layout_height="96dp"
-        android:layout_marginBottom="0dp"
+        android:layout_width="463dp"
+        android:layout_height="99dp"
         android:src="@drawable/but"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/indexmemotext" />
+        app:layout_constraintHorizontal_bias="0.493"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/indexdiarypng"
-        android:layout_width="0dp"
+        android:layout_width="140dp"
         android:layout_height="140dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="102dp"
@@ -34,8 +33,8 @@
 
     <ImageView
         android:id="@+id/indexmyng"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginBottom="8dp"
@@ -46,8 +45,8 @@
 
     <ImageView
         android:id="@+id/indexsharepng"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="140dp"
+        android:layout_height="140dp"
         android:layout_marginTop="312dp"
         android:layout_marginBottom="26dp"
         android:src="@drawable/indexshare"
diff --git a/前端/myvoice/app/src/main/res/layout/activity_login.xml b/前端/test/app/src/main/res/layout/activity_login.xml
similarity index 100%
rename from 前端/myvoice/app/src/main/res/layout/activity_login.xml
rename to 前端/test/app/src/main/res/layout/activity_login.xml
diff --git a/前端/myvoice/app/src/main/res/layout/regist.xml b/前端/test/app/src/main/res/layout/regist.xml
similarity index 73%
rename from 前端/myvoice/app/src/main/res/layout/regist.xml
rename to 前端/test/app/src/main/res/layout/regist.xml
index 8cfaba8..44f37ef 100644
--- a/前端/myvoice/app/src/main/res/layout/regist.xml
+++ b/前端/test/app/src/main/res/layout/regist.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:layout_editor_absoluteY="81dp"
-    android:background="@drawable/allbackground">
+    android:background="@drawable/allbackground"
+    tools:layout_editor_absoluteY="25dp">
 
     <ImageView
         android:id="@+id/reg_head"
@@ -28,37 +28,47 @@
         android:layout_height="33dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:gravity="center"
         android:text="出生年月日"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:textSize="17dp"
-        app:layout_constraintEnd_toEndOf="@+id/editPwd"
-        app:layout_constraintStart_toStartOf="@+id/editPwd"
-        tools:layout_editor_absoluteY="182dp"
+        app:layout_constraintBottom_toTopOf="@+id/tableRow"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editPwd"
         tools:ignore="MissingConstraints" />
 
     <EditText
         android:id="@+id/editPhone"
         style="@style/textstyle"
         android:layout_width="250dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
         android:background="#ceefecec"
         android:hint="手机号"
         android:inputType="number"
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="@+id/tableRow"
-        app:layout_constraintStart_toStartOf="@+id/tableRow"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="270dp" />
-        <!-- input password -->
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
+    <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
         android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="密码"
@@ -66,20 +76,17 @@
         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"
-        app:layout_constraintTop_toBottomOf="@+id/editName"
+        app:layout_constraintBottom_toTopOf="@+id/tableRow"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/editName"
         tools:ignore="MissingConstraints" />
-        <!-- the regist button -->
+    <!-- the regist button -->
     <Button
         android:id="@+id/btnRegist"
         style="@style/textstyle"
         android:layout_width="fill_parent"
         android:layout_height="50dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyRegistClick"
@@ -87,10 +94,8 @@
         android:textColor="#fff"
         android:textSize="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnGetcord"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="5dp" />
 
     <EditText
         android:id="@+id/editCode"
@@ -98,20 +103,18 @@
         android:layout_height="45dp"
         android:layout_below="@+id/editPhone"
         android:layout_alignStart="@+id/btnRegist"
+        android:layout_alignLeft="@+id/btnRegist"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:ems="10"
         android:hint="请输入验证码"
         android:inputType="textPersonName"
-        app:layout_constraintEnd_toStartOf="@+id/btnGetcord"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintBottom_toTopOf="@+id/btnRegist"
         app:layout_constraintStart_toStartOf="@+id/editPhone"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="345dp"
-        android:layout_alignLeft="@+id/btnRegist" />
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
 
     <Button
         android:id="@+id/btnGetcord"
@@ -121,11 +124,17 @@
         android:layout_alignEnd="@+id/editPhone"
         android:layout_alignRight="@+id/editPhone"
         android:layout_alignBottom="@+id/editCode"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@color/colorPrimary"
         android:text="获取验证码"
+        app:layout_constraintBottom_toTopOf="@+id/btnRegist"
         app:layout_constraintEnd_toEndOf="@+id/editPhone"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="346dp" />
+        app:layout_constraintStart_toEndOf="@+id/editCode"
+        app:layout_constraintTop_toBottomOf="@+id/tableRow"
+        tools:ignore="MissingConstraints" />
 
     <EditText
         android:id="@+id/editName"
@@ -147,11 +156,16 @@
     <TableRow
         android:id="@+id/tableRow"
         android:layout_width="250dp"
-        android:layout_height="39dp"
+        android:layout_height="43dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#ceefecec"
-        app:layout_constraintEnd_toEndOf="@+id/tvShowDialog"
-        app:layout_constraintStart_toStartOf="@+id/tvShowDialog"
-        tools:layout_editor_absoluteY="223dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints">
 
         <TextView
@@ -185,6 +199,4 @@
     </TableRow>
 
 
-
-
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/前端/myvoice/app/src/main/res/layout/res_password.xml b/前端/test/app/src/main/res/layout/res_password.xml
similarity index 63%
rename from 前端/myvoice/app/src/main/res/layout/res_password.xml
rename to 前端/test/app/src/main/res/layout/res_password.xml
index a2214a8..77a0e9e 100644
--- a/前端/myvoice/app/src/main/res/layout/res_password.xml
+++ b/前端/test/app/src/main/res/layout/res_password.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout 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="@drawable/allbackground">
+    android:background="@drawable/allbackground"
+    tools:layout_editor_absoluteY="25dp">
 
     <TextView
         android:id="@+id/textView"
         style="@style/textstyle"
-        android:layout_width="fill_parent"
-        android:layout_marginStart="0dp"
-        android:layout_marginLeft="0dp"
+        android:layout_width="match_parent"
         android:layout_marginTop="0dp"
         android:layout_marginEnd="0dp"
-        android:layout_marginRight="8dp"
         android:background="#deffffff"
         android:gravity="center"
         android:text="@string/resPwd"
@@ -29,8 +26,10 @@
         android:id="@+id/editName"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入用户名"
@@ -38,17 +37,20 @@
         android:lines="1"
         android:maxLength="11"
         android:singleLine="true"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/editResPwd"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="55dp" />
+        tools:ignore="MissingConstraints" />
     <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请输入新密码"
@@ -56,17 +58,20 @@
         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" />
+        app:layout_constraintBottom_toTopOf="@+id/editResPwd"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editName"
+        tools:ignore="MissingConstraints" />
     <!-- input password again -->
     <EditText
         android:id="@+id/editResPwd"
         style="@style/textstyle"
         android:layout_width="250dp"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请再次输入新密码"
@@ -74,23 +79,27 @@
         android:maxLength="16"
         android:password="true"
         android:singleLine="true"
-        app:layout_constraintBottom_toTopOf="@+id/editName"
-        app:layout_constraintTop_toBottomOf="@+id/editPwd"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="55dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:ignore="MissingConstraints" />
     <!-- the confirm button -->
     <Button
         android:id="@+id/btnConfirm"
         style="@style/textstyle"
         android:layout_width="fill_parent"
         android:layout_height="50dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:background="#e137b7b5"
         android:onClick="OnMyConfirmClick"
         android:text="@string/confirm"
         android:textColor="#fff"
         android:textSize="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editResPwd"
         tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="391dp" />
+        tools:layout_editor_absoluteX="5dp" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/前端/myvoice/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/前端/test/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to 前端/test/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/前端/myvoice/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/前端/test/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to 前端/test/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/前端/test/app/src/main/res/mipmap-hdpi/choosehead.png b/前端/test/app/src/main/res/mipmap-hdpi/choosehead.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6047967649bcea8186c37a783d940176a459005
GIT binary patch
literal 8292
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

literal 0
HcmV?d00001

diff --git a/前端/myvoice/app/src/main/res/mipmap-hdpi/ic_launcher.png b/前端/test/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to 前端/test/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/前端/test/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to 前端/test/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-mdpi/ic_launcher.png b/前端/test/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to 前端/test/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/前端/test/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to 前端/test/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/前端/test/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to 前端/test/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/前端/test/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to 前端/test/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/前端/test/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to 前端/test/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/前端/test/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to 前端/test/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/前端/test/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to 前端/test/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/前端/myvoice/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/前端/test/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from 前端/myvoice/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to 前端/test/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/前端/myvoice/app/src/main/res/values/colors.xml b/前端/test/app/src/main/res/values/colors.xml
similarity index 83%
rename from 前端/myvoice/app/src/main/res/values/colors.xml
rename to 前端/test/app/src/main/res/values/colors.xml
index 13bd265..db0e902 100644
--- a/前端/myvoice/app/src/main/res/values/colors.xml
+++ b/前端/test/app/src/main/res/values/colors.xml
@@ -3,5 +3,5 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
-    <color name="colorwhite">#fff</color>
+    <color name="white">#fff</color>
 </resources>
diff --git a/前端/test/app/src/main/res/values/strings.xml b/前端/test/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..57cd1fa
--- /dev/null
+++ b/前端/test/app/src/main/res/values/strings.xml
@@ -0,0 +1,35 @@
+<resources>
+    <string name="app_name">音之轨迹</string>
+    <string name="login">登录</string>
+    <string name="forgetPwd">忘记密码</string>
+    <string name="startRegist">开始注册</string>
+    <string name="regist">注册</string>
+    <string name="resPwd">重置密码</string>
+    <string name="memotitle">备忘录</string>
+    <string name="back"><![CDATA[<返回]]></string>
+    <string name="data">2018年【测试用】</string>
+    <string name="memot1">1标题标题标题标题标题标题【测试用】</string>
+    <string name="memot2">2标题标题标题标题标题标题【测试用】</string>
+    <string name="memot3">3标题标题标题标题标题标题【测试用】</string>
+    <string name="memot4">4标题标题标题标题标题标题【测试用】</string>
+    <string name="memot5">5标题标题标题标题标题标题【测试用】</string>
+    <string name="data1">2018年1月1日</string>
+    <string name="addmemotitle">新建便签</string>
+    <string name="complete">完成</string>
+    <string name="recordtime1">00:00:00【测试用】</string>
+    <string name="recordtime2">00:00:00【测试用】</string>
+    <string name="xiaoxi">消息</string>
+    <string name="pinglun">评论</string>
+    <string name="tongzhi">通知</string>
+    <string name="zan">赞</string>
+    <string name="newfan">新的粉丝</string>
+    <string name="shouyet">首页</string>
+    <string name="luyint">录音</string>
+    <string name="xiaoxit">消息</string>
+    <string name="messagetext">消息</string>
+    <string name="wodet">我的</string>
+    <string name="diarytitle">日记列表</string>
+    <string name="caogao">草稿</string>
+    <string name="liaotian">聊天</string>
+    <string name="confirm">重置密码</string>
+</resources>
diff --git a/前端/myvoice/app/src/main/res/values/styles.xml b/前端/test/app/src/main/res/values/styles.xml
similarity index 99%
rename from 前端/myvoice/app/src/main/res/values/styles.xml
rename to 前端/test/app/src/main/res/values/styles.xml
index ff60123..9f9acb8 100644
--- a/前端/myvoice/app/src/main/res/values/styles.xml
+++ b/前端/test/app/src/main/res/values/styles.xml
@@ -30,4 +30,5 @@
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
diff --git a/前端/myvoice/app/src/test/java/com/example/administrator/myvoice/ExampleUnitTest.java b/前端/test/app/src/test/java/com/example/administrator/test/ExampleUnitTest.java
similarity index 88%
rename from 前端/myvoice/app/src/test/java/com/example/administrator/myvoice/ExampleUnitTest.java
rename to 前端/test/app/src/test/java/com/example/administrator/test/ExampleUnitTest.java
index 5afd025..3994ea7 100644
--- a/前端/myvoice/app/src/test/java/com/example/administrator/myvoice/ExampleUnitTest.java
+++ b/前端/test/app/src/test/java/com/example/administrator/test/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.example.administrator.myvoice;
+package com.example.administrator.test;
 
 import org.junit.Test;
 
diff --git a/前端/myvoice/build.gradle b/前端/test/build.gradle
similarity index 100%
rename from 前端/myvoice/build.gradle
rename to 前端/test/build.gradle
diff --git a/前端/myvoice/gradle.properties b/前端/test/gradle.properties
similarity index 100%
rename from 前端/myvoice/gradle.properties
rename to 前端/test/gradle.properties
diff --git a/前端/myvoice/gradle/wrapper/gradle-wrapper.jar b/前端/test/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from 前端/myvoice/gradle/wrapper/gradle-wrapper.jar
rename to 前端/test/gradle/wrapper/gradle-wrapper.jar
diff --git a/前端/myvoice/gradle/wrapper/gradle-wrapper.properties b/前端/test/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from 前端/myvoice/gradle/wrapper/gradle-wrapper.properties
rename to 前端/test/gradle/wrapper/gradle-wrapper.properties
diff --git a/前端/myvoice/gradlew b/前端/test/gradlew
similarity index 100%
rename from 前端/myvoice/gradlew
rename to 前端/test/gradlew
diff --git a/前端/myvoice/gradlew.bat b/前端/test/gradlew.bat
similarity index 100%
rename from 前端/myvoice/gradlew.bat
rename to 前端/test/gradlew.bat
diff --git a/前端/myvoice/settings.gradle b/前端/test/settings.gradle
similarity index 100%
rename from 前端/myvoice/settings.gradle
rename to 前端/test/settings.gradle