From df6597cd035dbbf5e64f4faba22f4f2065284258 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Thu, 15 Mar 2018 17:02:38 +0800 Subject: [PATCH] no message --- app/src/main/AndroidManifest.xml | 4 ++++ app/src/main/java/com/shunzhi/parent/AppConfig.java | 1 + app/src/main/java/com/shunzhi/parent/api/MineApi.java | 5 +++++ app/src/main/java/com/shunzhi/parent/bean/ChildClass.java | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java | 10 ++++++++++ app/src/main/java/com/shunzhi/parent/bean/GradeBean.java | 12 ++++++++++++ app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java | 11 +++++++++-- app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java | 6 +++++- app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java | 6 ++++++ app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java | 8 ++++++++ app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 1 + app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java | 31 ++++++++++++++++++++++++------- app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java | 19 +++++++++++++++++++ app/src/main/java/com/shunzhi/parent/ui/MainActivity.java | 10 ++-------- app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java | 22 +++++++++++++++++++++- app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java | 5 ++++- app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java | 40 +++++++++++++++++++++++++--------------- app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java | 90 +++++++++++++++++++++++++----------------------------------------------------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 2 +- app/src/main/res/drawable-xhdpi/arrow_white.png | Bin 0 -> 460 bytes app/src/main/res/layout/activity_check_info.xml | 5 ----- app/src/main/res/layout/activity_create_childinfo.xml | 21 +++++++++++++-------- app/src/main/res/layout/activity_invitecode.xml | 1 + app/src/main/res/layout/item_grade_class.xml | 12 ++++++++++++ 26 files changed, 573 insertions(+), 129 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/bean/ChildClass.java create mode 100644 app/src/main/java/com/shunzhi/parent/bean/GradeBean.java create mode 100644 app/src/main/res/drawable-xhdpi/arrow_white.png create mode 100644 app/src/main/res/layout/item_grade_class.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5c015e5..9e1bf2c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -100,6 +100,10 @@ android:name=".ui.activity.binding.CheckInfoActivity" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" /> + diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index c417057..16aced6 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -21,6 +21,7 @@ public class AppConfig { public static String USER_NAME = "user_name"; public static String USER_SEX = "user_sex"; public static String USER_IMAGE = "user_image"; + public static String PARENT_ID = "parent_id"; //默认日志保存的路径 diff --git a/app/src/main/java/com/shunzhi/parent/api/MineApi.java b/app/src/main/java/com/shunzhi/parent/api/MineApi.java index e4c7924..3187ba0 100644 --- a/app/src/main/java/com/shunzhi/parent/api/MineApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/MineApi.java @@ -1,11 +1,14 @@ package com.shunzhi.parent.api; import com.google.gson.JsonObject; +import com.shunzhi.parent.bean.GradeBean; import io.reactivex.Observable; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; import retrofit2.http.POST; +import retrofit2.http.Query; /** * Created by Administrator on 2018/3/7 0007. @@ -31,5 +34,7 @@ public interface MineApi { @Field("parentId") int parentId, @Field("mobileFlag") boolean mobileFlag, @Field("cooperateFlag") boolean cooperateFlag , @Field("schoolId") int schoolId, @Field("classId") int classId, @Field("studentId") int studentId, @Field("studentUserId") String studentUserId); + @GET("/api/ParentHelper/GetClassOrGrade") + ObservablegetGradeAndClass(@Query("state") int state,@Query("schoolid") int schoolId,@Query("gradeid") int gradeId); } diff --git a/app/src/main/java/com/shunzhi/parent/bean/ChildClass.java b/app/src/main/java/com/shunzhi/parent/bean/ChildClass.java new file mode 100644 index 0000000..0965a5a --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/ChildClass.java @@ -0,0 +1,63 @@ +package com.shunzhi.parent.bean; + +import java.io.Serializable; + +/** + * Created by Administrator on 2018/3/15 0015. + */ + +public class ChildClass implements Serializable{ + private int gradeId; + private String gradeName; + private int classId; + private String className; + + public int getGradeId() { + return gradeId; + } + + public void setGradeId(int gradeId) { + this.gradeId = gradeId; + } + + public String getGradeName() { + return gradeName; + } + + public void setGradeName(String gradeName) { + this.gradeName = gradeName; + } + + public int getClassId() { + return classId; + } + + public void setClassId(int classId) { + this.classId = classId; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + + @Override + public String toString() { + return "ChildClass{" + + "gradeId='" + gradeId + '\'' + + ",gradeName='" + gradeName + '\'' + + ",classId='" + classId + '\'' + + ", className=" + className + + "}"; + } +} +/** + gradeId (integer, optional): 年段id , + gradeName (string, optional): 年段名 , + classId (integer, optional): 班级编号 , + className (string, + * */ \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java index 71c76f7..b9d50a5 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java @@ -15,10 +15,19 @@ public class CurrentBean implements Serializable{ private boolean bindSchoolFlag; private boolean bindingChildrenFlag; private int parentId; + private int isNew; private int sex; private List studentClass; + public int isNew() { + return isNew; + } + + public void setNew(int aNew) { + isNew = aNew; + } + public int getParentId() { return parentId; } @@ -98,6 +107,7 @@ public class CurrentBean implements Serializable{ ", name='" + name + '\'' + ", image='" + image + '\'' + ", mobile='" + mobile + '\'' + + ", isNew='" + isNew + '\'' + ", parentId='" + parentId + '\'' + ", bindSchoolFlag='" + bindSchoolFlag + '\'' + ", bindingChildrenFlag='" + bindingChildrenFlag + '\'' + diff --git a/app/src/main/java/com/shunzhi/parent/bean/GradeBean.java b/app/src/main/java/com/shunzhi/parent/bean/GradeBean.java new file mode 100644 index 0000000..f719c25 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/GradeBean.java @@ -0,0 +1,12 @@ +package com.shunzhi.parent.bean; + +import com.share.mvpsdk.base.entity.BaseEntity; + +import java.util.List; + +/** + * Created by Administrator on 2018/3/15 0015. + */ + +public class GradeBean extends BaseEntity> { +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java index e5d9cf6..5f78082 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java @@ -4,7 +4,9 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseActivity; import com.share.mvpsdk.base.IBaseModel; -import com.shunzhi.parent.bean.ChildBean; +import com.shunzhi.parent.bean.ChildClass; +import com.shunzhi.parent.bean.CurrentBean; +import com.shunzhi.parent.bean.GradeBean; import com.shunzhi.parent.bean.UserInfo; import java.util.List; @@ -21,6 +23,7 @@ public interface MyChildContract { public abstract void loadChildList(String mobile, int school_id, String captcha); public abstract void addChild(int parentId, boolean mobileFlag,boolean cooperateFlag , int schoolId,int classId,int studentId,String studentUserId); + public abstract void gradeAndClassResult(int state, int schooId,int gradeId); } @@ -28,12 +31,16 @@ public interface MyChildContract { Observable getUserInfo(String mobile, int school_id, String captcha); Observable addChildResult(int parentId, boolean mobileFlag,boolean cooperateFlag , int schoolId,int classId,int studentId,String studentUserId); + Observable getGradeAndClass(int state, int schooId,int gradeId); } interface IMyChildView extends IBaseActivity { - void updateChilsList(List list); + void updateChilsList(CurrentBean currentBean); + void addChildSuccess(); + void showClass(Listlist); + void showError(String error); } diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java index ce9e702..54b658a 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java @@ -4,7 +4,9 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseActivity; import com.share.mvpsdk.base.IBaseModel; +import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.bean.SchoolBean; +import com.shunzhi.parent.bean.UserInfo; import java.util.List; @@ -16,16 +18,18 @@ import io.reactivex.Observable; public interface SchoolListContract { abstract class SchoolListPrasenter extends BasePresenter { + public abstract void showChildInfo(String mobile, int school_id, String captcha); public abstract void schoolListResult(String areaName, String key); } interface ISchoolListModel extends IBaseModel { Observable getSchoolListResult(String areaName, String key); - + Observable getUserInfo(String mobile, int school_id, String captcha); } interface ISchoolListView extends IBaseActivity { void showList(List list); + void showChild(CurrentBean currentBean); } } diff --git a/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java b/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java index 9a0f827..6fa10dc 100644 --- a/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java @@ -6,6 +6,7 @@ import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.share.mvpsdk.helper.RxHelper; import com.shunzhi.parent.api.LoginRegisterApi; import com.shunzhi.parent.api.MineApi; +import com.shunzhi.parent.bean.GradeBean; import com.shunzhi.parent.bean.UserInfo; import com.shunzhi.parent.contract.mine.MyChildContract; @@ -34,4 +35,9 @@ public class MyChildModel extends BaseModel implements MyChildContract.IMyChildM return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).addChildResult(parentId,mobileFlag,cooperateFlag,schoolId ,classId,studentId,studentUserId).compose(RxHelper.rxSchedulerHelper()); } + + @Override + public Observable getGradeAndClass(int state, int schooId, int gradeId) { + return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).getGradeAndClass(state,schooId,gradeId).compose(RxHelper.rxSchedulerHelper()); + } } diff --git a/app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java b/app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java index 3cfe001..2850198 100644 --- a/app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java @@ -4,7 +4,9 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BaseModel; import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.share.mvpsdk.helper.RxHelper; +import com.shunzhi.parent.api.LoginRegisterApi; import com.shunzhi.parent.api.MineApi; +import com.shunzhi.parent.bean.UserInfo; import com.shunzhi.parent.contract.mine.SchoolListContract; import io.reactivex.Observable; @@ -23,4 +25,10 @@ public class SchoolListModel extends BaseModel implements SchoolListContract.ISc return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).getSchoolListResult(areaName,key) .compose(RxHelper.rxSchedulerHelper()); } + + @Override + public Observable getUserInfo(String mobile, int school_id, String captcha) { + return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).getUserInfo(mobile,school_id,captcha) + .compose(RxHelper.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 ba42469..da5ddd5 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 @@ -137,6 +137,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, currentBean.getName()); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, currentBean.getImage()); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(currentBean.getSex())); + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.PARENT_ID, String.valueOf(currentBean.getParentId())); mIView.getUserInfo(0); } else { diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java index 79a5368..8556b5e 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java @@ -1,12 +1,11 @@ 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; -import com.shunzhi.parent.bean.ChildBean; +import com.shunzhi.parent.bean.ChildClass; import com.shunzhi.parent.bean.CurrentBean; +import com.shunzhi.parent.bean.GradeBean; import com.shunzhi.parent.bean.UserInfo; import com.shunzhi.parent.contract.mine.MyChildContract; import com.shunzhi.parent.model.mine.MyChildModel; @@ -38,13 +37,14 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { @Override public void accept(UserInfo userInfo) throws Exception { CurrentBean currentBean = userInfo.getData(); - List list = currentBean.getStudentClass(); - mIView.updateChilsList(list); +// List list = currentBean.getStudentClass(); + mIView.updateChilsList(currentBean); } }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + mIView.showError("邀请码错误"); } })); @@ -55,16 +55,33 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { mRxManager.register(mIModel.addChildResult(parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { - ToastUtils.showToast(jsonObject.toString()); + ToastUtils.showToast("绑定孩子成功"); + mIView.addChildSuccess(); } }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); } + @Override + public void gradeAndClassResult(int state, int schooId, int gradeId) { + mRxManager.register(mIModel.getGradeAndClass(state, schooId, gradeId).subscribe(new Consumer() { + @Override + public void accept(GradeBean gradeBean) throws Exception { + List list=gradeBean.getData(); + mIView.showClass(list); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + } + })); + } + } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java index 75d8fd3..be94b4b 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java @@ -4,7 +4,9 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.share.mvpsdk.utils.OkHttpExceptionUtil; +import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.bean.SchoolBean; +import com.shunzhi.parent.bean.UserInfo; import com.shunzhi.parent.contract.mine.SchoolListContract; import com.shunzhi.parent.model.mine.SchoolListModel; @@ -31,6 +33,23 @@ public class SchoolListPrasenter extends SchoolListContract.SchoolListPrasenter } @Override + public void showChildInfo(String mobile, int school_id, String captcha) { + mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer() { + @Override + public void accept(UserInfo userInfo) throws Exception { + CurrentBean currentBean = userInfo.getData(); +// List list = currentBean.getStudentClass(); + mIView.showChild(currentBean); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + } + })); + } + + @Override public void schoolListResult(String areaName, String key) { mRxManager.register(mIModel.getSchoolListResult(areaName, key).subscribe(new Consumer() { @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java index fb22655..38d05be 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java @@ -5,7 +5,6 @@ import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.util.Log; import android.view.MenuItem; import com.share.mvpsdk.base.activity.BaseCompatActivity; @@ -18,9 +17,6 @@ import com.shunzhi.parent.ui.fragment.ConsultFragment; import com.shunzhi.parent.ui.fragment.MineFragment; import com.shunzhi.parent.ui.fragment.ReportFragment; -import java.util.Calendar; -import java.util.Date; - public class MainActivity extends BaseCompatActivity implements PermissionUtils.PermissionGrant { BottomNavigationView bottom_navigationView; @@ -89,10 +85,10 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. .add(R.id.frame, consultFragment) .add(R.id.frame, reportFragment) .add(R.id.frame, mineFragment) - .show(cePingFragment) + .show(mineFragment) .hide(consultFragment) .hide(reportFragment) - .hide(mineFragment) + .hide(cePingFragment) .commit(); } @@ -124,7 +120,5 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. @Override protected void onResume() { super.onResume(); - Date l= Calendar.getInstance().getTime(); - Log.e("2222--==",l.getTime()+""); } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java index 6e5a2aa..1d74e91 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java @@ -21,8 +21,11 @@ import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.ChildAdapter; import com.shunzhi.parent.bean.ChildBean; +import com.shunzhi.parent.bean.ChildClass; +import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.contract.mine.MyChildContract; import com.shunzhi.parent.presenter.mine.MyChildPresenter; +import com.shunzhi.parent.ui.MainActivity; import com.shunzhi.parent.ui.activity.binding.SelectSchoolActivity; import com.yanzhenjie.recyclerview.swipe.SwipeMenu; import com.yanzhenjie.recyclerview.swipe.SwipeMenuBridge; @@ -108,6 +111,7 @@ public class MyChildActivity extends BaseMVPCompatActivity list) { + public void updateChilsList(CurrentBean currentBean) { + Listlist=currentBean.getStudentClass(); childAdapter = new ChildAdapter(this); childAdapter.addAll(list); child_recycle.setAdapter(childAdapter); } + @Override + public void addChildSuccess() { + + } + + @Override + public void showClass(List list) { + + } + + @Override + public void showError(String error) { + + } + private SwipeMenuCreator swipeMenuCreator = new SwipeMenuCreator() { @Override public void onCreateMenu(SwipeMenu swipeLeftMenu, SwipeMenu swipeRightMenu, int viewType) { diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java index b5e0a73..5a704ee 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java @@ -26,7 +26,7 @@ import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter; public class PersonInfoActivity extends BaseMVPCompatActivity implements PersonInfoContract.IPersonInfoView, View.OnClickListener { RoundedImageView user_image; - TextView user_name, user_mobile, change_info; + TextView user_name, user_mobile, change_info,center_title,back; EditText et_name; RadioButton man, women; @@ -44,6 +44,9 @@ public class PersonInfoActivity extends BaseMVPCompatActivity implements MyChildContract.IMyChildView, View.OnClickListener { - int school_id; + int school_id = 0, isNew, classId, studentId; + String captcha = ""; LinearLayout iphone_layout; - TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile; + TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile, back, center_title; ChildBean childBean; @NonNull @@ -39,6 +49,9 @@ public class CheckInfoActivity extends BaseMVPCompatActivity list) { - if (list != null&&list.size()>0) { + public void updateChilsList(CurrentBean currentBean) { + List list = currentBean.getStudentClass(); + isNew = currentBean.isNew(); + user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); + if (list.size() > 0 && list != null) { childBean = list.get(0); + classId = childBean.getClassId(); + studentId = childBean.getStudentId(); iphone_layout.setVisibility(View.VISIBLE); - user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); child_name.setText(childBean.getStudentName()); int sex = childBean.getSex(); String sexStr = "未知"; @@ -82,8 +133,62 @@ public class CheckInfoActivity extends BaseMVPCompatActivity list) { + + } + + @Override + public void showError(String error) { + final PopupWindow popupWindow = new PopupWindow(); + popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT); + popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT); + backgroundAlpha(0.5f); + View view = LayoutInflater.from(this).inflate(R.layout.dialog_view, null); + TextView dialog_info = view.findViewById(R.id.dialog_info); + dialog_info.setText(error); + dialog_info.setGravity(Gravity.CENTER); + TextView right_btn = view.findViewById(R.id.right_btn); + right_btn.setText("退出绑定"); + right_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent().setClass(CheckInfoActivity.this, MyChildActivity.class)); + finish(); + } + }); + TextView cancel_btn = view.findViewById(R.id.cancel_btn); + cancel_btn.setText("返回"); + cancel_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + popupWindow.dismiss(); + startActivity(new Intent().putExtra("school_id", school_id).setClass(CheckInfoActivity.this, InviteCodeActivity.class)); + finish(); + } + }); + + popupWindow.setContentView(view); + popupWindow.showAtLocation(iphone_layout, Gravity.CENTER, 0, 0); + } + + public void backgroundAlpha(float bgAlpha) { + WindowManager.LayoutParams lp = getWindow().getAttributes(); + lp.alpha = bgAlpha; //0.0-1.0 + getWindow().setAttributes(lp); + } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java index 3e6bfc5..0b5e5ad 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java @@ -1,30 +1,212 @@ package com.shunzhi.parent.ui.activity.binding; +import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.util.ArrayMap; +import android.text.TextUtils; +import android.view.ContextMenu; +import android.view.MenuItem; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; +import com.share.mvpsdk.utils.ToastUtils; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ChildClass; +import com.shunzhi.parent.bean.CurrentBean; +import com.shunzhi.parent.contract.mine.MyChildContract; +import com.shunzhi.parent.presenter.mine.MyChildPresenter; +import com.shunzhi.parent.ui.activity.MyChildActivity; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018/3/13 0013. */ -public class CreateChildInfoActivity extends BaseMVPCompatActivity{ +public class CreateChildInfoActivity extends BaseMVPCompatActivity + implements MyChildContract.IMyChildView, View.OnClickListener { + + int type, school_id, sexId, gradeId, classId; + TextView select_sex, select_grade, select_class, add_child, center_title, back; + EditText child_name; + Map currMap = new ArrayMap<>(); + List gradeList = new ArrayList<>(); + List classList = new ArrayList<>(); + List sexList = new ArrayList<>(); + @NonNull @Override public BasePresenter initPresenter() { - return null; + return new MyChildPresenter(); } @Override protected void initView(Bundle savedInstanceState) { + school_id = getIntent().getIntExtra("school_id", 0); + initGrade(school_id); + center_title = findViewById(R.id.center_title); + center_title.setText("填写孩子信息"); + back = findViewById(R.id.back_top); + add_child = findViewById(R.id.add_child); + child_name = findViewById(R.id.child_name); + select_sex = findViewById(R.id.select_sex); + select_grade = findViewById(R.id.select_grade); + select_class = findViewById(R.id.select_class); + select_sex.setOnClickListener(this); + select_grade.setOnClickListener(this); + select_class.setOnClickListener(this); + registerForContextMenu(select_sex); + sexList.add("男"); + sexList.add("女"); + + } + private void initGrade(int school_id) { + mPresenter.gradeAndClassResult(1, school_id, 0); } @Override protected int getLayoutId() { return R.layout.activity_create_childinfo; } -} + + @Override + public void onClick(View v) { + currMap.clear(); + if (v == add_child) { + if (!TextUtils.isEmpty(child_name.getText()) && !TextUtils.isEmpty(select_sex.getText()) + && !TextUtils.isEmpty(select_grade.getText()) && !TextUtils.isEmpty(select_class.getText())) { + mPresenter.addChild(Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)) + , true, false, school_id, classId, 0, ""); + } else { + ToastUtils.showToast("请填写完整的孩子信息"); + } + } else { + if (v == select_sex) { + type = 0; + currMap.put("男", 1); + currMap.put("女", 2); + } else if (v == select_grade) { + type = 1; + for (int i = 0; i < gradeList.size(); i++) { + currMap.put(gradeList.get(i).getGradeName(), gradeList.get(i).getGradeId()); + } + } else if (v == select_class) { + type = 2; + if (!TextUtils.isEmpty(select_grade.getText().toString())) { + for (int i = 0; i < classList.size(); i++) { + currMap.put(classList.get(i).getClassName(), classList.get(i).getClassId()); + } + } else { + ToastUtils.showToast("请先选择年级"); + return; + } + } + openContextMenu(v); + } + + } + + @Override + public void updateChilsList(CurrentBean currentBean) { + + } + + @Override + public void addChildSuccess() { + startActivity(new Intent().setClass(CreateChildInfoActivity.this, MyChildActivity.class)); + finish(); + } + + @Override + public void showClass(List list) { + if (list.size() > 0 && list != null) { + if (list.get(0).getGradeId() == 0) { + //班级列表 + classList = list; + } else { + //年级列表 + gradeList = list; + } + + } + } + + @Override + public void showError(String error) { + + } + + + @Override + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { + super.onCreateContextMenu(menu, v, menuInfo); + if (type == 0) { + for (int i = 0; i < sexList.size(); i++) { + try { + final String title = sexList.get(i); + menu.add(0, i, 0, title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + select_sex.setText(item.getTitle()); + sexId = currMap.get(item.getTitle()); + return false; + } + }); + } catch (NumberFormatException e) { + e.printStackTrace(); + } + } + + } else if (type == 1) { + for (int i = 0; i < gradeList.size(); i++) { + try { + final String title = gradeList.get(i).getClassName(); + menu.add(0, i, 0, title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + select_grade.setText(item.getTitle()); + gradeId = currMap.get(item.getTitle()); + showGrade(currMap.get(item.getTitle())); + return false; + } + }); + } catch (NumberFormatException e) { + e.printStackTrace(); + } + } + } else if (type == 2) { + for (int i = 0; i < classList.size(); i++) { + try { + final String title = classList.get(i).getGradeName(); + menu.add(0, i, 0, title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + select_class.setText(item.getTitle()); + classId = currMap.get(item.getTitle()); + return false; + } + }); + } catch (NumberFormatException e) { + e.printStackTrace(); + } + } + + } + + + } + + + private void showGrade(int gradeId) { + mPresenter.gradeAndClassResult(2, school_id, gradeId); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java index 034c42a..0841164 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java @@ -1,24 +1,25 @@ package com.shunzhi.parent.ui.activity.binding; +import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.view.View; +import android.widget.EditText; +import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; import com.shunzhi.parent.R; -import com.shunzhi.parent.bean.ChildBean; -import com.shunzhi.parent.contract.mine.MyChildContract; import com.shunzhi.parent.presenter.mine.MyChildPresenter; -import java.util.List; - /** * Created by Administrator on 2018/3/14 0014. */ -public class InviteCodeActivity extends BaseMVPCompatActivity - implements MyChildContract.IMyChildView, View.OnClickListener { +public class InviteCodeActivity extends BaseMVPCompatActivity { + TextView add_child,center_title,back; + EditText et_invite_code; + int school_id; @NonNull @Override @@ -27,12 +28,25 @@ public class InviteCodeActivity extends BaseMVPCompatActivity list) { - - } - - @Override protected void initView(Bundle savedInstanceState) { + school_id=getIntent().getIntExtra("school_id",0); + add_child = findViewById(R.id.add_child); + back = findViewById(R.id.back_top); + back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + center_title = findViewById(R.id.center_title); + center_title.setText("邀请码验证"); + et_invite_code = findViewById(R.id.et_invite_code); + add_child.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent().putExtra("school_id",school_id).putExtra("captcha", et_invite_code.getText().toString().trim()).setClass(InviteCodeActivity.this, CheckInfoActivity.class)); + } + }); } @@ -41,8 +55,4 @@ public class InviteCodeActivity extends BaseMVPCompatActivity implements - View.OnClickListener, SchoolListContract.ISchoolListView,CityPickerListener { + View.OnClickListener, SchoolListContract.ISchoolListView, CityPickerListener { private SideBar sideBar; - private TextView dialog, go_next, tvLocalAddress; + private TextView dialog, go_next, tvLocalAddress, center_title, back; private RecyclerView schoollist; private List list = new ArrayList<>(); SchoolListAdapter schoolListAdapter; + int schoolId; + CityPicker cityPicker = null; - CityPicker cityPicker=null; @NonNull @Override public BasePresenter initPresenter() { @@ -55,6 +57,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity list) { -// list.add("阿尔卑斯"); -// list.add("阿尔卑斯"); -// list.add("阿尔卑斯"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("阿尔卑斯"); -// list.add("阿尔卑斯"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("阿尔卑斯"); -// list.add("阿尔卑斯"); -// list.add("阿尔卑斯"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("血色城堡"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("贝克街"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); -// list.add("血色城堡"); final List schoolList = OrderedSortSmodel(list); schoolListAdapter = new SchoolListAdapter(this, schoolList); schoolListAdapter.addAll(schoolList); @@ -235,9 +186,18 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity @@ -65,7 +64,6 @@ android:layout_weight="1" android:background="@drawable/rudio_bord" android:gravity="center" - android:text="李小明" android:textColor="@color/textColor" /> @@ -90,7 +88,6 @@ android:layout_weight="1" android:background="@drawable/rudio_bord" android:gravity="center" - android:text="男" android:textColor="@color/textColor" /> @@ -115,7 +112,6 @@ android:layout_weight="1" android:background="@drawable/rudio_bord" android:gravity="center" - android:text="初一" android:textColor="@color/textColor" /> @@ -140,7 +136,6 @@ android:layout_weight="1" android:background="@drawable/rudio_bord" android:gravity="center" - android:text="初一（3）班" android:textColor="@color/textColor" /> diff --git a/app/src/main/res/layout/activity_create_childinfo.xml b/app/src/main/res/layout/activity_create_childinfo.xml index 7b385c4..4a087ed 100644 --- a/app/src/main/res/layout/activity_create_childinfo.xml +++ b/app/src/main/res/layout/activity_create_childinfo.xml @@ -43,12 +43,14 @@ android:textSize="@dimen/sp_16" /> @@ -66,14 +68,15 @@ android:text="性 别：" android:textSize="@dimen/sp_16" /> - @@ -91,13 +94,14 @@ android:text="年 级：" android:textSize="@dimen/sp_16" /> - @@ -116,13 +120,14 @@ android:text="班 级：" android:textSize="@dimen/sp_16" /> - diff --git a/app/src/main/res/layout/activity_invitecode.xml b/app/src/main/res/layout/activity_invitecode.xml index a55e612..55a703c 100644 --- a/app/src/main/res/layout/activity_invitecode.xml +++ b/app/src/main/res/layout/activity_invitecode.xml @@ -11,6 +11,7 @@ android:layout_height="40dp" /> + + + + + + -- libgit2 0.21.0