first commit

前端/test/app/src/main/AndroidManifest.xml

@@ -18,6 +18,14 @@
         </activity>
         <activity android:name=".FunctionActivity"></activity>
         <activity android:name=".AboutappActivity"></activity>
+        <activity android:name=".MemoActivity"></activity>
+        <activity android:name=".DiaryActivity"></activity>
+        <activity android:name=".DataActivity"></activity>
+        <activity android:name=".LoginActivity"></activity>
+        <activity android:name=".HelpActivity"></activity>
+        <activity android:name=".PasswordActivity"></activity>
+        <activity android:name=".ContactusActivity"></activity>
+        <activity android:name=".IssueActivity"></activity>
     </application>
 
 </manifest>

前端/test/app/src/main/java/com/example/administrator/test/AboutappActivity.java

@@ -1,8 +1,10 @@
 package com.example.administrator.test;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.ScrollingMovementMethod;
+import android.view.View;
 import android.widget.TextView;
 
 public class AboutappActivity extends AppCompatActivity {
@@ -14,4 +16,10 @@ public class AboutappActivity extends AppCompatActivity {
 // 设置当前textView内容过多的时候可以滚动
         tv.setMovementMethod(ScrollingMovementMethod.getInstance());
     }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, HelpActivity.class);
+        startActivity(intent);
+    }
 }

前端/test/app/src/main/java/com/example/administrator/test/ActivityCollector.java

@@ -0,0 +1,25 @@
+package com.example.administrator.test;
+
+import android.app.Activity;
+
+import java.util.ArrayList;
+import java.util.List;
+//管理活动器，用于退出APP
+public class ActivityCollector {
+    public static List<Activity> activities=new ArrayList<>();
+    public static void addActivity(Activity activity){
+        activities.add(activity);
+    }
+
+    public static void removeActivity(Activity activity){
+        activities.remove(activity);
+    }
+
+    public static void finishAll(){
+        for (Activity activity:activities){
+            if(!activity.isFinishing()){
+                activity.finish();
+            }
+        }
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/ContactusActivity.java

@@ -0,0 +1,19 @@
+package com.example.administrator.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+public class ContactusActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.help_contact);
+    }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, HelpActivity.class);
+        startActivity(intent);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/DataActivity.java

@@ -0,0 +1,19 @@
+package com.example.administrator.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+public class DataActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.my_changedata);
+    }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, IndexActivity.class);
+        startActivity(intent);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/DiaryActivity.java

@@ -0,0 +1,11 @@
+package com.example.administrator.test;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class DiaryActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.index_diary);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/FunctionActivity.java

@@ -1,8 +1,10 @@
 package com.example.administrator.test;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.ScrollingMovementMethod;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -21,4 +23,10 @@ public class FunctionActivity extends AppCompatActivity {
 // 设置当前textView内容过多的时候可以滚动
         tv.setMovementMethod(ScrollingMovementMethod.getInstance());
     }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, HelpActivity.class);
+        startActivity(intent);
+    }
 }

前端/test/app/src/main/java/com/example/administrator/test/HelpActivity.java

@@ -0,0 +1,55 @@
+package com.example.administrator.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+public class HelpActivity extends AppCompatActivity implements View.OnClickListener {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.my_help);
+
+        initUI();
+    }
+
+    private void initUI() {
+        findViewById(R.id.aboutfunction).setOnClickListener(this);
+        findViewById(R.id.aboutapp).setOnClickListener(this);
+        findViewById(R.id.subissue).setOnClickListener(this);
+        findViewById(R.id.contactus).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        Intent intent=new Intent();
+        switch (v.getId()){
+            case R.id.aboutfunction:
+                intent.setClass(getApplicationContext(),FunctionActivity.class);
+                break;
+            case R.id.aboutapp:
+                intent.setClass(getApplicationContext(),AboutappActivity.class);
+                break;
+            case R.id.subissue:
+                intent.setClass(getApplicationContext(),IssueActivity.class);
+                break;
+            case R.id.contactus:
+                intent.setClass(getApplicationContext(),ContactusActivity.class);
+                break;
+            case R.id.passwordchange:
+                intent.setClass(getApplicationContext(),PasswordActivity.class);
+                break;
+            case R.id.help:
+                intent.setClass(getApplicationContext(),HelpActivity.class);
+                break;
+
+        }
+        startActivity(intent);
+    }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, IndexActivity.class);
+        startActivity(intent);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/IndexActivity.java

@@ -1,20 +1,97 @@
 package com.example.administrator.test;
 
+import android.content.Intent;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
 import android.widget.AbsListView;
 import android.widget.TextView;
+import android.support.v7.widget.Toolbar;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Observable;
 
-public class IndexActivity extends AppCompatActivity{
+public class IndexActivity extends AppCompatActivity implements View.OnClickListener {
 
+    private DrawerLayout mDrawerLayout;
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_index);
 
+        Toolbar toolbar=(Toolbar) findViewById(R.id.toolbar) ;
+        setSupportActionBar(toolbar);
+
+        mDrawerLayout=(DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBar actionBar=getSupportActionBar();
+        //if (actionBar!=null){
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setHomeAsUpIndicator(R.mipmap.indexmy);
+            actionBar.setDisplayShowTitleEnabled(false);
+       // }
+
+        //初始化方法
+        initUI();
+    }
+
+    private void initUI() {
+        findViewById(R.id.indexmemopng).setOnClickListener(this);
+        findViewById(R.id.indexdiarypng).setOnClickListener(this);
+//        findViewById(R.id.indexsharepng).setOnClickListener(this);
+        findViewById(R.id.accountchange).setOnClickListener(this);
+        findViewById(R.id.datachange).setOnClickListener(this);
+        findViewById(R.id.passwordchange).setOnClickListener(this);
+        findViewById(R.id.help).setOnClickListener(this);
+//        findViewById(R.id.leaveapp).setOnClickListener(this);
+    }
+
+    public boolean onOptionsItemSelected(MenuItem item){
+        switch (item.getItemId()){
+            case android.R.id.home:
+                mDrawerLayout.openDrawer(GravityCompat.START);
+                break;
+        }
+        return true;
     }
+
+    @Override
+    public void onClick(View v) {
+        Intent intent=new Intent();
+        switch (v.getId()){
+            case R.id.indexmemopng:
+                //跳转到备忘录界面
+                intent.setClass(getApplicationContext(),MemoActivity.class);
+                break;
+            case R.id.indexdiarypng:
+                intent.setClass(getApplicationContext(),DiaryActivity.class);
+                break;
+                //进入朋友圈
+//            case R.id.indexsharepng:
+//                break;
+            case R.id.accountchange:
+                intent.setClass(getApplicationContext(),LoginActivity.class);
+                break;
+            case R.id.datachange:
+                intent.setClass(getApplicationContext(),DataActivity.class);
+                break;
+            case R.id.passwordchange:
+                intent.setClass(getApplicationContext(),PasswordActivity.class);
+                break;
+            case R.id.help:
+                intent.setClass(getApplicationContext(),HelpActivity.class);
+                break;
+                //退出APP
+//            case R.id.leaveapp:
+//                intent.setClass(getApplicationContext(),HelpActivity.class);
+//                break;
+
+        }
+        startActivity(intent);
+    }
+
 }

前端/test/app/src/main/java/com/example/administrator/test/IssueActivity.java

@@ -0,0 +1,19 @@
+package com.example.administrator.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+public class IssueActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.help_issue);
+    }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, HelpActivity.class);
+        startActivity(intent);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/LoginActivity.java

@@ -0,0 +1,11 @@
+package com.example.administrator.test;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class LoginActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+    }
+}

前端/test/app/src/main/java/com/example/administrator/test/PasswordActivity.java

@@ -0,0 +1,19 @@
+package com.example.administrator.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+public class PasswordActivity extends AppCompatActivity {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.res_password);
+    }
+
+    public void back(View view){
+        Intent intent = new Intent();
+        intent.setClass(this, IndexActivity.class);
+        startActivity(intent);
+    }
+}

前端/test/app/src/main/res/layout/activity_index.xml

@@ -5,8 +5,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/indexbackground">
+    android:background="@drawable/allbackground30"
+    android:id="@+id/drawer_layout">
+
+
     <FrameLayout
+
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
@@ -14,6 +18,15 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="#00f6f7f6"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+            </android.support.v7.widget.Toolbar>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -23,7 +36,8 @@
                     android:id="@+id/indexmemopng"
                     android:layout_width="140dp"
                     android:layout_height="140dp"
-                    android:src="@drawable/indexmemo" />
+                    android:src="@drawable/indexmemo"
+                    android:layout_gravity="right"/>
 
                 <TextView
                     android:id="@+id/indexmemotext"
@@ -32,7 +46,7 @@
                     android:text="备忘录"
                     android:textColor="#000"
                     android:textSize="20dp"
-                    android:layout_gravity="left"
+                    android:layout_gravity="right"
                     android:textAlignment="center"/>
             </LinearLayout>
 
@@ -67,7 +81,7 @@
                     android:layout_width="140dp"
                     android:layout_height="140dp"
                     android:src="@drawable/indexshare"
-                    android:layout_gravity="right"/>
+                    android:layout_gravity="left"/>
                 <TextView
                     android:id="@+id/indexsharetext"
                     android:layout_width="140dp"
@@ -75,25 +89,9 @@
                     android:text="分享时刻"
                     android:textColor="#000"
                     android:textSize="20dp"
-                    android:layout_gravity="right"
+                    android:layout_gravity="left"
                     android:textAlignment="center"/>
             </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5">
-                <ImageView
-                    android:id="@+id/indexmyng"
-                    android:layout_width="90dp"
-                    android:layout_height="90dp"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:src="@drawable/indexmy"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    tools:ignore="MissingConstraints" />
-            </LinearLayout>
         </LinearLayout>
     </FrameLayout>
 
@@ -102,7 +100,8 @@
         android:layout_height="match_parent"
         android:background="#fff"
         android:orientation="vertical"
-        android:layout_gravity="start">
+        android:layout_gravity="start"
+        android:clickable="true">
 
         <TextView
             android:layout_width="match_parent"
@@ -118,12 +117,13 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.2" />
+            <!--头像-->
             <ImageView
                 android:id="@+id/touxiang"
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:src="@mipmap/choosehead" />
-            <!--用户名!-->
+            <!--用户名-->
             <TextView
                 android:id="@+id/yonghuming"
                 android:layout_width="wrap_content"
@@ -150,11 +150,12 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:background="#c1ffffff">
-
+            <!--切换账号跳登录界面-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:id="@+id/accountchange">
 
                 <TextView
                     android:layout_width="0dp"
@@ -190,7 +191,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:id="@+id/datachange">
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -226,7 +228,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:id="@+id/passwordchange">
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -262,7 +265,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:id="@+id/help">
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -297,18 +301,18 @@
 
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="0.5" />
-        <Button
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:background="#e137b7b5"
-            android:text="退出APP"
-            android:textSize="20dp"
-            android:textColor="#fff"/>
+        <!--<TextView-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="0dp"-->
+            <!--android:layout_weight="0.5" />-->
+        <!--<Button-->
+            <!--android:id="@+id/leaveapp"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_gravity="right"-->
+            <!--android:background="#e137b7b5"-->
+            <!--android:text="退出APP"-->
+            <!--android:textSize="20dp"-->
+            <!--android:textColor="#fff"/>-->
     </LinearLayout>
 </android.support.v4.widget.DrawerLayout>

前端/test/app/src/main/res/layout/help_aboutapp.xml

@@ -19,7 +19,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"

前端/test/app/src/main/res/layout/help_contact.xml

@@ -19,7 +19,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"
@@ -31,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="帮助与反馈"
+            android:text="联系我们"
             android:textColor="#fff"
             android:textSize="25dp" />
 

前端/test/app/src/main/res/layout/help_function.xml

@@ -19,7 +19,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"

前端/test/app/src/main/res/layout/help_issue.xml

@@ -19,7 +19,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"
@@ -31,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="帮助与反馈"
+            android:text="问题与反馈"
             android:textColor="#fff"
             android:textSize="25dp" />
 

前端/test/app/src/main/res/layout/index_diary.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="这是日记哈哈哈"
+        android:textSize="40dp"/>
+
+</android.support.constraint.ConstraintLayout>

前端/test/app/src/main/res/layout/my_changedata.xml

@@ -18,7 +18,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"

前端/test/app/src/main/res/layout/my_help.xml

@@ -19,7 +19,8 @@
             android:id="@+id/backmypng"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:src="@drawable/whiteback" />
+            android:src="@drawable/whiteback"
+            android:onClick="back"/>
 
         <TextView
             android:layout_width="0dp"
@@ -92,7 +93,8 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="#c1ffffff"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:id="@+id/aboutfunction">
 
             <TextView
                 android:layout_width="0dp"
@@ -124,7 +126,8 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="#c1ffffff"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:id="@+id/aboutapp">
 
             <TextView
                 android:layout_width="0dp"
@@ -196,7 +199,8 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="#c1ffffff"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:id="@+id/subissue">
 
             <TextView
                 android:layout_width="0dp"
@@ -228,7 +232,8 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="#c1ffffff"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:id="@+id/contactus">
 
             <TextView
                 android:layout_width="0dp"

前端/test/app/src/main/res/layout/regist.xml

@@ -25,7 +25,7 @@
     <TextView
         android:id="@+id/tvShowDialog"
         android:layout_width="254dp"
-        android:layout_height="33dp"
+        android:layout_height="50dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="8dp"
@@ -156,7 +156,7 @@
     <TableRow
         android:id="@+id/tableRow"
         android:layout_width="250dp"
-        android:layout_height="43dp"
+        android:layout_height="50dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"

前端/test/app/src/main/res/layout/res_password.xml

@@ -7,48 +7,67 @@
     android:background="@drawable/allbackground"
     tools:layout_editor_absoluteY="25dp">
 
-    <TextView
-        android:id="@+id/textView"
-        style="@style/textstyle"
+    <LinearLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="#deffffff"
-        android:gravity="center"
-        android:text="@string/resPwd"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="MissingConstraints" />
+        android:layout_height="50dp"
+        android:background="#01644a"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/backmypng"
+            android:layout_width="30dp"
+            android:layout_height="match_parent"
+            android:onClick="back"
+            android:src="@drawable/whiteback" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/onetext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:text="重置密码"
+            android:textColor="#fff"
+            android:textSize="25dp" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:layout_width="30dp"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <!-- input phone -->
     <TextView
         android:id="@+id/editName"
         style="@style/textstyle"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#00efecec"
         android:inputType="number"
         android:maxLength="11"
         android:singleLine="true"
         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" />
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="5dp" />
     <!-- input password -->
     <EditText
         android:id="@+id/editPwd"
         style="@style/textstyle"
         android:layout_width="match_parent"
         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="请输入新密码"
@@ -57,19 +76,16 @@
         android:password="true"
         android:singleLine="true"
         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" />
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="25dp" />
     <!-- input password again -->
     <EditText
         android:id="@+id/editResPwd"
         style="@style/textstyle"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginStart="8dp"
+        android:layout_height="53dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:background="#ceefecec"
         android:hint="请再次输入新密码"
@@ -78,10 +94,9 @@
         android:password="true"
         android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        tools:ignore="MissingConstraints" />
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="5dp" />
     <!-- the confirm button -->
     <Button
         android:id="@+id/btnConfirm"
@@ -89,15 +104,13 @@
         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="5dp" />
+        tools:layout_editor_absoluteX="9dp" />
 
 </android.support.constraint.ConstraintLayout>

前端/test/app/src/main/res/values/mystring.xml

@@ -24,26 +24,4 @@
 隐私权政策：我们竭尽全力通过合理有效的方法保证用户的所有消息的安全性，隐私性，防止用户的信息泄露，损毁，丢失；
         我们为您提供便利的信息管理选项，以便您做出合适的选择，管理您的个人信息；我们严格遵照法律法规，保护您的信息传输安全，仅审核公开发表的信息，收集必要的信息。\n
 创作团队：由湖南师范大学16级在校生团队制作</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>
 </resources>

前端/test/app/src/main/res/values/strings.xml

@@ -7,8 +7,6 @@
     <string name="resPwd">重置密码</string>
     <string name="memotitle">备忘录</string>
     <string name="back"><![CDATA[<返回]]></string>
-
-    <string name="caogao">草稿</string>
-    <string name="liaotian">聊天</string>
     <string name="confirm">重置密码</string>
+
 </resources>