no message

姚旭斌
1 parent 6684682d
Showing 7 changed files with 187 additions and 12 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
app/src/main/java/com/shunzhi/parent/model/loginandregister/loginAndRegisterModel.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
app/src/main/res/layout/fragment_login_and_regist.xml
 package com.shunzhi.parent.contract.loginandregister;
+import com.google.gson.JsonObject;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.IBaseFragment;
 import com.share.mvpsdk.base.IBaseModel;
+import io.reactivex.Observable;
+
 /**
  * Created by Administrator on 2018/3/6 0006.
  */
@@ -13,11 +16,22 @@ public interface LoginAndRegisterContract {
     abstract  class  LoginPresenter extends BasePresenter<ILoginModel,ILoginView>{
         public abstract void loginResult(String loginName,String loginPwd);
+        public abstract void registerResult(String adminName,String idCode,String password);
+
+        public abstract  void idCodeResult(String phoneNumber);
+
         public abstract void getUserInfo();
     }
     interface  ILoginModel extends IBaseModel{
+        Observable<JsonObject> getLoginResult(String loginName, String loginPed);
+
+        Observable<JsonObject> getRegisterResult(String adminName,String idCode,String password);
+
+        Observable<JsonObject> getidCodeResult(String phoneNumber);
+        //获取登录用户信息
+//        Observable<CurrentBean> getUserInfo();
     }
     interface ILoginView extends IBaseFragment {
@@ -0,0 +1,37 @@
+package com.shunzhi.parent.model.loginandregister;
+
+import com.google.gson.JsonObject;
+import com.share.mvpsdk.base.BaseModel;
+import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
+
+import io.reactivex.Observable;
+
+/**
+ * Created by Administrator on 2018/3/6 0006.
+ */
+
+public  class LoginAndRegisterModel extends BaseModel implements LoginAndRegisterContract.ILoginModel {
+
+
+
+    public static LoginAndRegisterModel newInstance() {
+        return new LoginAndRegisterModel();
+    }
+
+
+    @Override
+    public Observable<JsonObject> getLoginResult(String loginName, String loginPed) {
+        return null;
+    }
+
+    @Override
+    public Observable<JsonObject> getRegisterResult(String adminName, String idCode, String password) {
+        return null;
+    }
+
+    @Override
+    public Observable<JsonObject> getidCodeResult(String phoneNumber) {
+        return null;
+    }
+
+}
 package com.shunzhi.parent.model.loginandregister;
+import com.google.gson.JsonObject;
 import com.share.mvpsdk.base.BaseModel;
+import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
+
+import io.reactivex.Observable;
 /**
  * Created by Administrator on 2018/3/6 0006.
  */
-public class loginAndRegisterModel extends BaseModel {
+public  class LoginAndRegisterModel extends BaseModel implements LoginAndRegisterContract.ILoginModel {
+
+
+
+    public static LoginAndRegisterModel newInstance() {
+        return new LoginAndRegisterModel();
+    }
+
+
+    @Override
+    public Observable<JsonObject> getLoginResult(String loginName, String loginPed) {
+        return null;
+    }
+
+    @Override
+    public Observable<JsonObject> getRegisterResult(String adminName, String idCode, String password) {
+        return null;
+    }
+
+    @Override
+    public Observable<JsonObject> getidCodeResult(String phoneNumber) {
+        return null;
+    }
+
 }
 package com.shunzhi.parent.presenter.loginandregister;
+import android.text.TextUtils;
+
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
+import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
 /**
  * Created by Administrator on 2018/3/6 0006.
@@ -9,17 +13,39 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
 public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPresenter {
     @Override
     public void loginResult(String loginName, String loginPwd) {
+        if (TextUtils.isEmpty(loginName)){
+            ToastUtils.showToast("登录名不能为空");
+            return;
+        }else if(TextUtils.isEmpty(loginPwd)){
+            ToastUtils.showToast("密码不能为空");
+            return;
+        }
+
+    }
+
+    @Override
+    public void registerResult(String adminName, String idCode, String password) {
+
     }
     @Override
+    public void idCodeResult(String phoneNumber) {
+        if(TextUtils.isEmpty(phoneNumber)){
+            ToastUtils.showToast("请先输入手机号");
+            return;
+        }
+    }
+
+    @Override
     public void getUserInfo() {
     }
+
     @Override
     public LoginAndRegisterContract.ILoginModel getModel() {
-        return null;
+        return LoginAndRegisterModel.newInstance();
     }
     @Override
@@ -9,15 +9,19 @@ import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragm
 import me.yokeyword.fragmentation.SupportFragment;
 public class LoginAndRegistActivity extends BaseCompatActivity {
+    String type = "注册";
+
     private SupportFragment[] mFragments = new SupportFragment[1];
+
     @Override
     protected void initView(Bundle savedInstanceState) {
-        if (savedInstanceState==null){
-            mFragments[0]= LoginAndRegistFragment.getInstance();
-            loadRootFragment(R.id.frame,mFragments[0]);
-        }else {
-            mFragments[0]=findFragment(LoginAndRegistFragment.class);
+        if (savedInstanceState == null) {
+            type = getIntent().getStringExtra("type");
+            mFragments[0] = LoginAndRegistFragment.getInstance(type);
+            loadRootFragment(R.id.frame, mFragments[0]);
+        } else {
+            mFragments[0] = findFragment(LoginAndRegistFragment.class);
         }
     }
@@ -4,7 +4,11 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.R;
@@ -12,12 +16,19 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
 import com.shunzhi.parent.presenter.loginandregister.LoginAndRegisterPresenter;
-public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter,LoginAndRegisterContract.ILoginModel>
-implements  LoginAndRegisterContract.ILoginView{
+public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
+        implements LoginAndRegisterContract.ILoginView, View.OnClickListener {
+    public RoundedImageView roundedImageView;
+    public EditText phoneNumber, idCode, password;
+    public TextView get_idCode, loginAndRegister, tv_info, tv_goto;
+    public LinearLayout phoneLayout, idCodeLayout, passwordLayout;
+    public static String typepage;
-    public static LoginAndRegistFragment getInstance(){
-        LoginAndRegistFragment loginFragment=new LoginAndRegistFragment();
+
+    public static LoginAndRegistFragment getInstance(String type) {
+        typepage = type;
+        LoginAndRegistFragment loginFragment = new LoginAndRegistFragment();
         return loginFragment;
     }
@@ -36,12 +47,56 @@ implements  LoginAndRegisterContract.ILoginView{
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
+        roundedImageView = view.findViewById(R.id.photoImage);
+        phoneNumber = view.findViewById(R.id.et_phoneNumber);
+        idCode = view.findViewById(R.id.et_idCode);
+        password = view.findViewById(R.id.et_password);
+        get_idCode = view.findViewById(R.id.get_idCode);
+        loginAndRegister = view.findViewById(R.id.loginAndRegister);
+        tv_info = view.findViewById(R.id.tv_info);
+        tv_goto = view.findViewById(R.id.tv_goto);
+        phoneLayout = view.findViewById(R.id.phoneLayout);
+        idCodeLayout = view.findViewById(R.id.idCodeLayout);
+        passwordLayout = view.findViewById(R.id.passwordLayout);
+        get_idCode.setOnClickListener(this);
+        tv_goto.setOnClickListener(this);
+        loginAndRegister.setOnClickListener(this);
+        if (typepage.equals("登录")) {
+            idCodeLayout.setVisibility(View.GONE);
+            loginAndRegister.setText("登录");
+            tv_info.setText("还没有账号");
+            tv_goto.setText("注册");
+        }else if(typepage.equals("注册")){
+            idCodeLayout.setVisibility(View.VISIBLE);
+            loginAndRegister.setText("注册");
+            tv_info.setText("已注册，直接登录");
+            tv_goto.setText("登录");
+        }
     }
-
     @Override
     public void getUserInfo() {
     }
+
+    @Override
+    public void onClick(View v) {
+        if (v == loginAndRegister) {
+            if (loginAndRegister.getText().toString().trim().equals("登录")) {
+                mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString());
+            } else if (loginAndRegister.getText().toString().trim().equals("注册")) {
+                mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
+            }
+
+        } else if (v == tv_goto) {
+            if (tv_goto.equals("登录")) {
+
+            } else if (tv_goto.equals("注册")) {
+
+            }
+        } else if (v == get_idCode) {
+            mPresenter.idCodeResult(phoneNumber.getText().toString());
+        }
+    }
 }
@@ -12,6 +12,7 @@
         android:orientation="vertical">
         <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/photoImage"
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_gravity="center"
@@ -31,11 +32,13 @@
             android:orientation="vertical">
             <LinearLayout
+                android:id="@+id/phoneLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <EditText
+                    android:id="@+id/et_phoneNumber"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
                     android:background="@null"
@@ -50,6 +53,7 @@
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/idCodeLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -60,6 +64,7 @@
                     android:orientation="horizontal">
                     <EditText
+                        android:id="@+id/et_idCode"
                         android:layout_width="wrap_content"
                         android:layout_height="50dp"
                         android:layout_weight="1"
@@ -69,6 +74,7 @@
                         android:textSize="@dimen/sp_16" />
                     <TextView
+                        android:id="@+id/get_idCode"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/rudiobtn2"
@@ -92,6 +98,7 @@
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/passwordLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -101,6 +108,7 @@
                     android:layout_height="wrap_content">
                     <EditText
+                        android:id="@+id/et_password"
                         android:layout_width="wrap_content"
                         android:layout_height="50dp"
                         android:layout_weight="1"
@@ -110,6 +118,7 @@
                         android:textSize="@dimen/sp_16" />
                     <ImageView
+                        android:id="@+id/img_eye"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
@@ -126,6 +135,7 @@
             </LinearLayout>
             <TextView
+                android:id="@+id/loginAndRegister"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40dp"
@@ -145,6 +155,7 @@
                 android:orientation="horizontal">
                 <TextView
+                    android:id="@+id/tv_info"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="已注册，直接登录"
@@ -152,6 +163,7 @@
                     android:textSize="@dimen/sp_16" />
                 <TextView
+                    android:id="@+id/tv_goto"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+package com.shunzhi.parent.model.loginandregister;
	2	+
	3	+import com.google.gson.JsonObject;
	4	+import com.share.mvpsdk.base.BaseModel;
	5	+import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
	6	+
	7	+import io.reactivex.Observable;
	8	+
	9	+/**
	10	+ * Created by Administrator on 2018/3/6 0006.
	11	+ */
	12	+
	13	+public class LoginAndRegisterModel extends BaseModel implements LoginAndRegisterContract.ILoginModel {
	14	+
	15	+
	16	+
	17	+ public static LoginAndRegisterModel newInstance() {
	18	+ return new LoginAndRegisterModel();
	19	+ }
	20	+
	21	+
	22	+ @Override
	23	+ public Observable<JsonObject> getLoginResult(String loginName, String loginPed) {
	24	+ return null;
	25	+ }
	26	+
	27	+ @Override
	28	+ public Observable<JsonObject> getRegisterResult(String adminName, String idCode, String password) {
	29	+ return null;
	30	+ }
	31	+
	32	+ @Override
	33	+ public Observable<JsonObject> getidCodeResult(String phoneNumber) {
	34	+ return null;
	35	+ }
	36	+
	37	+}
1	package com.shunzhi.parent.model.loginandregister;	1	package com.shunzhi.parent.model.loginandregister;
2		2
		3	+import com.google.gson.JsonObject;
3	import com.share.mvpsdk.base.BaseModel;	4	import com.share.mvpsdk.base.BaseModel;
		5	+import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
		6	+
		7	+import io.reactivex.Observable;
4		8
5	/**	9	/**
6	* Created by Administrator on 2018/3/6 0006.	10	* Created by Administrator on 2018/3/6 0006.
7	*/	11	*/
8		12
9	-public class loginAndRegisterModel extends BaseModel {	13	+public class LoginAndRegisterModel extends BaseModel implements LoginAndRegisterContract.ILoginModel {
		14	+
		15	+
		16	+
		17	+ public static LoginAndRegisterModel newInstance() {
		18	+ return new LoginAndRegisterModel();
		19	+ }
		20	+
		21	+
		22	+ @Override
		23	+ public Observable<JsonObject> getLoginResult(String loginName, String loginPed) {
		24	+ return null;
		25	+ }
		26	+
		27	+ @Override
		28	+ public Observable<JsonObject> getRegisterResult(String adminName, String idCode, String password) {
		29	+ return null;
		30	+ }
		31	+
		32	+ @Override
		33	+ public Observable<JsonObject> getidCodeResult(String phoneNumber) {
		34	+ return null;
		35	+ }
		36	+
10	}	37	}
1	package com.shunzhi.parent.presenter.loginandregister;	1	package com.shunzhi.parent.presenter.loginandregister;
2		2
		3	+import android.text.TextUtils;
		4	+
		5	+import com.share.mvpsdk.utils.ToastUtils;
3	import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;	6	import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
		7	+import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
4		8
5	/**	9	/**
6	* Created by Administrator on 2018/3/6 0006.	10	* Created by Administrator on 2018/3/6 0006.
	@@ -9,17 +13,39 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;		@@ -9,17 +13,39 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
9	public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPresenter {	13	public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPresenter {
10	@Override	14	@Override
11	public void loginResult(String loginName, String loginPwd) {	15	public void loginResult(String loginName, String loginPwd) {
		16	+ if (TextUtils.isEmpty(loginName)){
		17	+ ToastUtils.showToast("登录名不能为空");
		18	+ return;
		19	+ }else if(TextUtils.isEmpty(loginPwd)){
		20	+ ToastUtils.showToast("密码不能为空");
		21	+ return;
		22	+ }
		23	+
		24	+ }
		25	+
		26	+ @Override
		27	+ public void registerResult(String adminName, String idCode, String password) {
		28	+
12		29
13	}	30	}
14		31
15	@Override	32	@Override
		33	+ public void idCodeResult(String phoneNumber) {
		34	+ if(TextUtils.isEmpty(phoneNumber)){
		35	+ ToastUtils.showToast("请先输入手机号");
		36	+ return;
		37	+ }
		38	+ }
		39	+
		40	+ @Override
16	public void getUserInfo() {	41	public void getUserInfo() {
17		42
18	}	43	}
19		44
		45	+
20	@Override	46	@Override
21	public LoginAndRegisterContract.ILoginModel getModel() {	47	public LoginAndRegisterContract.ILoginModel getModel() {
22	- return null;	48	+ return LoginAndRegisterModel.newInstance();
23	}	49	}
24		50
25	@Override	51	@Override
	@@ -4,7 +4,11 @@ import android.os.Bundle;		@@ -4,7 +4,11 @@ import android.os.Bundle;
4	import android.support.annotation.NonNull;	4	import android.support.annotation.NonNull;
5	import android.support.annotation.Nullable;	5	import android.support.annotation.Nullable;
6	import android.view.View;	6	import android.view.View;
		7	+import android.widget.EditText;
		8	+import android.widget.LinearLayout;
		9	+import android.widget.TextView;
7		10
		11	+import com.makeramen.roundedimageview.RoundedImageView;
8	import com.share.mvpsdk.base.BasePresenter;	12	import com.share.mvpsdk.base.BasePresenter;
9	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;	13	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
10	import com.shunzhi.parent.R;	14	import com.shunzhi.parent.R;
	@@ -12,12 +16,19 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;		@@ -12,12 +16,19 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
12	import com.shunzhi.parent.presenter.loginandregister.LoginAndRegisterPresenter;	16	import com.shunzhi.parent.presenter.loginandregister.LoginAndRegisterPresenter;
13		17
14		18
15	-public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter,LoginAndRegisterContract.ILoginModel>
16	-implements LoginAndRegisterContract.ILoginView{	19	+public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
		20	+ implements LoginAndRegisterContract.ILoginView, View.OnClickListener {
17		21
		22	+ public RoundedImageView roundedImageView;
		23	+ public EditText phoneNumber, idCode, password;
		24	+ public TextView get_idCode, loginAndRegister, tv_info, tv_goto;
		25	+ public LinearLayout phoneLayout, idCodeLayout, passwordLayout;
		26	+ public static String typepage;
18		27
19	- public static LoginAndRegistFragment getInstance(){
20	- LoginAndRegistFragment loginFragment=new LoginAndRegistFragment();	28	+
		29	+ public static LoginAndRegistFragment getInstance(String type) {
		30	+ typepage = type;
		31	+ LoginAndRegistFragment loginFragment = new LoginAndRegistFragment();
21	return loginFragment;	32	return loginFragment;
22	}	33	}
23		34
	@@ -36,12 +47,56 @@ implements LoginAndRegisterContract.ILoginView{		@@ -36,12 +47,56 @@ implements LoginAndRegisterContract.ILoginView{
36	@Override	47	@Override
37	public void initUI(View view, @Nullable Bundle savedInstanceState) {	48	public void initUI(View view, @Nullable Bundle savedInstanceState) {
38		49
		50	+ roundedImageView = view.findViewById(R.id.photoImage);
		51	+ phoneNumber = view.findViewById(R.id.et_phoneNumber);
		52	+ idCode = view.findViewById(R.id.et_idCode);
		53	+ password = view.findViewById(R.id.et_password);
		54	+ get_idCode = view.findViewById(R.id.get_idCode);
		55	+ loginAndRegister = view.findViewById(R.id.loginAndRegister);
		56	+ tv_info = view.findViewById(R.id.tv_info);
		57	+ tv_goto = view.findViewById(R.id.tv_goto);
		58	+ phoneLayout = view.findViewById(R.id.phoneLayout);
		59	+ idCodeLayout = view.findViewById(R.id.idCodeLayout);
		60	+ passwordLayout = view.findViewById(R.id.passwordLayout);
		61	+ get_idCode.setOnClickListener(this);
		62	+ tv_goto.setOnClickListener(this);
		63	+ loginAndRegister.setOnClickListener(this);
		64	+ if (typepage.equals("登录")) {
		65	+ idCodeLayout.setVisibility(View.GONE);
		66	+ loginAndRegister.setText("登录");
		67	+ tv_info.setText("还没有账号");
		68	+ tv_goto.setText("注册");
		69	+ }else if(typepage.equals("注册")){
		70	+ idCodeLayout.setVisibility(View.VISIBLE);
		71	+ loginAndRegister.setText("注册");
		72	+ tv_info.setText("已注册，直接登录");
		73	+ tv_goto.setText("登录");
		74	+ }
39	}	75	}
40		76
41		77
42	-
43	@Override	78	@Override
44	public void getUserInfo() {	79	public void getUserInfo() {
45		80
46	}	81	}
		82	+
		83	+ @Override
		84	+ public void onClick(View v) {
		85	+ if (v == loginAndRegister) {
		86	+ if (loginAndRegister.getText().toString().trim().equals("登录")) {
		87	+ mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString());
		88	+ } else if (loginAndRegister.getText().toString().trim().equals("注册")) {
		89	+ mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
		90	+ }
		91	+
		92	+ } else if (v == tv_goto) {
		93	+ if (tv_goto.equals("登录")) {
		94	+
		95	+ } else if (tv_goto.equals("注册")) {
		96	+
		97	+ }
		98	+ } else if (v == get_idCode) {
		99	+ mPresenter.idCodeResult(phoneNumber.getText().toString());
		100	+ }
		101	+ }
47	}	102	}