diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fe72da5070ca010e95601473aa0196fedfeae55a..4e904fd9fde107fc51e97898a9be0c3e551634c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,11 +5,13 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="gradleHome" value="D:\Android\AndroidStudio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/returndatabackground" />
+            <option value="$PROJECT_DIR$/userregister" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e0018f4005375e9be111bb3baeb3e77451802874..bf6235964bb0bf862dfc159d07c67d942f10e728 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,8 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Application_3_Homework.iml" filepath="$PROJECT_DIR$/Application_3_Homework.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/returndatabackground/returndatabackground.iml" filepath="$PROJECT_DIR$/returndatabackground/returndatabackground.iml" />
+      <module fileurl="file://$PROJECT_DIR$/userregister/userregister.iml" filepath="$PROJECT_DIR$/userregister/userregister.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 58e90849f6f9d4443401b3fc336c01cbf94fae31..9747c5bbc7b0dc3b88060ba635d42c8efc0e1258 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.wly.application_3_homework">
 
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/example/wly/application_3_homework/MainActivity.java b/app/src/main/java/com/example/wly/application_3_homework/MainActivity.java
index 1325b0cfbbb1593fad27f4a56152fb397a56d0f3..425aeb62302b845d427b1af292e9146277254378 100644
--- a/app/src/main/java/com/example/wly/application_3_homework/MainActivity.java
+++ b/app/src/main/java/com/example/wly/application_3_homework/MainActivity.java
@@ -19,11 +19,11 @@ import pub.devrel.easypermissions.EasyPermissions;
 public class MainActivity extends AppCompatActivity{
 
     HashMap<String, String> phoneMap = new HashMap<>();
-    EditText etnumber;
-    Button btncallphone;
-    Button btnaddnumber;
-    EditText etnewnumber;
-    EditText etnewcutnumber;
+    EditText knumber;
+    Button call;
+    EditText new_knumber;
+    EditText newnumber;
+    Button addnumber;
 
     @Override
 
@@ -35,50 +35,53 @@ public class MainActivity extends AppCompatActivity{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        etnumber = (EditText) findViewById(R.id.et_number);
-        etnewnumber = (EditText) findViewById(R.id.et_newnumber);
-        etnewcutnumber = (EditText) findViewById(R.id.et_newcutnumber);
-        btncallphone = (Button) findViewById(R.id.btn_callphone);
-        btnaddnumber = (Button) findViewById(R.id.btn_addNumber);
-
-        requestMyappPermission();
         initMapData();
+        knumber = (EditText)findViewById(R.id.et_knumber);
+        call = (Button)findViewById(R.id.btn_call);
+        new_knumber = (EditText)findViewById(R.id.et_new_knumber);
+        newnumber = (EditText)findViewById(R.id.et_newnumber);
+        addnumber = (Button)findViewById(R.id.btn_addnumber);
 
-        btncallphone.setOnClickListener(new View.OnClickListener() {
+        call.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent();
-                intent.setAction(intent.ACTION_CALL);//拨号
-                String cutNumber = etnumber.getText().toString().trim();
-                String phoneNumber = phoneMap.get(cutNumber);
+                intent.setAction(Intent.ACTION_CALL);
+                String kNumber = knumber.getText().toString().trim();
+                String phoneNumber = phoneMap.get(kNumber);
                 intent.setData(Uri.parse("tel:" + phoneNumber));
                 startActivity(intent);
             }
         });
-        btnaddnumber.setOnClickListener(new View.OnClickListener() {
+        addnumber.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String key = etnewcutnumber.getText().toString();
-                String value = etnewnumber.getText().toString();
+                String key = new_knumber.getText().toString();
+                String value = newnumber.getText().toString();
                 phoneMap.put(key,value);
             }
         });
+
+        requestMyappPermission();
+    }
+
+    private void initMapData() {
+        //初始化Map数据
+        phoneMap.put("1","10086");
+        phoneMap.put("3","95533");
+        phoneMap.put("5","95555");
+        phoneMap.put("520","13171206362");
     }
 
     private void requestMyappPermission() {
+        //1—权限数组
         String[] perms = {Manifest.permission.CALL_PHONE};
-        if (!EasyPermissions.hasPermissions(getApplicationContext(), perms)) {
+        //2-判断，是否已经具有这个权限
+        //没有这个权限再申请
+        if(!EasyPermissions.hasPermissions(this,perms)){
+            //参数1-当前应用；参数2-提示信息；参数3-请求码，1,2,3；参数4-权限数组
             EasyPermissions.requestPermissions(this,"call phone",1,perms);
-            //(当前应用，提示信息，请求码：1、2、3 ，权限数组)
         }
     }
 
-    private void initMapData() {
-        phoneMap.put("1", "10086");
-        phoneMap.put("2", "10010");
-    }
-
-
-
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 99b3544f3f856a3d144c8b6530cf16e657ad0d43..1688303c6564908df90e1d6f3c142c08fabcc5b3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,66 +14,37 @@
     <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="输入号码"
-        android:inputType="phone"
-        android:id="@+id/et_number"
-        android:background="#b4b4b4"
+        android:hint="输入快捷号码"
+        android:inputType="number"
+        android:background="#19ced1"
         android:textSize="25dp"
         android:gravity="center"
+        android:id="@+id/et_knumber"
         />
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="拨号"
-        android:id="@+id/btn_callphone"/>
+        android:id="@+id/btn_call"/>
 
-    <LinearLayout
+    <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:text="缩略号码："
-            android:textSize="20dp"
-            />
-        <EditText
-            android:layout_width="0dp"
-            android:layout_weight="7"
-            android:layout_height="wrap_content"
-            android:hint="输入号码"
-            android:inputType="phone"
-            android:id="@+id/et_newcutnumber"
-            />
-    </LinearLayout>
-
-    <LinearLayout
+        android:hint="输入缩略号码"
+        android:inputType="phone"
+        android:id="@+id/et_new_knumber"
+        />
+    <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="wrap_content"
-            android:text="完整号码："
-            android:textSize="20dp"
-            />
-        <EditText
-            android:layout_width="0dp"
-            android:layout_weight="7"
-            android:layout_height="wrap_content"
-            android:hint="输入号码"
-            android:inputType="phone"
-            android:id="@+id/et_newnumber"
-            />
-    </LinearLayout>
-
+        android:hint="输入电话号码"
+        android:inputType="phone"
+        android:id="@+id/et_newnumber"
+        />
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="添加新号码"
-        android:id="@+id/btn_addNumber"
+        android:text="添加快捷号码"
+        android:id="@+id/btn_addnumber"
         />
-
 </LinearLayout>
diff --git a/returndatabackground/.gitignore b/returndatabackground/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..796b96d1c402326528b4ba3c12ee9d92d0e212e9
--- /dev/null
+++ b/returndatabackground/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/returndatabackground/build.gradle b/returndatabackground/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..1f75529949b01d48763bc078c3a203bd043eee46
--- /dev/null
+++ b/returndatabackground/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        applicationId "cn.imust.www.returndatabackground"
+        minSdkVersion 24
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile 'junit:junit:4.12'
+}
diff --git a/returndatabackground/proguard-rules.pro b/returndatabackground/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..41afecb15fcff263b327ba15a07af106a4bdf31d
--- /dev/null
+++ b/returndatabackground/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/returndatabackground/src/androidTest/java/cn/imust/www/returndatabackground/ExampleInstrumentedTest.java b/returndatabackground/src/androidTest/java/cn/imust/www/returndatabackground/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..333b1c50e12d5c949dc500dabbe0f0d22a470a46
--- /dev/null
+++ b/returndatabackground/src/androidTest/java/cn/imust/www/returndatabackground/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package cn.imust.www.returndatabackground;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("cn.imust.www.returndatabackground", appContext.getPackageName());
+    }
+}
diff --git a/returndatabackground/src/main/AndroidManifest.xml b/returndatabackground/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eeb406eab110a0d9411d5f88537cabafa428aff9
--- /dev/null
+++ b/returndatabackground/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cn.imust.www.returndatabackground">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".ColorActivity"></activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/returndatabackground/src/main/java/cn/imust/www/returndatabackground/ColorActivity.java b/returndatabackground/src/main/java/cn/imust/www/returndatabackground/ColorActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..e003e33bb356073b96139bf508c257abe821ea03
--- /dev/null
+++ b/returndatabackground/src/main/java/cn/imust/www/returndatabackground/ColorActivity.java
@@ -0,0 +1,82 @@
+package cn.imust.www.returndatabackground;
+
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class ColorActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_color);
+        Button btnGreen = (Button)findViewById(R.id.btn_green);
+        Button btnRed = (Button)findViewById(R.id.btn_red);
+        Button btnOrange= (Button)findViewById(R.id.btn_orange);
+        btnGreen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击按钮返回主界面
+                //finish结束，自动返回主界面
+                //将背景颜色值带回主界面
+                //1-数据
+                //参数v=发生点击事件的控件
+                ColorDrawable colorDrawable = (ColorDrawable) v.getBackground();
+                int colorValue = colorDrawable.getColor();//回传的数据
+
+                //2-数据-->intent
+                Intent intent = new Intent();
+                intent.putExtra("color",colorValue);
+                //3-intent-->Result带回数据
+                setResult(2,intent);//结果码=2
+                //4-finish
+                finish();
+            }
+        });
+
+        btnRed.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击按钮返回主界面
+                //finish结束，自动返回主界面
+                //将背景颜色值带回主界面
+                //1-数据
+                //参数v=发生点击事件的控件
+                ColorDrawable colorDrawable = (ColorDrawable) v.getBackground();
+                int colorValue = colorDrawable.getColor();//回传的数据
+
+                //2-数据-->intent
+                Intent intent = new Intent();
+                intent.putExtra("color",colorValue);
+                //3-intent-->Result带回数据
+                setResult(2,intent);//结果码=2
+                //4-finish
+                finish();
+            }
+        });
+
+        btnOrange.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击按钮返回主界面
+                //finish结束，自动返回主界面
+                //将背景颜色值带回主界面
+                //1-数据
+                //参数v=发生点击事件的控件
+                ColorDrawable colorDrawable = (ColorDrawable) v.getBackground();
+                int colorValue = colorDrawable.getColor();//回传的数据
+
+                //2-数据-->intent
+                Intent intent = new Intent();
+                intent.putExtra("color",colorValue);
+                //3-intent-->Result带回数据
+                setResult(2,intent);//结果码=2
+                //4-finish
+                finish();
+            }
+        });
+    }
+}
diff --git a/returndatabackground/src/main/java/cn/imust/www/returndatabackground/MainActivity.java b/returndatabackground/src/main/java/cn/imust/www/returndatabackground/MainActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..ed4bf085c47792378014ba061d434bbff3c58637
--- /dev/null
+++ b/returndatabackground/src/main/java/cn/imust/www/returndatabackground/MainActivity.java
@@ -0,0 +1,42 @@
+package cn.imust.www.returndatabackground;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class MainActivity extends AppCompatActivity {
+    private TextView textInfo;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        //找到控件
+        Button btnBackground=(Button)findViewById(R.id.btn_background);
+        textInfo=(TextView)findViewById(R.id.tv_info);
+        btnBackground.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击跳转到颜色界面，选取背景色后，从颜色界面返回
+                //带回颜色数据
+                //带回回传数据的跳转
+                Intent intent=new Intent(MainActivity.this,ColorActivity.class);
+                startActivityForResult(intent,1);//请求码=1
+            }
+        });
+    }
+
+    //从颜色界面返回之后，接收数据
+    //onActivityResult回调方法
+    protected  void onActivityResult(int requestCode,int resultCode,Intent data)
+    {
+        //super.onActivityResult(requestCode,resultCode,data);
+        //获取回传数据
+        //如果没有这个关键字，key=value数据不存在，取出的数值就是第二个参数
+        int colorValue = data.getIntExtra("color",0);
+        //设置文本框背景色，用数据设置
+        textInfo.setBackgroundColor(colorValue);
+    }
+}
diff --git a/returndatabackground/src/main/res/layout/activity_color.xml b/returndatabackground/src/main/res/layout/activity_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..acac395808bfa79c66fb1c48e3f57465341d5935
--- /dev/null
+++ b/returndatabackground/src/main/res/layout/activity_color.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_color2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
+    tools:context="cn.imust.www.returndatabackground.ColorActivity">
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="草绿色"
+        android:background="#6e946f"
+        android:id="@+id/btn_green"/>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="红色"
+        android:background="#ff1028"
+        android:id="@+id/btn_red"/>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="橙色"
+        android:background="#f97f0d"
+        android:id="@+id/btn_orange"/>
+
+</LinearLayout>
diff --git a/returndatabackground/src/main/res/layout/activity_main.xml b/returndatabackground/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..79619795e2a54c3d05f981897f0ff82eb28931f5
--- /dev/null
+++ b/returndatabackground/src/main/res/layout/activity_main.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/activity_main"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
+    tools:context="cn.imust.www.returndatabackground.MainActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="#cac6c6"
+        android:textSize="40sp"
+        android:id="@+id/tv_info"/>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="设置背景颜色"
+        android:id="@+id/btn_background"/>
+</LinearLayout>
diff --git a/returndatabackground/src/main/res/mipmap-hdpi/ic_launcher.png b/returndatabackground/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c
Binary files /dev/null and b/returndatabackground/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/returndatabackground/src/main/res/mipmap-mdpi/ic_launcher.png b/returndatabackground/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c133a0cbd379f5af6dbf1a899a0293ca5eccfad0
Binary files /dev/null and b/returndatabackground/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/returndatabackground/src/main/res/mipmap-xhdpi/ic_launcher.png b/returndatabackground/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d
Binary files /dev/null and b/returndatabackground/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/returndatabackground/src/main/res/mipmap-xxhdpi/ic_launcher.png b/returndatabackground/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7
Binary files /dev/null and b/returndatabackground/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/returndatabackground/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/returndatabackground/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3
Binary files /dev/null and b/returndatabackground/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/returndatabackground/src/main/res/values-w820dp/dimens.xml b/returndatabackground/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63fc816444614bd64f68a372d1f93211628ee51d
--- /dev/null
+++ b/returndatabackground/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/returndatabackground/src/main/res/values/colors.xml b/returndatabackground/src/main/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0
--- /dev/null
+++ b/returndatabackground/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/returndatabackground/src/main/res/values/dimens.xml b/returndatabackground/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47c82246738c4d056e8030d3a259206f42e8e15d
--- /dev/null
+++ b/returndatabackground/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/returndatabackground/src/main/res/values/strings.xml b/returndatabackground/src/main/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89bf2c8b16ee982a11fb20fe5cc635422b403a5c
--- /dev/null
+++ b/returndatabackground/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">returndatabackground</string>
+</resources>
diff --git a/returndatabackground/src/main/res/values/styles.xml b/returndatabackground/src/main/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5885930df6d10edf3d6df40d6556297d11f953da
--- /dev/null
+++ b/returndatabackground/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/returndatabackground/src/test/java/cn/imust/www/returndatabackground/ExampleUnitTest.java b/returndatabackground/src/test/java/cn/imust/www/returndatabackground/ExampleUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..aba645bc4fd5d6461ce5d351cf4f158665e417e3
--- /dev/null
+++ b/returndatabackground/src/test/java/cn/imust/www/returndatabackground/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package cn.imust.www.returndatabackground;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e7b4def49cb53d9aa04228dd3edb14c9e635e003..af29c30f371144da8b3d5856896ef0a68f1a8c39 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':returndatabackground', ':userregister'
diff --git a/userregister/.gitignore b/userregister/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..796b96d1c402326528b4ba3c12ee9d92d0e212e9
--- /dev/null
+++ b/userregister/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/userregister/build.gradle b/userregister/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..c2a3af80f2c8c782d028b36bf7ed07e451e70bb4
--- /dev/null
+++ b/userregister/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        applicationId "cn.imust.www.userregister"
+        minSdkVersion 24
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile 'junit:junit:4.12'
+}
diff --git a/userregister/proguard-rules.pro b/userregister/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..41afecb15fcff263b327ba15a07af106a4bdf31d
--- /dev/null
+++ b/userregister/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/userregister/src/androidTest/java/cn/imust/www/userregister/ExampleInstrumentedTest.java b/userregister/src/androidTest/java/cn/imust/www/userregister/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1eb9ddcd424af5db1b1c15fa6aad1fdbda85620e
--- /dev/null
+++ b/userregister/src/androidTest/java/cn/imust/www/userregister/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package cn.imust.www.userregister;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("cn.imust.www.userregister", appContext.getPackageName());
+    }
+}
diff --git a/userregister/src/main/AndroidManifest.xml b/userregister/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34212cb94d0b1801b8cdb761c6027067716c92ce
--- /dev/null
+++ b/userregister/src/main/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cn.imust.www.userregister">
+
+    <application android:allowBackup="true" android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".ShowInfoActivity" />
+        <activity android:name=".ShopActivity"></activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/userregister/src/main/java/cn/imust/www/userregister/MainActivity.java b/userregister/src/main/java/cn/imust/www/userregister/MainActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b5c1a1ed195b07091425e61370b71adff99a868
--- /dev/null
+++ b/userregister/src/main/java/cn/imust/www/userregister/MainActivity.java
@@ -0,0 +1,49 @@
+package cn.imust.www.userregister;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+public class MainActivity extends AppCompatActivity {
+    Button btnRegister;
+    EditText etName;
+    EditText etPassword;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        btnRegister=(Button)findViewById(R.id.btn_register);
+        etName=(EditText)findViewById(R.id.et_name);
+        etPassword=(EditText)findViewById(R.id.et_password);
+        btnRegister.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击按钮跳转到详情页面，将输入的name和password传递给详情页面
+                //显示意图
+                Intent intent = new Intent(MainActivity.this,ShowInfoActivity.class);
+                //数据放入intent，通过intent传递数据给下一页
+                String name;
+                String password;
+                //用户名密码非空，跳转
+                if(etName.length()==0||etPassword.length()==0){
+                    //空
+                    Toast.makeText(MainActivity.this,"用户名和密码不能为空",Toast.LENGTH_LONG).show();
+                }else{
+                    //非空
+                    name=etName.getText().toString();
+                    password=etPassword.getText().toString();
+                    //key,values
+                    intent.putExtra("username",name);
+                    intent.putExtra("password",password);
+                    startActivity(intent);
+                }
+
+
+            }
+        });
+    }
+}
diff --git a/userregister/src/main/java/cn/imust/www/userregister/ShopActivity.java b/userregister/src/main/java/cn/imust/www/userregister/ShopActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..07613f91a97fb4f66eb144bdb45c8d1c60a0c46f
--- /dev/null
+++ b/userregister/src/main/java/cn/imust/www/userregister/ShopActivity.java
@@ -0,0 +1,39 @@
+package cn.imust.www.userregister;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import cn.imust.www.userregister.bean.WeaponInfo;
+
+public class ShopActivity extends AppCompatActivity {
+   WeaponInfo weaponInfo;
+    TextView tvWeapon;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_shop);
+        //1-初始化武器文本框的值
+        weaponInfo=new WeaponInfo(20,100,30);
+        tvWeapon=(TextView)findViewById(R.id.tv_shop_weapon);
+        tvWeapon.setText("生命值+"+weaponInfo.getLife());
+        tvWeapon.append("\n攻击力+"+weaponInfo.getAttak());
+        tvWeapon.append("\n敏捷度+"+weaponInfo.getSpeed());
+        //返回详情页，带回武器值,点击武器条目返回
+        LinearLayout llWeaponItem = (LinearLayout)findViewById(R.id.ll_weapon_item);
+        llWeaponItem.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //将数据带回
+                Intent intent=new Intent();
+                //对象的属性转换成byte[]，之后进行传输
+                intent.putExtra("weapon",weaponInfo);
+                setResult(2,intent);
+                finish();
+            }
+        });
+    }
+}
diff --git a/userregister/src/main/java/cn/imust/www/userregister/ShowInfoActivity.java b/userregister/src/main/java/cn/imust/www/userregister/ShowInfoActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..6f14d0c3116dc5f914fbbb693ac140f3c6b704e7
--- /dev/null
+++ b/userregister/src/main/java/cn/imust/www/userregister/ShowInfoActivity.java
@@ -0,0 +1,75 @@
+package cn.imust.www.userregister;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import cn.imust.www.userregister.bean.WeaponInfo;
+
+public class ShowInfoActivity extends AppCompatActivity {
+    private TextView tvname;
+    private TextView tvpassword;
+    private Button btnGoshop;
+    private int REQUEST_CODE=1;
+    TextView tvlife;
+    ProgressBar pdLife;
+    TextView tvAttank;
+    ProgressBar pdAttank;
+    TextView tvSpeed;
+    ProgressBar pdSpeed;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_show_info);
+        //取出注册界面传递的数据
+        //数据在intent中
+        final Intent intent=getIntent();//获取注册界面传递的数据
+        //根据关键字取出intent中的数据
+        String name=intent.getStringExtra("username");
+        String password = intent.getStringExtra("password");
+//        Toast.makeText(this,"用户名和密码="+name+password,Toast.LENGTH_LONG).show();
+       // tvName=(TextView)findViewById(R.id.)
+        tvname=(TextView)findViewById(R.id.tv_name);
+        tvpassword=(TextView)findViewById(R.id.tv_password);
+        tvname.setText("用户名："+name);
+        tvpassword.setText("密    码："+password);
+
+        //2-初始化进度条和文本框的值=0
+        //在布局时初始化为0
+
+        //3-点击按钮跳转到商店页面---购买武器
+        btnGoshop=(Button)findViewById(R.id.btn_goshop);
+        btnGoshop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //跳转到商店界面，返回时带回武器属性
+                Intent intent1=new Intent(getApplicationContext(),ShopActivity.class);
+                startActivityForResult(intent1,REQUEST_CODE);
+
+            }
+        });
+    }
+    protected void onActivityResult(int requestCode,int resultCode,Intent data){
+        //4-返回时带回武器属性
+        WeaponInfo weaponInfo=(WeaponInfo) data.getSerializableExtra("weapon");
+        //5-根据购买的武器属性，更新进度条和文本框
+        tvlife=(TextView)findViewById(R.id.tv_info_life);
+        pdLife=(ProgressBar)findViewById(R.id.pd_life);
+        pdLife.setProgress(weaponInfo.getLife());
+        tvlife.setText(""+weaponInfo.getLife());
+
+        tvAttank=(TextView)findViewById(R.id.tv_info_attank);
+        pdAttank=(ProgressBar)findViewById(R.id.pd_attank);
+        pdAttank.setProgress(weaponInfo.getAttak());
+        tvAttank.setText(""+weaponInfo.getAttak());
+
+        tvSpeed=(TextView)findViewById(R.id.tv_info_speed);
+        pdSpeed=(ProgressBar)findViewById(R.id.pd_speed);
+        pdSpeed.setProgress(weaponInfo.getSpeed());
+        tvSpeed.setText(""+weaponInfo.getSpeed());
+    }
+}
diff --git a/userregister/src/main/java/cn/imust/www/userregister/bean/WeaponInfo.java b/userregister/src/main/java/cn/imust/www/userregister/bean/WeaponInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad4058ca52cf8c39a325b084168b3c1b3f34e766
--- /dev/null
+++ b/userregister/src/main/java/cn/imust/www/userregister/bean/WeaponInfo.java
@@ -0,0 +1,41 @@
+package cn.imust.www.userregister.bean;
+
+import java.io.Serializable;
+
+/**
+ * Created by  on 2019/11/18.
+ */
+//Serializable对象序列化的接口
+public class WeaponInfo implements Serializable{
+    private int life;
+    private int attak;
+    private int speed;
+
+    public WeaponInfo(int life, int attak, int speed ) {
+        this.speed = speed;
+        this.attak = attak;
+        this.life = life;
+    }
+    public void setLife(int life) {
+        this.life = life;
+    }
+
+    public void setAttak(int attak) {
+        this.attak = attak;
+    }
+
+    public void setSpeed(int speed) {
+        this.speed = speed;
+    }
+    public int getLife() {
+        return life;
+    }
+
+    public int getAttak() {
+        return attak;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+}
diff --git a/userregister/src/main/res/drawable-hdpi/attank.png b/userregister/src/main/res/drawable-hdpi/attank.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c2cbf4be812dd81ae2543cc6112ca8aca67425
Binary files /dev/null and b/userregister/src/main/res/drawable-hdpi/attank.png differ
diff --git a/userregister/src/main/res/drawable-hdpi/baby.png b/userregister/src/main/res/drawable-hdpi/baby.png
new file mode 100644
index 0000000000000000000000000000000000000000..90f264e0acc690c31411ea6b00b44c96ca66ac53
Binary files /dev/null and b/userregister/src/main/res/drawable-hdpi/baby.png differ
diff --git a/userregister/src/main/res/drawable-hdpi/head.png b/userregister/src/main/res/drawable-hdpi/head.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b291ac862477913e49a3346e6d5487b96c67d3
Binary files /dev/null and b/userregister/src/main/res/drawable-hdpi/head.png differ
diff --git a/userregister/src/main/res/drawable-hdpi/loading.jpg b/userregister/src/main/res/drawable-hdpi/loading.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..82339b6d9917da8b68bb79b8b97cf89493a2e688
Binary files /dev/null and b/userregister/src/main/res/drawable-hdpi/loading.jpg differ
diff --git a/userregister/src/main/res/drawable/button_shape.xml b/userregister/src/main/res/drawable/button_shape.xml
new file mode 100644
index 0000000000000000000000000000000000000000..420bd1581248ae9a4c31fcdbc79e092a46c83fb6
--- /dev/null
+++ b/userregister/src/main/res/drawable/button_shape.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:height="80dp"
+        android:width="40dp"/>
+    <solid android:color="#78e994"/>
+    <stroke android:width="2dp"
+        android:color="#ffffff"/>
+    <corners
+        android:radius="15dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/userregister/src/main/res/layout/activity_main.xml b/userregister/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c75b5483fac1a3deba019c3dd8d6d332aa62f43
--- /dev/null
+++ b/userregister/src/main/res/layout/activity_main.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/activity_main"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:padding="15dp"
+    android:orientation="vertical"
+    android:background="@drawable/loading"
+    tools:context="cn.imust.www.userregister.MainActivity">
+
+    <ImageView
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:background="@drawable/head"
+        android:layout_gravity="center"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="40dp"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:text="用户名"
+            android:textSize="20dp"/>
+        <EditText
+            android:layout_width="0dp"
+            android:layout_weight="8"
+            android:layout_height="wrap_content"
+            android:hint="请输入用户名"
+            android:layout_marginBottom="20dp"
+            android:id="@+id/et_name"/>
+    </LinearLayout>
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"
+        android:hint="密码"
+        android:layout_marginBottom="20dp"
+        android:id="@+id/et_password"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:text="注册"
+        android:background="@drawable/button_shape"
+        android:layout_gravity="center"
+        android:textColor="#ffffff"
+        android:textSize="25sp"
+        android:id="@+id/btn_register"/>
+</LinearLayout>
diff --git a/userregister/src/main/res/layout/activity_shop.xml b/userregister/src/main/res/layout/activity_shop.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f07d525a29546de84b507f5ba6bf3378bfb32fa
--- /dev/null
+++ b/userregister/src/main/res/layout/activity_shop.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_shop"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
+    tools:context="cn.imust.www.userregister.ShopActivity">
+
+    <LinearLayout
+        android:id="@+id/ll_weapon_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="#cccccc"
+        android:padding="5dp">
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/attank"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="双节棍"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_gravity="center"/>
+            <TextView
+                android:id="@+id/tv_shop_weapon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="生命值：\n攻击力:\n敏捷度："
+                />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/userregister/src/main/res/layout/activity_show_info.xml b/userregister/src/main/res/layout/activity_show_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d5caf44abd5411f83250b3a642c23cc3bde75c5c
--- /dev/null
+++ b/userregister/src/main/res/layout/activity_show_info.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_show_info"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
+    tools:context="cn.imust.www.userregister.ShowInfoActivity">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@drawable/baby"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="用户名"
+            android:id="@+id/tv_name"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="密    码"
+            android:id="@+id/tv_password"/>
+        </LinearLayout>
+    </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="主人，快给宠物买装备吧"
+        android:gravity="center"
+        android:textSize="25sp"
+        android:textColor="#cccccc"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="20dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="生命值"
+            />
+        <ProgressBar
+            android:id="@+id/pd_life"
+            android:layout_width="0dp"
+            android:layout_weight="4"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:max="500"
+            android:progress="0"
+            />
+        <TextView
+            android:id="@+id/tv_info_life"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:text="0"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="攻击力"
+            />
+        <ProgressBar
+            android:id="@+id/pd_attank"
+            android:layout_width="0dp"
+            android:layout_weight="4"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:max="500"
+            android:progress="0"
+            />
+        <TextView
+            android:id="@+id/tv_info_attank"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:text="0"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="敏捷度"
+            />
+        <ProgressBar
+            android:id="@+id/pd_speed"
+            android:layout_width="0dp"
+            android:layout_weight="4"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:max="500"
+            android:progress="0"
+            />
+        <TextView
+            android:id="@+id/tv_info_speed"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:text="0"/>
+
+    </LinearLayout>
+    <Button
+        style="@style/RegisterButtonStyle"
+        android:background="@drawable/button_shape"
+        android:id="@+id/btn_goshop"
+        android:text="去商店购买装备"/>
+
+</LinearLayout>
diff --git a/userregister/src/main/res/mipmap-hdpi/ic_launcher.png b/userregister/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c
Binary files /dev/null and b/userregister/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/userregister/src/main/res/mipmap-mdpi/ic_launcher.png b/userregister/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c133a0cbd379f5af6dbf1a899a0293ca5eccfad0
Binary files /dev/null and b/userregister/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/userregister/src/main/res/mipmap-xhdpi/ic_launcher.png b/userregister/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d
Binary files /dev/null and b/userregister/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/userregister/src/main/res/mipmap-xxhdpi/ic_launcher.png b/userregister/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7
Binary files /dev/null and b/userregister/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/userregister/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/userregister/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3
Binary files /dev/null and b/userregister/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/userregister/src/main/res/values-w820dp/dimens.xml b/userregister/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63fc816444614bd64f68a372d1f93211628ee51d
--- /dev/null
+++ b/userregister/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/userregister/src/main/res/values/colors.xml b/userregister/src/main/res/values/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0
--- /dev/null
+++ b/userregister/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/userregister/src/main/res/values/dimens.xml b/userregister/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47c82246738c4d056e8030d3a259206f42e8e15d
--- /dev/null
+++ b/userregister/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/userregister/src/main/res/values/strings.xml b/userregister/src/main/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0ed351785ee3466f5f61d8056a103136209a3334
--- /dev/null
+++ b/userregister/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">userregister</string>
+</resources>
diff --git a/userregister/src/main/res/values/styles.xml b/userregister/src/main/res/values/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6fccc438d3c00b4e8e0f72a9c0662591ae130c74
--- /dev/null
+++ b/userregister/src/main/res/values/styles.xml
@@ -0,0 +1,26 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <!--按钮样式-->
+    <!--android:layout_width="80dp"-->
+    <!--android:layout_height="50dp"-->
+    <!--android:text="注册"-->
+    <!--android:background="@drawable/button_shape"-->
+    <!--android:layout_gravity="center"-->
+    <!--android:textColor="#ffffff"-->
+    <!--android:textSize="25sp"-->
+    <style name="RegisterButtonStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:textSize">25sp</item>
+    </style>
+
+</resources>
diff --git a/userregister/src/test/java/cn/imust/www/userregister/ExampleUnitTest.java b/userregister/src/test/java/cn/imust/www/userregister/ExampleUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..08ed3015f238c7562d888909403c4a0d56d96802
--- /dev/null
+++ b/userregister/src/test/java/cn/imust/www/userregister/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package cn.imust.www.userregister;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file