Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

陶汉栋
2 parents c8a5db9f d878a8a1
Showing 13 changed files with 121 additions and 37 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
app/src/main/res/drawable/rudiobtn_unclick.xml
app/src/main/res/layout/activity_webview.xml
app/src/main/res/layout/fragment_login_and_regist.xml
@@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter&lt;ChildBean&gt; {
     @Override
     public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(context).inflate(R.layout.activity_web_view, null);
+        View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null);
         return new MyViewHolder(view);
     }
@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {
         //更新用户信息
         void getUserInfo(int type);
+        void showerror(String error);
     }
@@ -41,7 +41,7 @@ public interface MyChildContract {
     interface IMyChildView extends IBaseActivity {
         void updateChildList(CurrentBean currentBean);
-        void addChildSuccess();
+        void addChildSuccess(String account,String password);
         void showClass(List<ChildClass>list);
         void showError(String error);
@@ -17,11 +17,15 @@ import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
 import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
 import com.shunzhi.parent.util.Utils;
+import org.json.JSONObject;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import io.reactivex.functions.Consumer;
+import okhttp3.ResponseBody;
 import retrofit2.HttpException;
+import retrofit2.Response;
 import timber.log.Timber;
 /**
@@ -35,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
     @Override
     public void loginResult(final String loginName, final String loginPwd) {
         if (!isMate(loginName, REGEX_MOBILE)) {
-            ToastUtils.showToast("请输入正确的手机号！！");
+
+            mIView.showerror("请输入正确的手机号！！");
             return;
         }
@@ -64,9 +69,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                if (null != throwable)
-                    OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
-//                ToastUtils.showToast(throwable.getMessage());
+                Response response = ((HttpException)throwable).response();
+                if (response==null)return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody==null)return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    if(TextUtils.isEmpty(json.optString("error"))){
+                        mIView.showerror(json.optString("message"));
+                        return;
+                    }
+                    mIView.showerror(json.optString("error"));
+                }  catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
         }));
@@ -95,8 +112,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                LoginAndRegistFragment.progressDialog.dismiss();
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                Response response = ((HttpException)throwable).response();
+                if (response==null)return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody==null)return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    mIView.showerror(json.optString("message"));
+                }  catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
         }));
@@ -160,8 +186,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                LoginAndRegistFragment.progressDialog.dismiss();
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                Response response = ((HttpException)throwable).response();
+                if (response==null)return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody==null)return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    mIView.showerror(json.optString("message"));
+                }  catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+
+//                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
             }
         }));
     }
 package com.shunzhi.parent.presenter.mine;
+import android.util.Log;
+
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.utils.OkHttpExceptionUtil;
 import com.share.mvpsdk.utils.ToastUtils;
@@ -47,14 +49,14 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                Response response = ((HttpException)throwable).response();
-                if (response==null)return;
+                Response response = ((HttpException) throwable).response();
+                if (response == null) return;
                 ResponseBody responseBody = response.errorBody();
-                if (responseBody==null)return;
+                if (responseBody == null) return;
                 try {
                     JSONObject json = new JSONObject(responseBody.string());
                     mIView.showError(json.optString("message"));
-                }  catch (Exception e1) {
+                } catch (Exception e1) {
                     e1.printStackTrace();
                 }
@@ -64,12 +66,19 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
     }
     @Override
-    public void addChild( int sex , String studentName,int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
-        mRxManager.register(mIModel.addChildResult(sex,studentName,parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
+    public void addChild(int sex, String studentName, int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
+        mRxManager.register(mIModel.addChildResult(sex, studentName, parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 ToastUtils.showToast("绑定孩子成功");
-                mIView.addChildSuccess();
+                Log.e("asdasda", jsonObject.get("data").toString());
+                if (jsonObject.get("data").toString().equals("null")) {
+                    mIView.addChildSuccess("", "");
+                } else {
+                    JsonObject data = jsonObject.getAsJsonObject("data");
+                    mIView.addChildSuccess(data.get("account").getAsString(), data.get("password").getAsString());
+                }
+
             }
         }, new Consumer<Throwable>() {
             @Override
@@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
     }
     @Override
-    public void addChildSuccess() {
+    public void addChildSuccess(String account,String  password) {
     }
@@ -151,10 +151,10 @@ public class CheckInfoActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyC
     }
     @Override
-    public void addChildSuccess() {
+    public void addChildSuccess(String account,String  password) {
 //        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
         WebViewActivity.getInstance(CheckInfoActivity.this,
-                AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+
+                AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
                         AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
         finish();
@@ -132,8 +132,9 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity&lt;MyChildContra
     }
     @Override
-    public void addChildSuccess() {
-        WebViewActivity.getInstance(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT);
+    public void addChildSuccess(String account,String password) {
+        WebViewActivity.startShow(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
+                AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT,account,password,child_name.getText().toString());
         finish();
     }
@@ -22,13 +22,14 @@ import com.share.mvpsdk.utils.NetworkConnectionUtils;
 import com.share.mvpsdk.widgets.NestedScrollWebView;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.MainActivity;
 public class WebViewActivity extends BaseCompatActivity {
     NestedScrollWebView nesteScrollWebView;
     LinearLayout binding_success, binding_success2;
     ImageView close_btn;
-    TextView tv_info,zuoye,title_web;
+    TextView tv_info, zuoye, title_web;
     int type;
@@ -41,14 +42,25 @@ public class WebViewActivity extends BaseCompatActivity {
         context.startActivity(intent);
     }
+    public static void startShow(Context context, String url, int type, String account, String password, String name) {
+        Intent intent = new Intent(context, WebViewActivity.class);
+        intent.putExtra("url", url);
+        intent.putExtra("type", type);
+        intent.putExtra("account", account);
+        intent.putExtra("password", password);
+        intent.putExtra("name", name);
+        context.startActivity(intent);
+    }
+
+
     @Override
     protected void initView(Bundle savedInstanceState) {
-        binding_success=findViewById(R.id.binding_success);
+        binding_success = findViewById(R.id.binding_success);
-        binding_success=findViewById(R.id.binding_success1);
+        binding_success = findViewById(R.id.binding_success1);
-        binding_success2=findViewById(R.id.binding_success2);
+        binding_success2 = findViewById(R.id.binding_success2);
         close_btn = findViewById(R.id.close_btn);
         tv_info = findViewById(R.id.tv_info);
         zuoye = findViewById(R.id.zuoye);
@@ -78,13 +90,18 @@ public class WebViewActivity extends BaseCompatActivity {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.VISIBLE);
             title_web.setVisibility(View.GONE);
+            String account = getIntent().getStringExtra("account");
+            String name = getIntent().getStringExtra("name");
+            String password = getIntent().getStringExtra("password");
+
+            tv_info.setText("生成孩子“" + name + "”账号为:" + account + "，初始密码为：" + password + "（与账号相同）。孩子可以下载“汇作业”app进行使用");
         } else if (type == AppConfig.ORDER_CENTER) {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.GONE);
             title_web.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.GONE);
             title_web.setVisibility(View.GONE);
@@ -107,6 +124,7 @@ public class WebViewActivity extends BaseCompatActivity {
             nesteScrollWebView.goBack();
         } else {
             super.onBackPressedSupport();
+            startActivity(new Intent().setClass(this, MainActivity.class));
         }
     }
@@ -130,6 +148,7 @@ public class WebViewActivity extends BaseCompatActivity {
             });
         }
     }
+
     // 调起支付宝并跳转到指定页面
     private void startAlipayActivity(String url) {
         Intent intent;
@@ -152,8 +171,8 @@ public class WebViewActivity extends BaseCompatActivity {
         nesteScrollWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                Log.d("666666","url="+url);
-                if (url.startsWith("http"))view.loadUrl(url);
+                Log.d("666666", "url=" + url);
+                if (url.startsWith("http")) view.loadUrl(url);
 //                if (url.contains("platformapi/startapp")) {
 //                    startAlipayActivity(url);
 //                     android  6.0 两种方式获取intent都可以跳转支付宝成功,7.1测试不成功
@@ -174,6 +193,13 @@ public class WebViewActivity extends BaseCompatActivity {
                 // html加载完成之后，添加监听图片的点击js函数
                 addWebImageClickListner(view);
 //                toolbar.setTitle(getToolbarTitle());
+                if (nesteScrollWebView.canGoBack()) {
+                    binding_success.setVisibility(View.GONE);
+                    binding_success2.setVisibility(View.GONE);
+                    title_web.setVisibility(View.GONE);
+                } else {
+
+                }
             }
             @Override
@@ -212,7 +238,6 @@ public class WebViewActivity extends BaseCompatActivity {
                 }
             }
         });
-
         nesteScrollWebView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
@@ -231,6 +256,8 @@ public class WebViewActivity extends BaseCompatActivity {
     }
+
+
     /**
      * 初始化WebSetting
      *
@@ -179,6 +179,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
     }
     @Override
+    public void showerror(String error) {
+        progressDialog.dismiss();
+        ToastUtils.showToast(error);
+    }
+
+    @Override
     public void onClick(View v) {
         if (v == loginAndRegister) {
             progressDialog.show();
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke android:color="#00000000" android:width="1dp"/>
-    <solid android:color="@color/xueqing_blue" />
+    <solid android:color="@color/bottomline" />
     <corners android:radius="5dp"/>
 </shape>
 \ No newline at end of file
@@ -12,12 +12,14 @@
         >
         <ImageView
             android:id="@+id/close_btn"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/close"
-            />
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingLeft="@dimen/size_dp_15"
+            android:src="@drawable/back"
+            android:paddingRight="@dimen/size_dp_15"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/textSize16" />
         <TextView
             android:id="@+id/title_web"
             android:layout_width="wrap_content"
@@ -200,6 +200,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40dp"
                 android:background="@drawable/rudiobtn_unclick"
+                android:enabled="false"
                 android:gravity="center"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp"
	@@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter<ChildBean> {		@@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter<ChildBean> {
33		33
34	@Override	34	@Override
35	public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {	35	public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
36	- View view = LayoutInflater.from(context).inflate(R.layout.activity_web_view, null);	36	+ View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null);
37	return new MyViewHolder(view);	37	return new MyViewHolder(view);
38	}	38	}
39		39
	@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {		@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {
45		45
46	//更新用户信息	46	//更新用户信息
47	void getUserInfo(int type);	47	void getUserInfo(int type);
		48	+ void showerror(String error);
48		49
49	}	50	}
50		51
	@@ -41,7 +41,7 @@ public interface MyChildContract {		@@ -41,7 +41,7 @@ public interface MyChildContract {
41		41
42	interface IMyChildView extends IBaseActivity {	42	interface IMyChildView extends IBaseActivity {
43	void updateChildList(CurrentBean currentBean);	43	void updateChildList(CurrentBean currentBean);
44	- void addChildSuccess();	44	+ void addChildSuccess(String account,String password);
45	void showClass(List<ChildClass>list);	45	void showClass(List<ChildClass>list);
46	void showError(String error);	46	void showError(String error);
47		47
	@@ -17,11 +17,15 @@ import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;		@@ -17,11 +17,15 @@ import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
17	import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;	17	import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
18	import com.shunzhi.parent.util.Utils;	18	import com.shunzhi.parent.util.Utils;
19		19
		20	+import org.json.JSONObject;
		21	+
20	import java.util.regex.Matcher;	22	import java.util.regex.Matcher;
21	import java.util.regex.Pattern;	23	import java.util.regex.Pattern;
22		24
23	import io.reactivex.functions.Consumer;	25	import io.reactivex.functions.Consumer;
		26	+import okhttp3.ResponseBody;
24	import retrofit2.HttpException;	27	import retrofit2.HttpException;
		28	+import retrofit2.Response;
25	import timber.log.Timber;	29	import timber.log.Timber;
26		30
27	/**	31	/**
	@@ -35,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre		@@ -35,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
35	@Override	39	@Override
36	public void loginResult(final String loginName, final String loginPwd) {	40	public void loginResult(final String loginName, final String loginPwd) {
37	if (!isMate(loginName, REGEX_MOBILE)) {	41	if (!isMate(loginName, REGEX_MOBILE)) {
38	- ToastUtils.showToast("请输入正确的手机号！！");	42	+
		43	+ mIView.showerror("请输入正确的手机号！！");
39	return;	44	return;
40	}	45	}
41		46
	@@ -64,9 +69,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre		@@ -64,9 +69,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
64	}, new Consumer<Throwable>() {	69	}, new Consumer<Throwable>() {
65	@Override	70	@Override
66	public void accept(Throwable throwable) throws Exception {	71	public void accept(Throwable throwable) throws Exception {
67	- if (null != throwable)
68	- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
69	-// ToastUtils.showToast(throwable.getMessage());	72	+ Response response = ((HttpException)throwable).response();
		73	+ if (response==null)return;
		74	+ ResponseBody responseBody = response.errorBody();
		75	+ if (responseBody==null)return;
		76	+ try {
		77	+ JSONObject json = new JSONObject(responseBody.string());
		78	+// ToastUtils.showToast(json.optString("message")+"json="+json);
		79	+ if(TextUtils.isEmpty(json.optString("error"))){
		80	+ mIView.showerror(json.optString("message"));
		81	+ return;
		82	+ }
		83	+ mIView.showerror(json.optString("error"));
		84	+ } catch (Exception e1) {
		85	+ e1.printStackTrace();
		86	+ }
70	}	87	}
71	}));	88	}));
72		89
	@@ -95,8 +112,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre		@@ -95,8 +112,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
95	}, new Consumer<Throwable>() {	112	}, new Consumer<Throwable>() {
96	@Override	113	@Override
97	public void accept(Throwable throwable) throws Exception {	114	public void accept(Throwable throwable) throws Exception {
98	- LoginAndRegistFragment.progressDialog.dismiss();
99	- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);	115	+ Response response = ((HttpException)throwable).response();
		116	+ if (response==null)return;
		117	+ ResponseBody responseBody = response.errorBody();
		118	+ if (responseBody==null)return;
		119	+ try {
		120	+ JSONObject json = new JSONObject(responseBody.string());
		121	+// ToastUtils.showToast(json.optString("message")+"json="+json);
		122	+ mIView.showerror(json.optString("message"));
		123	+ } catch (Exception e1) {
		124	+ e1.printStackTrace();
		125	+ }
100	}	126	}
101	}));	127	}));
102		128
	@@ -160,8 +186,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre		@@ -160,8 +186,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
160	}, new Consumer<Throwable>() {	186	}, new Consumer<Throwable>() {
161	@Override	187	@Override
162	public void accept(Throwable throwable) throws Exception {	188	public void accept(Throwable throwable) throws Exception {
163	- LoginAndRegistFragment.progressDialog.dismiss();
164	- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);	189	+ Response response = ((HttpException)throwable).response();
		190	+ if (response==null)return;
		191	+ ResponseBody responseBody = response.errorBody();
		192	+ if (responseBody==null)return;
		193	+ try {
		194	+ JSONObject json = new JSONObject(responseBody.string());
		195	+// ToastUtils.showToast(json.optString("message")+"json="+json);
		196	+ mIView.showerror(json.optString("message"));
		197	+ } catch (Exception e1) {
		198	+ e1.printStackTrace();
		199	+ }
		200	+
		201	+// OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
165	}	202	}
166	}));	203	}));
167	}	204	}
	@@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi		@@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
146	}	146	}
147		147
148	@Override	148	@Override
149	- public void addChildSuccess() {	149	+ public void addChildSuccess(String account,String password) {
150		150
151	}	151	}
152		152
	@@ -151,10 +151,10 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC		@@ -151,10 +151,10 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
151	}	151	}
152		152
153	@Override	153	@Override
154	- public void addChildSuccess() {	154	+ public void addChildSuccess(String account,String password) {
155	// WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);	155	// WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
156	WebViewActivity.getInstance(CheckInfoActivity.this,	156	WebViewActivity.getInstance(CheckInfoActivity.this,
157	- AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+	157	+ AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
158	AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);	158	AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
159	finish();	159	finish();
160		160
	@@ -179,6 +179,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist		@@ -179,6 +179,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
179	}	179	}
180		180
181	@Override	181	@Override
		182	+ public void showerror(String error) {
		183	+ progressDialog.dismiss();
		184	+ ToastUtils.showToast(error);
		185	+ }
		186	+
		187	+ @Override
182	public void onClick(View v) {	188	public void onClick(View v) {
183	if (v == loginAndRegister) {	189	if (v == loginAndRegister) {
184	progressDialog.show();	190	progressDialog.show();
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">	2	<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
3	<stroke android:color="#00000000" android:width="1dp"/>	3	<stroke android:color="#00000000" android:width="1dp"/>
4	- <solid android:color="@color/xueqing_blue" />	4	+ <solid android:color="@color/bottomline" />
5	<corners android:radius="5dp"/>	5	<corners android:radius="5dp"/>
6	</shape>	6	</shape>
7	\ No newline at end of file	7	\ No newline at end of file