diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71368a4..98c1aef 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <activity android:name=".ui.MainActivity">
+        <activity android:name=".ui.activity.LoginAndRegistActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -60,9 +60,9 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             ></activity>
-        <activity android:name=".ui.activity.LoginAndRegistActivity"
-            android:screenOrientation="portrait"
-            />
+        <!--<activity android:name=".ui.activity.LoginAndRegistActivity"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--/>-->
         <activity android:name=".ui.activity.MyChildActivity"
             android:screenOrientation="portrait"
             />
@@ -71,6 +71,11 @@
 
            android:windowSoftInputMode="adjustPan|stateHidden"
             />
+        <activity android:name=".ui.activity.binding.CheckInfoActivity"
+            android:screenOrientation="portrait"
+
+           android:windowSoftInputMode="adjustPan|stateHidden"
+            />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
index 792f80b..f17f3c6 100644
--- a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
+++ b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import io.reactivex.Observable;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 
 /**
@@ -12,7 +13,8 @@ import retrofit2.http.POST;
  */
 
 public interface LoginRegisterApi {
-    String url="http://campus.myjxt.com/";
+//    String url="http://campus.myjxt.com/";
+    String url="http://60.190.202.57:1000/";
 
 
     @FormUrlEncoded
@@ -22,10 +24,15 @@ public interface LoginRegisterApi {
             , @Field("password") String password);
 
     @FormUrlEncoded
-    @POST("api/Account/CurrentInfo")
+    @POST("/api/ParentHelper/ParentRegister")
     Observable<JsonObject> registerResult(
-            @Field("grant_type") String grant_type, @Field("username") String username
-            , @Field("idcode") String idCode,@Field("password") String password);
+           @Field("mobile") String username, @Field("captcha") String idCode,@Field("password") String password);
+
+
+
+    @GET("api/Account/ChangePhoneCaptcha")
+    Observable<JsonObject> getidCodeResult(
+           @Field("mobile") String username);
 
     @FormUrlEncoded
     @POST("api/Account/CurrentInfo")
diff --git a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
index 8b383fe..e5ecbeb 100644
--- a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
@@ -8,7 +8,6 @@ import com.shunzhi.parent.api.LoginRegisterApi;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
 
 import io.reactivex.Observable;
-import okhttp3.RequestBody;
 
 /**
  * Created by Administrator on 2018/3/6 0006.
@@ -31,13 +30,14 @@ public  class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste
 
     @Override
     public Observable<JsonObject> getRegisterResult(String adminName, String idCode, String password) {
-        return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).registerResult("idcode",adminName,idCode,password)
+        return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).registerResult(adminName,idCode,password)
                 .compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
 
     @Override
     public Observable<JsonObject> getidCodeResult(String phoneNumber) {
-        return null;
+        return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).getidCodeResult(phoneNumber)
+                .compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
 
 }
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 049dfd3..0d26ce2 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -42,23 +42,23 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                 try {
                     if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
-                        AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME,loginName);
+                        AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName);
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, loginPwd);
-                        RetrofitCreateHelper.getInstance().setAuthorization("Bearer "+jsonObject.get("access_token").getAsString());
+                        RetrofitCreateHelper.getInstance().setAuthorization("Bearer " + jsonObject.get("access_token").getAsString());
                         getUserInfo();
                     } else {
                         ToastUtils.showToast(jsonObject.get("error").getAsString());
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
-                    ToastUtils.showToast("登录失败:"+e.toString());
+                    ToastUtils.showToast("登录失败:" + e.toString());
                 }
             }
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                if (null!=throwable)
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                if (null != throwable)
+                    OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
 //                ToastUtils.showToast(throwable.getMessage());
             }
         }));
@@ -74,18 +74,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         if (mIModel == null || mIView == null) {
             return;
         }
-        mIView.getUserInfo();
+
         mRxManager.register(mIModel.getRegisterResult(adminName, idCode, password).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 //TODO 注册成功返回
-
-
+                Log.e("1111", jsonObject.toString());
+                mIView.getUserInfo();
             }
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
                 ToastUtils.showToast(throwable.getMessage());
+                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
             }
         }));
 
@@ -104,8 +105,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 //TODO 获取验证码返回
-
-
+                Log.e("111", jsonObject.toString());
             }
         }, new Consumer<Throwable>() {
             @Override
@@ -119,7 +119,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
 
     @Override
     public void getUserInfo() {
-        Log.d("77777","getUserInfo=");
+        Log.d("77777", "getUserInfo=");
     }
 
 
diff --git a/app/src/main/res/drawable-xhdpi/arrow_down.png b/app/src/main/res/drawable-xhdpi/arrow_down.png
new file mode 100644
index 0000000..309fc1e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/arrow_down.png differ
diff --git a/app/src/main/res/drawable/rudio_bord.xml b/app/src/main/res/drawable/rudio_bord.xml
new file mode 100644
index 0000000..81cffd2
--- /dev/null
+++ b/app/src/main/res/drawable/rudio_bord.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="#b8b8b9" android:width="1dp"/>
+    <solid android:color="#00000000"/>
+    <corners android:radius="5dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rudiobtn_bord.xml b/app/src/main/res/drawable/rudiobtn_bord.xml
new file mode 100644
index 0000000..77b32bb
--- /dev/null
+++ b/app/src/main/res/drawable/rudiobtn_bord.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="@color/bottomline" android:width="1dp"/>
+    <corners android:radius="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_check_info.xml b/app/src/main/res/layout/activity_check_info.xml
index ba4a6d3..21bdf96 100644
--- a/app/src/main/res/layout/activity_check_info.xml
+++ b/app/src/main/res/layout/activity_check_info.xml
@@ -1,11 +1,160 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
     tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity">
+    <include layout="@layout/top" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/iphone_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="绑定手机号码为"
+                android:textSize="@dimen/sp_18" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
+                android:text="15245252542"
+                android:textColor="@color/textRed"
+                android:textSize="@dimen/sp_18" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/info_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="孩子姓名："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="李小明"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="性      别："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="男"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="年      级："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="初一"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="班      级："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="初一（3）班"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/add_child"
+                android:layout_width="220dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/rudiobtn"
+                android:gravity="center"
+                android:text="确定"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txtsize_title" />
+        </LinearLayout>
+
+
+    </LinearLayout>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_childinfo.xml b/app/src/main/res/layout/activity_create_childinfo.xml
new file mode 100644
index 0000000..109fe3b
--- /dev/null
+++ b/app/src/main/res/layout/activity_create_childinfo.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity">
+    <include layout="@layout/top" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/iphone_layout"
+            android:layout_width="match_parent"
+            android:layout_height="46dp"
+            android:layout_marginTop="30dp"
+            android:orientation="vertical">
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/info_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="孩子姓名："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="李小明"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="性      别："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:drawableRight="@drawable/arrow_down"
+                    android:text="男"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="年      级："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="初一"
+                    android:drawableRight="@drawable/arrow_down"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="班      级："
+                    android:textSize="@dimen/sp_16" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:text="初一（3）班"
+                    android:drawableRight="@drawable/arrow_down"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/add_child"
+                android:layout_width="220dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/rudiobtn"
+                android:gravity="center"
+                android:text="生成孩子账号"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txtsize_title" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_invitecode.xml b/app/src/main/res/layout/activity_invitecode.xml
new file mode 100644
index 0000000..a55e612
--- /dev/null
+++ b/app/src/main/res/layout/activity_invitecode.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/top" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="40dp" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_margin="20dp"
+        android:hint="填写邀请码" />
+
+    <TextView
+        android:id="@+id/add_child"
+        android:layout_width="220dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/rudiobtn"
+        android:gravity="center"
+        android:text="下一步"
+        android:textColor="@color/white"
+        android:textSize="@dimen/txtsize_title" />
+    <TextView
+        android:layout_margin="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="注：填写需要绑定的孩子的邀请码（非合作学校无邀请码，请更换为手机号码验证的方式）
+
+如不知道邀请码请电话拨打：400-123456 进行查询 "
+        android:textSize="@dimen/sp_14"
+        android:textColor="@color/text_color"
+        android:lineSpacingMultiplier="1.5"
+        />
+
+</LinearLayout>
diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java b/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
index 1bfecb1..a4145cb 100644
--- a/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
+++ b/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
@@ -22,7 +22,7 @@ public class OkHttpExceptionUtil {
         try {
             JSONObject json = new JSONObject(responseBody.string());
             Log.d("77777",json.toString());
-            ToastUtils.showToast(json.optString("error"));
+            ToastUtils.showToast(json.optString("message"));
         }  catch (Exception e1) {
             e1.printStackTrace();
         }
--
libgit2 0.21.0