diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java index bc1a41e..9778b68 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java @@ -1,9 +1,12 @@ 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{ 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 getLoginResult(String loginName, String loginPed); + + Observable getRegisterResult(String adminName,String idCode,String password); + + Observable getidCodeResult(String phoneNumber); + //获取登录用户信息 +// Observable getUserInfo(); } interface ILoginView extends IBaseFragment { 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 new file mode 100644 index 0000000..3fffc94 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java @@ -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 getLoginResult(String loginName, String loginPed) { + return null; + } + + @Override + public Observable getRegisterResult(String adminName, String idCode, String password) { + return null; + } + + @Override + public Observable getidCodeResult(String phoneNumber) { + return null; + } + +} 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 a14b647..3fffc94 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 @@ -1,10 +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 { +public class LoginAndRegisterModel extends BaseModel implements LoginAndRegisterContract.ILoginModel { + + + + public static LoginAndRegisterModel newInstance() { + return new LoginAndRegisterModel(); + } + + + @Override + public Observable getLoginResult(String loginName, String loginPed) { + return null; + } + + @Override + public Observable getRegisterResult(String adminName, String idCode, String password) { + return null; + } + + @Override + public Observable getidCodeResult(String phoneNumber) { + return null; + } + } 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 c7da851..1e1b737 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 @@ -1,6 +1,10 @@ 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 diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java index 7fa5300..e694b24 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java @@ -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); } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java index 9f972a0..02e859b 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java @@ -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 -implements LoginAndRegisterContract.ILoginView{ +public class LoginAndRegistFragment extends BaseMVPCompatFragment + 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()); + } + } } diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml index 340bf33..e3c6ff7 100644 --- a/app/src/main/res/layout/fragment_login_and_regist.xml +++ b/app/src/main/res/layout/fragment_login_and_regist.xml @@ -12,6 +12,7 @@ android:orientation="vertical"> @@ -60,6 +64,7 @@ android:orientation="horizontal"> @@ -101,6 +108,7 @@ android:layout_height="wrap_content">