diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 087778c..5c015e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -101,9 +101,7 @@ android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" /> - + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java index fef2e33..56a1fff 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java @@ -32,17 +32,20 @@ public class ChildAdapter extends BaseRecyclerViewAdapter{ private class MyViewHolder extends BaseRecyclerViewHolder{ - TextView textView; + TextView txt_childname,txt_childclass; public MyViewHolder(View view) { super(view); - textView=view.findViewById(R.id.txt_childname); + txt_childname=view.findViewById(R.id.txt_childname); + txt_childclass=view.findViewById(R.id.txt_childclass); } @Override public void onBindViewHolder(ChildBean object, int position) { - textView.setText("1234"); + txt_childname.setText(object.getStudentName()); + txt_childclass.setText(object.getSchoolName()+" "+object.getClassName()); + } } 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 9c7da05..e4c7924 100644 --- a/app/src/main/java/com/shunzhi/parent/api/MineApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/MineApi.java @@ -12,17 +12,24 @@ import retrofit2.http.POST; */ public interface MineApi { -// String url="http://campus.myjxt.com/"; - String url="http://60.190.202.57:1000/"; + // String url="http://campus.myjxt.com/"; + String url = "http://60.190.202.57:1000/"; -@FormUrlEncoded + @FormUrlEncoded @POST("/api/ParentHelper/GetAreaSchool") Observable getSchoolListResult( - @Field("areaName") String areaName, @Field("Keyword") String Keyword); + @Field("areaName") String areaName, @Field("Keyword") String Keyword); -@FormUrlEncoded -@POST("/api/ParentHelper/UpdateParentInfo") + @FormUrlEncoded + @POST("/api/ParentHelper/UpdateParentInfo") Observable getChangeInfoResult( - @Field("parentName") String parentName, @Field("sex") int sex,@Field("mobile")String mobile); + @Field("parentName") String parentName, @Field("sex") int sex, @Field("mobile") String mobile); + + @FormUrlEncoded + @POST("/api/ParentHelper/BindlingChildren") + Observable addChildResult( + @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); } + diff --git a/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java b/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java index f5604c2..93358d9 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java @@ -1,12 +1,15 @@ package com.shunzhi.parent.bean; +import java.io.Serializable; + /** * Created by Administrator on 2018/3/9 0009. */ -public class ChildBean { - private int parentMobile; - private int parentId; +public class ChildBean implements Serializable{ + private String studentUserId; + private int parentMobile; + private int parentId; private boolean mobileFlag; private boolean bindingState; private boolean cooperateFlag; @@ -17,10 +20,18 @@ public class ChildBean { private int classId; private String className; private int studentId; - private int studentUserId; + private String studentName; private String photo; private int sex; + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + public int getParentMobile() { return parentMobile; } @@ -117,11 +128,11 @@ public class ChildBean { this.studentId = studentId; } - public int getStudentUserId() { + public String getStudentUserId() { return studentUserId; } - public void setStudentUserId(int studentUserId) { + public void setStudentUserId(String studentUserId) { this.studentUserId = studentUserId; } @@ -145,19 +156,20 @@ public class ChildBean { public String toString() { return "ChildBean{" + "parentMobile='" + parentMobile + '\'' + - "parentId='" + parentId + '\'' + - "mobileFlag='" + mobileFlag + '\'' + - "bindingState='" + bindingState + '\'' + - "cooperateFlag='" + cooperateFlag + '\'' + - "schoolId='" + schoolId + '\'' + - "schoolName='" + schoolName + '\'' + - "grade='" + grade + '\'' + - "gradename='" + gradename + '\'' + - "classId='" + classId + '\'' + - "className='" + className + '\'' + - "studentId='" + studentId + '\'' + - "studentUserId='" + studentUserId + '\'' + - "photo='" + photo + '\'' + + ",parentId='" + parentId + '\'' + + ",mobileFlag='" + mobileFlag + '\'' + + ",bindingState='" + bindingState + '\'' + + ",cooperateFlag='" + cooperateFlag + '\'' + + ",schoolId='" + schoolId + '\'' + + ",schoolName='" + schoolName + '\'' + + ",grade='" + grade + '\'' + + ",gradename='" + gradename + '\'' + + ",classId='" + classId + '\'' + + ",className='" + className + '\'' + + ",studentId='" + studentId + '\'' + + ",studentName='" + studentName + '\'' + + ",studentUserId='" + studentUserId + '\'' + + ",photo='" + photo + '\'' + ", sex=" + sex + "}"; } 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 1bc41dd..71c76f7 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java @@ -14,8 +14,18 @@ public class CurrentBean implements Serializable{ private String mobile; private boolean bindSchoolFlag; private boolean bindingChildrenFlag; + private int parentId; private int sex; - private List data; + private List studentClass; + + + public int getParentId() { + return parentId; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } public int getSex() { return sex; @@ -73,25 +83,26 @@ public class CurrentBean implements Serializable{ this.bindingChildrenFlag = bindingChildrenFlag; } - public List getData() { - return data; + public List getStudentClass() { + return studentClass; } - public void setData(List data) { - this.data = data; + public void setStudentClass(List studentClass) { + this.studentClass = studentClass; } @Override public String toString() { return "CurrentBean{" + - "userid='" + userid + '\'' + - "name='" + name + '\'' + - "image='" + image + '\'' + - "mobile='" + mobile + '\'' + - "bindSchoolFlag='" + bindSchoolFlag + '\'' + - "bindingChildrenFlag='" + bindingChildrenFlag + '\'' + - "sex='" + sex + '\'' + - ", data=" + data + - '}'; + ", userid='" + userid + '\'' + + ", name='" + name + '\'' + + ", image='" + image + '\'' + + ", mobile='" + mobile + '\'' + + ", parentId='" + parentId + '\'' + + ", bindSchoolFlag='" + bindSchoolFlag + '\'' + + ", bindingChildrenFlag='" + bindingChildrenFlag + '\'' + + ", sex='" + sex + '\'' + + ", studentClass='" + studentClass + + "}"; } } 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 6c62eaa..e5d9cf6 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 @@ -1,27 +1,38 @@ package com.shunzhi.parent.contract.mine; +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.UserInfo; import java.util.List; +import io.reactivex.Observable; + /** * Created by Administrator on 2018/3/9 0009. */ public interface MyChildContract { - abstract class MyChildPresenter extends BasePresenter { - public abstract void loadChildList(); + abstract class MyChildPresenter extends BasePresenter { + 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); } - interface IMyChildModel extends IBaseModel{ + interface IMyChildModel extends IBaseModel { + 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); + } - interface IMyChildView extends IBaseActivity{ + + interface IMyChildView extends IBaseActivity { void updateChilsList(List list); } 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 c4c7f62..9a0f827 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 @@ -1,8 +1,16 @@ package com.shunzhi.parent.model.mine; +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.MyChildContract; +import io.reactivex.Observable; + /** * Created by Administrator on 2018/3/8 0008. */ @@ -11,4 +19,19 @@ public class MyChildModel extends BaseModel implements MyChildContract.IMyChildM public static MyChildModel newInstance() { return new MyChildModel(); } + + @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()); + } + + + + @Override + public Observable addChildResult(int parentId, boolean mobileFlag,boolean cooperateFlag + , int schoolId,int classId,int studentId,String studentUserId) { + return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).addChildResult(parentId,mobileFlag,cooperateFlag,schoolId + ,classId,studentId,studentUserId).compose(RxHelper.rxSchedulerHelper()); + } } 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 e6a8a90..79a5368 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,21 @@ 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.CurrentBean; +import com.shunzhi.parent.bean.UserInfo; import com.shunzhi.parent.contract.mine.MyChildContract; import com.shunzhi.parent.model.mine.MyChildModel; -import java.util.ArrayList; import java.util.List; +import io.reactivex.functions.Consumer; +import retrofit2.HttpException; + /** * Created by Administrator on 2018/3/8 0008. */ @@ -24,14 +33,38 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { } @Override - public void loadChildList() { - ChildBean c=new ChildBean(); - List l=new ArrayList<>(); - l.add(c); - l.add(c); - l.add(c); - l.add(c); - l.add(c); - mIView.updateChilsList(l); + public void loadChildList(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.updateChilsList(list); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + } + })); + + } + + @Override + public void addChild(int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) { + 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()); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + })); + + } + } 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 b571a3e..6e5a2aa 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 @@ -16,6 +16,8 @@ import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.ChildAdapter; import com.shunzhi.parent.bean.ChildBean; @@ -95,7 +97,7 @@ public class MyChildActivity extends BaseMVPCompatActivity + implements MyChildContract.IMyChildView, View.OnClickListener { + int school_id; + LinearLayout iphone_layout; + TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile; + ChildBean childBean; + @NonNull @Override public BasePresenter initPresenter() { - return null; + return new MyChildPresenter(); } @Override protected void initView(Bundle savedInstanceState) { + iphone_layout = findViewById(R.id.iphone_layout); + child_name = findViewById(R.id.child_name); + child_sex = findViewById(R.id.child_sex); + child_grade = findViewById(R.id.child_grade); + child_class = findViewById(R.id.child_class); + add_child = findViewById(R.id.add_child); + add_child.setOnClickListener(this); + user_mobile = findViewById(R.id.user_mobile); +// school_id = getIntent().getIntExtra("school_id", 0); +// Log.e("aaaa--==",school_id+""); + mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 1, ""); } @Override protected int getLayoutId() { return R.layout.activity_check_info; } + + @Override + public void onClick(View v) { + Log.e("qqqq--==",childBean.getStudentUserId()); + mPresenter.addChild(0, true, true, 0, 0, 0, childBean.getStudentUserId()); + } + + @Override + public void updateChilsList(List list) { + if (list != null&&list.size()>0) { + childBean = list.get(0); + 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 = "未知"; + if (sex == 1) { + sexStr = "男"; + } else if (sex == 2) { + + sexStr = "女"; + } + child_sex.setText(sexStr); + child_grade.setText(childBean.getGradename()); + child_class.setText(childBean.getClassName()); + } else { + + ToastUtils.showToast("1111111"); + } + } } 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 new file mode 100644 index 0000000..034c42a --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java @@ -0,0 +1,48 @@ +package com.shunzhi.parent.ui.activity.binding; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.view.View; + +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 { + + @NonNull + @Override + public BasePresenter initPresenter() { + return new MyChildPresenter(); + } + + @Override + public void updateChilsList(List list) { + + } + + @Override + protected void initView(Bundle savedInstanceState) { + + } + + @Override + protected int getLayoutId() { + return R.layout.activity_invitecode; + } + + @Override + public void onClick(View v) { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java index 9f58c7a..cf05d01 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.View; import android.widget.TextView; @@ -149,7 +150,8 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity - - - -