From de62641eb119e3ad5ea4d4055e83e3e96dc2864d Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Wed, 14 Mar 2018 17:02:44 +0800
Subject: [PATCH] no message
---
app/build.gradle | 2 +-
app/src/main/AndroidManifest.xml | 7 ++++++-
app/src/main/java/com/shunzhi/parent/AppConfig.java | 7 ++++---
app/src/main/java/com/shunzhi/parent/AppContext.java | 1 +
app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java | 61 +++++++++++++++++++++++++++++++++++++++++++++----------------
app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java | 4 ++--
app/src/main/java/com/shunzhi/parent/api/MineApi.java | 28 ++++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/bean/ChildBean.java | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
app/src/main/java/com/shunzhi/parent/bean/SchoolBean.java | 25 +++++++++++--------------
app/src/main/java/com/shunzhi/parent/bean/SortBean.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/bean/UserInfo.java | 13 +++++++++++++
app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java | 8 ++++----
app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java | 12 ++++++++----
app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java | 31 +++++++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java | 8 ++++----
app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java | 12 ++++++++++++
app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java | 26 ++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 46 ++++++++++++++++++++++++++++++++++++++--------
app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java | 40 +++++++++++++++++++++++++++++++++++++++-
app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/ui/MainActivity.java | 13 +++++++++++++
app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java | 30 ++++++++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java | 35 ++++++++++++++++++++++++++++++++++-
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
app/src/main/java/com/shunzhi/parent/views/MyProcessDialog.java | 25 +++++++++++++++++++++++++
app/src/main/java/com/shunzhi/parent/views/ProgressView.java | 4 ++--
app/src/main/res/drawable-xhdpi/ic_loading_white.png | Bin 0 -> 1594 bytes
app/src/main/res/drawable/ic_progressbar.xml | 13 +++++++++++++
app/src/main/res/layout/activity_check_info.xml | 6 +++---
app/src/main/res/layout/activity_create_childinfo.xml | 6 +++---
app/src/main/res/layout/activity_personinfo.xml | 13 +++++++++++--
app/src/main/res/layout/fragment_login_and_regist.xml | 15 ++++++++++++++-
app/src/main/res/layout/fragment_mine.xml | 3 +++
app/src/main/res/layout/item_school.xml | 2 ++
app/src/main/res/layout/ui_progress_dialog.xml | 30 ++++++++++++++++++++++++++++++
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/styles.xml | 8 ++++++++
mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java | 5 -----
mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java | 3 +--
42 files changed, 1046 insertions(+), 169 deletions(-)
create mode 100644 app/src/main/java/com/shunzhi/parent/api/MineApi.java
create mode 100644 app/src/main/java/com/shunzhi/parent/bean/SortBean.java
create mode 100644 app/src/main/java/com/shunzhi/parent/bean/UserInfo.java
create mode 100644 app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java
create mode 100644 app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java
create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java
create mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
create mode 100644 app/src/main/java/com/shunzhi/parent/views/MyProcessDialog.java
create mode 100644 app/src/main/res/drawable-xhdpi/ic_loading_white.png
create mode 100644 app/src/main/res/drawable/ic_progressbar.xml
create mode 100644 app/src/main/res/layout/ui_progress_dialog.xml
diff --git a/app/build.gradle b/app/build.gradle
index 57f6623..84e4a4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
config {
keyAlias 'key0'
keyPassword '123456'
- storeFile file('E:/parentwork/app/parent.jks')
+ storeFile file('../app/parent.jks')
storePassword '123456'
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3cef33..67f39eb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -71,7 +71,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
+ <activity android:name=".ui.MainActivity"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MyChildActivity"
android:screenOrientation="portrait" />
@@ -81,6 +82,10 @@
android:name=".ui.activity.StartActivity"
android:screenOrientation="portrait" />
<activity
+ android:name=".ui.activity.binding.CreateChildInfoActivity"
+ android:screenOrientation="portrait"
+ android:windowSoftInputMode="adjustPan|stateHidden"/>
+ <activity
android:name=".ui.activity.binding.SelectSchoolActivity"
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 23a7005..c417057 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -18,6 +18,10 @@ public class AppConfig {
public static String LOGIN_NAME = "login_name";
public static String LOGIN_PWD = "login_pwd";
public static String ACCESS_TOKEN = "access_token";
+ public static String USER_NAME = "user_name";
+ public static String USER_SEX = "user_sex";
+ public static String USER_IMAGE = "user_image";
+
//默认日志保存的路径
public final static String DEFAULT_SAVE_LOG_PATH = Environment
@@ -29,7 +33,6 @@ public class AppConfig {
+ File.separator;
-
private static AppConfig appConfig = null;
private static Context mContext = null;
@@ -71,6 +74,4 @@ public class AppConfig {
}
-
-
}
diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java
index 9fa58ee..4fcd0c2 100644
--- a/app/src/main/java/com/shunzhi/parent/AppContext.java
+++ b/app/src/main/java/com/shunzhi/parent/AppContext.java
@@ -99,6 +99,7 @@ public class AppContext extends GlobalApplication {
if (aMapLocation.getErrorCode()==0){
cityName=aMapLocation.getCity();
+ aMapLocation.getCityCode();
Log.d("mlocation:","handler="+handler);
Intent intent=new Intent();
intent.setAction(LOCATION_CITYNAME+"");
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
index 8dfede3..f3b90c9 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
@@ -6,12 +6,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
import com.shunzhi.parent.R;
-import com.shunzhi.parent.bean.SchoolBean;
+import com.shunzhi.parent.bean.SortBean;
import java.util.List;
@@ -19,14 +20,22 @@ import java.util.List;
* Created by Administrator on 2018/3/9 0009.
*/
-public class SchoolListAdapter extends BaseRecyclerViewAdapter<SchoolBean> {
+public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> {
Context context;
- List<SchoolBean>list;
+ List<SortBean> list;
+ boolean[] ischeck;
+ int currentPosition=-1;
+ public static SortBean currentSortBean;
- public SchoolListAdapter(Context context,List<SchoolBean>list) {
+ public SchoolListAdapter(Context context, List<SortBean> list) {
this.context = context;
- this.list=list;
+ this.list = list;
+ ischeck = new boolean[list.size()];
+ for (int i=0;i<ischeck.length;i++){
+ ischeck[i]=false;
+ }
+
}
@@ -36,20 +45,26 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SchoolBean> {
return new MyViewHolder(view);
}
- private class MyViewHolder extends BaseRecyclerViewHolder<SchoolBean> {
+ private class MyViewHolder extends BaseRecyclerViewHolder<SortBean> {
TextView school_name;
ImageView select_school;
TextView tvLetter;
+ RelativeLayout item_view;
public MyViewHolder(View view) {
super(view);
school_name = view.findViewById(R.id.school_name);
select_school = view.findViewById(R.id.select_school);
tvLetter = view.findViewById(R.id.uiPPLetter);
+ item_view = view.findViewById(R.id.item_view);
}
@Override
- public void onBindViewHolder(SchoolBean object, int position) {
+ public void onBindViewHolder(final SortBean object, final int position) {
+ select_school.setVisibility(View.INVISIBLE);
+ if (ischeck[position] ==true) {
+ select_school.setVisibility(View.VISIBLE);
+ }
int section = getSectionForPosition(position);
//如果当前位置等于该分类首字母的Char的位置 ，则认为是第一次出现,并且不是老师
if (position == getPositionForSection(section)) {
@@ -62,35 +77,49 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SchoolBean> {
tvLetter.setVisibility(View.GONE);
}
- school_name.setText(object.getSchoolname());
+ school_name.setText(object.getSchool_name());
+ item_view.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ischeck[position] = true;
+ if(currentPosition!=-1) {
+ ischeck[currentPosition] = false;
+ }
+ currentPosition = position;
+ currentSortBean=object;
+ notifyDataSetChanged();
+ }
+ });
}
-
-
}
+
public int getPositionForSection(int section) {
for (int i = 0; i < getCount(); i++) {
- String sortStr = list.get(i).getSortLetters();
- char firstChar = sortStr.toUpperCase().charAt(0);
- if (firstChar == section) {
- return i;
+ String sortStr = list.get(i).getSortLetters();
+ char firstChar = sortStr.toUpperCase().charAt(0);
+ if (firstChar == section) {
+ return i;
}
}
return -1;
}
+
public int getCount() {
return list.size();
}
public int getSectionForPosition(int position) {
- return list.get(position).getSortLetters().charAt(0);
+ return list.get(position).getSortLetters().charAt(0);
}
-
+ public static SortBean getCurrentSortBean() {
+ return currentSortBean;
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
index dddb2d9..a8cbf4f 100644
--- a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
+++ b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
@@ -1,7 +1,7 @@
package com.shunzhi.parent.api;
import com.google.gson.JsonObject;
-import com.shunzhi.parent.bean.CurrentBean;
+import com.shunzhi.parent.bean.UserInfo;
import io.reactivex.Observable;
import retrofit2.http.Field;
@@ -38,6 +38,6 @@ public interface LoginRegisterApi {
@FormUrlEncoded
@POST("/api/ParentHelper/GetParentInfo")
- Observable<CurrentBean> getUserInfo();
+ Observable<UserInfo> getUserInfo(@Field("mobile") String mobile, @Field("school_id") int school_id, @Field("captcha") String captcha);
}
diff --git a/app/src/main/java/com/shunzhi/parent/api/MineApi.java b/app/src/main/java/com/shunzhi/parent/api/MineApi.java
new file mode 100644
index 0000000..9c7da05
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/api/MineApi.java
@@ -0,0 +1,28 @@
+package com.shunzhi.parent.api;
+
+import com.google.gson.JsonObject;
+
+import io.reactivex.Observable;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.POST;
+
+/**
+ * Created by Administrator on 2018/3/7 0007.
+ */
+
+public interface MineApi {
+// String url="http://campus.myjxt.com/";
+ String url="http://60.190.202.57:1000/";
+
+@FormUrlEncoded
+ @POST("/api/ParentHelper/GetAreaSchool")
+ Observable<JsonObject> getSchoolListResult(
+ @Field("areaName") String areaName, @Field("Keyword") String Keyword);
+
+@FormUrlEncoded
+@POST("/api/ParentHelper/UpdateParentInfo")
+ Observable<JsonObject> getChangeInfoResult(
+ @Field("parentName") String parentName, @Field("sex") int sex,@Field("mobile")String mobile);
+
+}
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 51072b2..f5604c2 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java
@@ -5,4 +5,160 @@ package com.shunzhi.parent.bean;
*/
public class ChildBean {
-}
+ private int parentMobile;
+ private int parentId;
+ private boolean mobileFlag;
+ private boolean bindingState;
+ private boolean cooperateFlag;
+ private int schoolId;
+ private String schoolName;
+ private int grade;
+ private String gradename;
+ private int classId;
+ private String className;
+ private int studentId;
+ private int studentUserId;
+ private String photo;
+ private int sex;
+
+ public int getParentMobile() {
+ return parentMobile;
+ }
+
+ public void setParentMobile(int parentMobile) {
+ this.parentMobile = parentMobile;
+ }
+
+ public int getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(int parentId) {
+ this.parentId = parentId;
+ }
+
+ public boolean isMobileFlag() {
+ return mobileFlag;
+ }
+
+ public void setMobileFlag(boolean mobileFlag) {
+ this.mobileFlag = mobileFlag;
+ }
+
+ public boolean isBindingState() {
+ return bindingState;
+ }
+
+ public void setBindingState(boolean bindingState) {
+ this.bindingState = bindingState;
+ }
+
+ public boolean isCooperateFlag() {
+ return cooperateFlag;
+ }
+
+ public void setCooperateFlag(boolean cooperateFlag) {
+ this.cooperateFlag = cooperateFlag;
+ }
+
+ public int getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(int schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ public int getGrade() {
+ return grade;
+ }
+
+ public void setGrade(int grade) {
+ this.grade = grade;
+ }
+
+ 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;
+ }
+
+ public int getStudentId() {
+ return studentId;
+ }
+
+ public void setStudentId(int studentId) {
+ this.studentId = studentId;
+ }
+
+ public int getStudentUserId() {
+ return studentUserId;
+ }
+
+ public void setStudentUserId(int studentUserId) {
+ this.studentUserId = studentUserId;
+ }
+
+ public String getPhoto() {
+ return photo;
+ }
+
+ public void setPhoto(String photo) {
+ this.photo = photo;
+ }
+
+ public int getSex() {
+ return sex;
+ }
+
+ public void setSex(int sex) {
+ this.sex = sex;
+ }
+
+ @Override
+ 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 + '\'' +
+ ", sex=" + sex +
+ "}";
+ }
+}
\ 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 bca1933..1bc41dd 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/CurrentBean.java
@@ -1,11 +1,97 @@
package com.shunzhi.parent.bean;
+import java.io.Serializable;
+import java.util.List;
+
/**
* Created by Administrator on 2018/3/13 0013.
*/
-public class CurrentBean {
+public class CurrentBean implements Serializable{
+ private String userid;
+ private String name;
+ private String image;
+ private String mobile;
+ private boolean bindSchoolFlag;
+ private boolean bindingChildrenFlag;
+ private int sex;
+ private List<ChildBean> data;
+
+ public int getSex() {
+ return sex;
+ }
+
+ public void setSex(int sex) {
+ this.sex = sex;
+ }
+
+ public String getUserid() {
+ return userid;
+ }
+
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ public String getMobile() {
+ return mobile;
+ }
+
+ public void setMobile(String mobile) {
+ this.mobile = mobile;
+ }
+
+ public boolean isBindSchoolFlag() {
+ return bindSchoolFlag;
+ }
+
+ public void setBindSchoolFlag(boolean bindSchoolFlag) {
+ this.bindSchoolFlag = bindSchoolFlag;
+ }
+
+ public boolean isBindingChildrenFlag() {
+ return bindingChildrenFlag;
+ }
+
+ public void setBindingChildrenFlag(boolean bindingChildrenFlag) {
+ this.bindingChildrenFlag = bindingChildrenFlag;
+ }
+ public List<ChildBean> getData() {
+ return data;
+ }
+ public void setData(List<ChildBean> data) {
+ this.data = data;
+ }
+ @Override
+ public String toString() {
+ return "CurrentBean{" +
+ "userid='" + userid + '\'' +
+ "name='" + name + '\'' +
+ "image='" + image + '\'' +
+ "mobile='" + mobile + '\'' +
+ "bindSchoolFlag='" + bindSchoolFlag + '\'' +
+ "bindingChildrenFlag='" + bindingChildrenFlag + '\'' +
+ "sex='" + sex + '\'' +
+ ", data=" + data +
+ '}';
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/bean/SchoolBean.java b/app/src/main/java/com/shunzhi/parent/bean/SchoolBean.java
index 03fbda8..c777174 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/SchoolBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/SchoolBean.java
@@ -1,26 +1,23 @@
package com.shunzhi.parent.bean;
+import org.json.JSONObject;
+
/**
* Created by Administrator on 2018/3/9 0009.
*/
public class SchoolBean {
- String schoolname;
- String SortLetters;
+ public String school_name;
+ public String school_area;
+ public String school_id;
+ public String isNew;
- public String getSchoolname() {
- return schoolname;
- }
+ public SchoolBean(JSONObject data){
+ this.school_name=data.optString("school_name");
+ this.school_area =data.optString("school_area");
+ this.school_id =data.optString("school_id");
+ this.isNew =data.optString("isNew");
- public void setSchoolname(String schoolname) {
- this.schoolname = schoolname;
}
- public String getSortLetters() {
- return SortLetters;
- }
-
- public void setSortLetters(String sortLetters) {
- SortLetters = sortLetters;
- }
}
diff --git a/app/src/main/java/com/shunzhi/parent/bean/SortBean.java b/app/src/main/java/com/shunzhi/parent/bean/SortBean.java
new file mode 100644
index 0000000..db4cc97
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/bean/SortBean.java
@@ -0,0 +1,52 @@
+package com.shunzhi.parent.bean;
+
+/**
+ * Created by Administrator on 2018/3/9 0009.
+ */
+
+public class SortBean {
+ String school_name;
+ String SortLetters;
+ String school_area;
+ String school_id;
+ String isNew;
+
+ public String getSchool_name() {
+ return school_name;
+ }
+
+ public void setSchool_name(String school_name) {
+ this.school_name = school_name;
+ }
+
+ public String getSchool_area() {
+ return school_area;
+ }
+
+ public void setSchool_area(String school_area) {
+ this.school_area = school_area;
+ }
+
+ public String getSchool_id() {
+ return school_id;
+ }
+
+ public void setSchool_id(String school_id) {
+ this.school_id = school_id;
+ }
+
+ public String getIsNew() {
+ return isNew;
+ }
+
+ public void setIsNew(String isNew) {
+ this.isNew = isNew;
+ }
+ public String getSortLetters() {
+ return SortLetters;
+ }
+
+ public void setSortLetters(String sortLetters) {
+ SortLetters = sortLetters;
+ }
+}
diff --git a/app/src/main/java/com/shunzhi/parent/bean/UserInfo.java b/app/src/main/java/com/shunzhi/parent/bean/UserInfo.java
new file mode 100644
index 0000000..d9cf1fe
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/bean/UserInfo.java
@@ -0,0 +1,13 @@
+package com.shunzhi.parent.bean;
+
+import com.share.mvpsdk.base.entity.BaseEntity;
+
+/**
+ * Created by Administrator on 2018/3/14 0014.
+ */
+
+public class UserInfo extends BaseEntity<CurrentBean> {
+
+
+
+}
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 cad58bc..5de9726 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
@@ -4,7 +4,7 @@ import com.google.gson.JsonObject;
import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.IBaseFragment;
import com.share.mvpsdk.base.IBaseModel;
-import com.shunzhi.parent.bean.CurrentBean;
+import com.shunzhi.parent.bean.UserInfo;
import io.reactivex.Observable;
@@ -21,7 +21,7 @@ public interface LoginAndRegisterContract {
public abstract void idCodeResult(String phoneNumber);
- public abstract void getUserInfo();
+ public abstract void getUserInfo(String mobile,int school_id,String captcha);
}
interface ILoginModel extends IBaseModel{
@@ -32,12 +32,12 @@ public interface LoginAndRegisterContract {
Observable<JsonObject> getidCodeResult(String phoneNumber);
//获取登录用户信息
- Observable<CurrentBean> getUserInfo();
+ Observable<UserInfo> getUserInfo(String mobile, int school_id, String captcha);
}
interface ILoginView extends IBaseFragment {
//更新用户信息
- void getUserInfo();
+ void getUserInfo(int type);
}
diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java
index 2efe08d..a151f37 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java
@@ -1,26 +1,30 @@
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 io.reactivex.Observable;
+
/**
* Created by Administrator on 2018/3/10 0010.
*/
public interface PersonInfoContract {
- abstract class PersonInfoPresenter extends BasePresenter<IPersonInfoModel,IPersonInfoView> {
-
+ abstract class PersonInfoPresenter extends BasePresenter<IPersonInfoModel, IPersonInfoView> {
+ public abstract void ChangeInfoResult(String parentName, int sex, String mobile);
}
interface IPersonInfoModel extends IBaseModel {
-
+ Observable<JsonObject> getChangeInfoResult(String parentName, int sex, String mobile);
}
- interface IPersonInfoView extends IBaseActivity {
+ interface IPersonInfoView extends IBaseActivity {
+ void updateInfo();
}
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
new file mode 100644
index 0000000..ce9e702
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/contract/mine/SchoolListContract.java
@@ -0,0 +1,31 @@
+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.SchoolBean;
+
+import java.util.List;
+
+import io.reactivex.Observable;
+
+/**
+ * Created by Administrator on 2018/3/13 0013.
+ */
+
+public interface SchoolListContract {
+ abstract class SchoolListPrasenter extends BasePresenter<ISchoolListModel,ISchoolListView> {
+ public abstract void schoolListResult(String areaName, String key);
+ }
+
+ interface ISchoolListModel extends IBaseModel {
+ Observable<JsonObject> getSchoolListResult(String areaName, String key);
+
+
+ }
+ interface ISchoolListView extends IBaseActivity {
+ void showList(List<SchoolBean> list);
+ }
+
+}
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 972ad5d..4f1862b 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
@@ -5,7 +5,7 @@ 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.bean.CurrentBean;
+import com.shunzhi.parent.bean.UserInfo;
import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
import io.reactivex.Observable;
@@ -42,9 +42,9 @@ public class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste
}
@Override
- public Observable<CurrentBean> getUserInfo() {
- return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).getUserInfo()
- .compose(RxHelper.<CurrentBean>rxSchedulerHelper());
+ public Observable<UserInfo> getUserInfo(String mobile, int school_id, String captcha) {
+ return RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).getUserInfo(mobile,school_id,captcha)
+ .compose(RxHelper.<UserInfo>rxSchedulerHelper());
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java b/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java
index 8b7559e..4c685ac 100644
--- a/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java
@@ -1,8 +1,14 @@
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.MineApi;
import com.shunzhi.parent.contract.mine.PersonInfoContract;
+import io.reactivex.Observable;
+
/**
* Created by Administrator on 2018/3/10 0010.
*/
@@ -11,4 +17,10 @@ public class PersonInfoModel extends BaseModel implements PersonInfoContract.IPe
public static PersonInfoModel newInstance() {
return new PersonInfoModel();
}
+
+ @Override
+ public Observable<JsonObject> getChangeInfoResult(String parentName, int sex, String mobile) {
+ return RetrofitCreateHelper.getInstance().createApi(MineApi.class, MineApi.url).getChangeInfoResult(parentName, sex, mobile)
+ .compose(RxHelper.<JsonObject>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
new file mode 100644
index 0000000..3cfe001
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/model/mine/SchoolListModel.java
@@ -0,0 +1,26 @@
+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.MineApi;
+import com.shunzhi.parent.contract.mine.SchoolListContract;
+
+import io.reactivex.Observable;
+
+/**
+ * Created by Administrator on 2018/3/13 0013.
+ */
+
+public class SchoolListModel extends BaseModel implements SchoolListContract.ISchoolListModel {
+ public static SchoolListModel newInstance() {
+ return new SchoolListModel();
+ }
+
+ @Override
+ public Observable<JsonObject> getSchoolListResult(String areaName, String key) {
+ return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).getSchoolListResult(areaName,key)
+ .compose(RxHelper.<JsonObject>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 2b5e709..eca47da 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
@@ -9,8 +9,11 @@ import com.share.mvpsdk.utils.OkHttpExceptionUtil;
import com.share.mvpsdk.utils.ToastUtils;
import com.shunzhi.parent.AppConfig;
import com.shunzhi.parent.AppContext;
+import com.shunzhi.parent.bean.CurrentBean;
+import com.shunzhi.parent.bean.UserInfo;
import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
+import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,7 +48,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName);
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, loginPwd);
RetrofitCreateHelper.getInstance().setAuthorization("Bearer " + jsonObject.get("access_token").getAsString());
- getUserInfo();
+ getUserInfo(loginName, 0, "");
} else {
ToastUtils.showToast(jsonObject.get("error").getAsString());
}
@@ -66,12 +69,14 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}
@Override
- public void registerResult(String adminName, String idCode, String password) {
+ public void registerResult(final String adminName, String idCode, final String password) {
if (!isMate(adminName, REGEX_MOBILE)) {
ToastUtils.showToast("请输入正确的手机号！！");
+ LoginAndRegistFragment.progressDialog.dismiss();
return;
}
if (mIModel == null || mIView == null) {
+ LoginAndRegistFragment.progressDialog.dismiss();
return;
}
@@ -80,12 +85,14 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
public void accept(JsonObject jsonObject) throws Exception {
//TODO 注册成功返回
Log.e("1111", jsonObject.toString());
- mIView.getUserInfo();
+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
+ mIView.getUserInfo(1);
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- ToastUtils.showToast(throwable.getMessage());
+ LoginAndRegistFragment.progressDialog.dismiss();
OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
}
}));
@@ -93,7 +100,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}
@Override
- public void idCodeResult(String phoneNumber) {
+ public void idCodeResult(final String phoneNumber) {
if (!isMate(phoneNumber, REGEX_MOBILE)) {
ToastUtils.showToast("请输入正确的手机号！！");
return;
@@ -110,7 +117,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- ToastUtils.showToast(throwable.getMessage());
+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
}
}));
@@ -118,8 +125,31 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}
@Override
- public void getUserInfo() {
- Log.d("77777", "getUserInfo=");
+ public void getUserInfo(final String mobile, int school_id, String captcha) {
+ mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
+ @Override
+ public void accept(UserInfo userInfo) throws Exception {
+
+ if (userInfo != null) {
+ CurrentBean currentBean = userInfo.getData();
+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
+ 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()));
+ mIView.getUserInfo(0);
+
+ } else {
+ LoginAndRegistFragment.progressDialog.dismiss();
+ ToastUtils.showToast("错误");
+ }
+ }
+ }, new Consumer<Throwable>() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ LoginAndRegistFragment.progressDialog.dismiss();
+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+ }
+ }));
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
index 5198a83..5b15f41 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
@@ -1,6 +1,15 @@
package com.shunzhi.parent.presenter.mine;
+import com.google.gson.JsonObject;
+import com.share.mvpsdk.utils.OkHttpExceptionUtil;
+import com.share.mvpsdk.utils.ToastUtils;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
import com.shunzhi.parent.contract.mine.PersonInfoContract;
+import com.shunzhi.parent.model.mine.PersonInfoModel;
+
+import io.reactivex.functions.Consumer;
+import retrofit2.HttpException;
/**
* Created by Administrator on 2018/3/10 0010.
@@ -9,11 +18,40 @@ import com.shunzhi.parent.contract.mine.PersonInfoContract;
public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter {
@Override
public PersonInfoContract.IPersonInfoModel getModel() {
- return null;
+ return PersonInfoModel.newInstance();
}
@Override
public void onStart() {
}
+
+ @Override
+ public void ChangeInfoResult(final String parentName, final int sex, String mobile) {
+
+ mRxManager.register(mIModel.getChangeInfoResult(parentName, sex, mobile).subscribe(new Consumer<JsonObject>() {
+ @Override
+ public void accept(JsonObject jsonObject) throws Exception {
+ try {
+ if(jsonObject!=null&&jsonObject.get("data").getAsBoolean()) {
+ ToastUtils.showToast(jsonObject.toString());
+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, parentName);
+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(sex));
+ mIView.updateInfo();
+ }
+ } catch (Exception e) {
+ ToastUtils.showToast(e.toString());
+ }
+
+ }
+ }, new Consumer<Throwable>() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+ mIView.updateInfo();
+ }
+ }));
+
+
+ }
}
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
new file mode 100644
index 0000000..75d8fd3
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/SchoolListPrasenter.java
@@ -0,0 +1,56 @@
+package com.shunzhi.parent.presenter.mine;
+
+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.SchoolBean;
+import com.shunzhi.parent.contract.mine.SchoolListContract;
+import com.shunzhi.parent.model.mine.SchoolListModel;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import io.reactivex.functions.Consumer;
+import retrofit2.HttpException;
+
+/**
+ * Created by Administrator on 2018/3/13 0013.
+ */
+
+public class SchoolListPrasenter extends SchoolListContract.SchoolListPrasenter {
+ @Override
+ public SchoolListContract.ISchoolListModel getModel() {
+ return SchoolListModel.newInstance();
+ }
+
+ @Override
+ public void onStart() {
+
+ }
+
+ @Override
+ public void schoolListResult(String areaName, String key) {
+ mRxManager.register(mIModel.getSchoolListResult(areaName, key).subscribe(new Consumer<JsonObject>() {
+ @Override
+ public void accept(JsonObject jsonObject) throws Exception {
+ List<SchoolBean> list = new ArrayList();
+ Gson gson = new Gson();
+ JsonArray jsonArray = jsonObject.getAsJsonArray("data");
+ Iterator it = jsonArray.iterator(); //Iterator处理
+ while (it.hasNext()) { //循环
+ SchoolBean person = gson.fromJson(it.next().toString(), SchoolBean.class); //String转化成JavaBean
+ list.add(person); //加入Listlist
+ }
+ mIView.showList(list);
+ }
+ }, new Consumer<Throwable>() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+ }
+ }));
+
+ }
+}
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 d155675..fb22655 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
@@ -5,6 +5,7 @@ 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;
@@ -17,6 +18,9 @@ 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;
@@ -37,6 +41,8 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
@Override
protected void initView(Bundle savedInstanceState) {
+
+
PermissionUtils.requestMultiPermissions(this, this);
bottom_navigationView = findViewById(R.id.bottom_navigationView);
@@ -114,4 +120,11 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
public void onPermissionGranted(int requestCode) {
}
+
+ @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/PersonInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
index 3cea876..b5e0a73 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
@@ -3,10 +3,18 @@ package com.shunzhi.parent.ui.activity;
import android.os.Bundle;
import android.support.annotation.NonNull;
+import android.text.TextUtils;
import android.view.View;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import com.bumptech.glide.Glide;
+import com.makeramen.roundedimageview.RoundedImageView;
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.contract.mine.PersonInfoContract;
import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
@@ -15,8 +23,14 @@ import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
* Created by Administrator on 2018/3/10 0010.
*/
-public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract.PersonInfoPresenter,PersonInfoContract.IPersonInfoModel>
-implements PersonInfoContract.IPersonInfoView,View.OnClickListener{
+public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract.PersonInfoPresenter, PersonInfoContract.IPersonInfoModel>
+ implements PersonInfoContract.IPersonInfoView, View.OnClickListener {
+ RoundedImageView user_image;
+ TextView user_name, user_mobile, change_info;
+ EditText et_name;
+ RadioButton man, women;
+
+
@NonNull
@Override
public BasePresenter initPresenter() {
@@ -25,6 +39,43 @@ implements PersonInfoContract.IPersonInfoView,View.OnClickListener{
@Override
protected void initView(Bundle savedInstanceState) {
+ user_image = findViewById(R.id.user_photo);
+ user_name = findViewById(R.id.user_name);
+ user_mobile = findViewById(R.id.user_mobile);
+ et_name = findViewById(R.id.et_name);
+ et_name.setOnClickListener(this);
+ man = findViewById(R.id.man);
+ women = findViewById(R.id.women);
+ change_info = findViewById(R.id.change_info);
+ change_info.setOnClickListener(this);
+ initInfo();
+
+
+ }
+
+ private void initInfo() {
+ String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
+ if (!TextUtils.isEmpty(url)) {
+ Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
+ } else {
+ Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
+ }
+ user_image.setCornerRadius(20);
+ user_image.setOval(true);
+ user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
+ user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+ et_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
+ int sex = Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_SEX));
+ if (sex == 0) {
+ man.setChecked(false);
+ women.setChecked(false);
+ } else if (sex == 1) {
+ man.setChecked(true);
+ women.setChecked(false);
+ } else if (sex == 2) {
+ man.setChecked(false);
+ women.setChecked(true);
+ }
}
@@ -35,6 +86,24 @@ implements PersonInfoContract.IPersonInfoView,View.OnClickListener{
@Override
public void onClick(View v) {
+ if (v == et_name) {
+ } else if (v == change_info) {
+ int sex = 0;
+ if (man.isChecked()) {
+ sex = 1;
+ }
+ if (women.isChecked()) {
+ sex = 2;
+ }
+
+ mPresenter.ChangeInfoResult(et_name.getText().toString().trim(), sex, user_mobile.getText().toString().trim());
+
+ }
+ }
+
+ @Override
+ public void updateInfo() {
+ finish();
}
}
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
new file mode 100644
index 0000000..3e6bfc5
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
@@ -0,0 +1,30 @@
+package com.shunzhi.parent.ui.activity.binding;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.share.mvpsdk.base.BasePresenter;
+import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by Administrator on 2018/3/13 0013.
+ */
+
+public class CreateChildInfoActivity extends BaseMVPCompatActivity{
+ @NonNull
+ @Override
+ public BasePresenter initPresenter() {
+ return null;
+ }
+
+ @Override
+ protected void initView(Bundle savedInstanceState) {
+
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_create_childinfo;
+ }
+}
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 9feb8e3..9f58c7a 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
@@ -10,9 +10,14 @@ 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.AppContext;
import com.shunzhi.parent.R;
import com.shunzhi.parent.adapter.SchoolListAdapter;
import com.shunzhi.parent.bean.SchoolBean;
+import com.shunzhi.parent.bean.SortBean;
+import com.shunzhi.parent.contract.mine.SchoolListContract;
+import com.shunzhi.parent.presenter.mine.SchoolListPrasenter;
import com.shunzhi.parent.util.CharacterParser;
import com.shunzhi.parent.views.SideBar;
@@ -25,10 +30,11 @@ import java.util.List;
* Created by Administrator on 2018/3/12 0012.
*/
-public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.OnClickListener{
+public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContract.SchoolListPrasenter, SchoolListContract.ISchoolListModel> implements
+ View.OnClickListener, SchoolListContract.ISchoolListView {
private SideBar sideBar;
- private TextView dialog,go_next;
+ private TextView dialog, go_next, tvLocalAddress;
private RecyclerView schoollist;
private List<String> list = new ArrayList<>();
SchoolListAdapter schoolListAdapter;
@@ -36,78 +42,23 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.
@NonNull
@Override
public BasePresenter initPresenter() {
- return null;
+ return new SchoolListPrasenter();
}
@Override
protected void initView(Bundle savedInstanceState) {
sideBar = findViewById(R.id.sidrbar);
dialog = findViewById(R.id.dialog);
- go_next=findViewById(R.id.go_next);
+ go_next = findViewById(R.id.go_next);
go_next.setOnClickListener(this);
+ tvLocalAddress = findViewById(R.id.tvLocalAddress);
+ tvLocalAddress.setText(AppContext.getInstance().cityName);
+ setSchoolList();
-
-
- 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("血色城堡");
schoollist = findViewById(R.id.schoollist);
schoollist.setLayoutManager(new LinearLayoutManager(this));
- final List<SchoolBean>schoolList=OrderedSortSmodel(list);
- schoolListAdapter = new SchoolListAdapter(this,schoolList);
- schoolListAdapter.addAll(schoolList);
- schoollist.setAdapter(schoolListAdapter);
+
sideBar.setOnTouchingLetterChangedListener(new SideBar.OnTouchingLetterChangedListener() {
@Override
public void onTouchingLetterChanged(String s) {
@@ -125,21 +76,28 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.
}
+ private void setSchoolList() {
+ mPresenter.schoolListResult("杭州", "");
+ }
+
@Override
protected int getLayoutId() {
return R.layout.activity_select_school;
}
- List<SchoolBean> OrderedSortSmodel(List<String> list) {
- List<SchoolBean> schoolList = new ArrayList<>();
+ List<SortBean> OrderedSortSmodel(List<SchoolBean> list) {
+ List<SortBean> schoolList = new ArrayList<>();
CharacterParser characterParser = CharacterParser.getInstance();
- for (String c : list) {
- SchoolBean s = new SchoolBean();
- s.setSchoolname(c);
+ for (SchoolBean c : list) {
+ SortBean s = new SortBean();
+ s.setSchool_name(c.school_name);
+ s.setSchool_area(c.school_area);
+ s.setSchool_id(c.school_id);
+ s.setIsNew(c.isNew);
//汉字转换成拼音
- String pinyin = characterParser.getSelling(s.getSchoolname());
+ String pinyin = characterParser.getSelling(s.getSchool_name());
String sortString = "";
try {
sortString = pinyin.substring(0, 1).toUpperCase();
@@ -147,7 +105,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.
continue;
}
// 正则表达式，判断首字母是否是英文字母
- if (sortString.matches("[A-Z]") ) {
+ if (sortString.matches("[A-Z]")) {
s.setSortLetters(sortString.toUpperCase());
} else {
s.setSortLetters("#");
@@ -159,10 +117,10 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.
}
- public static List<SchoolBean> orderByNameIndexAndIndentity(List<SchoolBean> sortModels) {
- Collections.sort(sortModels, new Comparator<SchoolBean>() {
+ public static List<SortBean> orderByNameIndexAndIndentity(List<SortBean> sortModels) {
+ Collections.sort(sortModels, new Comparator<SortBean>() {
@Override
- public int compare(SchoolBean o1, SchoolBean o2) {
+ public int compare(SortBean o1, SortBean o2) {
if (o1.getSortLetters().equals("#") && o2.getSortLetters().matches("[A-Z]")) {
return -1;
} else if (o1.getSortLetters().equals("#") && !o2.getSortLetters().matches("[A-Z]")) {
@@ -187,10 +145,81 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity implements View.
@Override
public void onClick(View v) {
- if(v==go_next){
- startActivity(new Intent().setClass(SelectSchoolActivity.this,CheckInfoActivity.class));
+ if (v == go_next) {
+ SortBean currentSortBean = schoolListAdapter.getCurrentSortBean();
+ if (currentSortBean != null) {
+ if (currentSortBean.getIsNew().equals("0")) {
+ startActivity(new Intent().setClass(SelectSchoolActivity.this, CheckInfoActivity.class));
+ } else {
+ startActivity(new Intent().setClass(SelectSchoolActivity.this,CreateChildInfoActivity.class));
+ }
+ } else {
+ ToastUtils.showToast("请选择学校");
+ }
}
}
+
+
+ @Override
+ public void showList(List<SchoolBean> 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<SortBean> schoolList = OrderedSortSmodel(list);
+ schoolListAdapter = new SchoolListAdapter(this, schoolList);
+ schoolListAdapter.addAll(schoolList);
+ schoollist.setAdapter(schoolListAdapter);
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index e26e48b..6228ef5 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -4,11 +4,18 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.bumptech.glide.Glide;
+import com.makeramen.roundedimageview.RoundedImageView;
import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+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.contract.loginandregister.LoginAndRegisterContract;
import com.shunzhi.parent.contract.mine.MineContract;
@@ -18,7 +25,9 @@ import com.shunzhi.parent.ui.activity.PersonInfoActivity;
public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
implements MineContract.IMineView, View.OnClickListener {
- LinearLayout childlayout,personinfo;
+ LinearLayout childlayout, personinfo;
+ RoundedImageView user_photo;
+ TextView user_name, user_mobile;
@NonNull
@Override
@@ -37,6 +46,25 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
personinfo = view.findViewById(R.id.personinfo);
childlayout.setOnClickListener(this);
personinfo.setOnClickListener(this);
+ user_photo = view.findViewById(R.id.user_photo);
+ user_name = view.findViewById(R.id.user_name);
+ user_mobile = view.findViewById(R.id.user_mobile);
+
+ }
+
+ private void setPersonInfo() {
+ String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
+ ToastUtils.showToast(url);
+ if (!TextUtils.isEmpty(url)) {
+ Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
+ } else {
+ Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+ user_photo.setCornerRadius(20);
+ }
+ user_photo.setCornerRadius(20);
+ user_photo.setOval(true);
+ user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
+ user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
}
@@ -54,6 +82,11 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
break;
}
+ }
+ @Override
+ public void onResume() {
+ super.onResume();
+ setPersonInfo();
}
}
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 b2d41a9..43fbc23 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
@@ -1,12 +1,15 @@
package com.shunzhi.parent.ui.fragment.loginandregistfragment;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -20,11 +23,17 @@ import android.widget.TextView;
import com.makeramen.roundedimageview.RoundedImageView;
import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
-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.contract.loginandregister.LoginAndRegisterContract;
import com.shunzhi.parent.presenter.loginandregister.LoginAndRegisterPresenter;
+import com.shunzhi.parent.ui.MainActivity;
import com.shunzhi.parent.ui.activity.LoginAndRegistActivity;
+import com.shunzhi.parent.views.MyProcessDialog;
+
+import java.util.Calendar;
+import java.util.Date;
public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
@@ -33,10 +42,11 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
public RoundedImageView roundedImageView;
public EditText phoneNumber, idCode, password;
public TextView get_idCode, loginAndRegister, tv_info, tv_goto;
- public LinearLayout phoneLayout, idCodeLayout, passwordLayout,main_login;
+ public LinearLayout phoneLayout, idCodeLayout, passwordLayout, main_login;
public ImageView img_eye;
public static String typepage;
public boolean open = false;
+ public static MyProcessDialog progressDialog;
public static LoginAndRegistFragment getInstance(String type) {
@@ -59,6 +69,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
@Override
public void initUI(View view, @Nullable Bundle savedInstanceState) {
+ progressDialog = new MyProcessDialog(getActivity());
main_login = view.findViewById(R.id.main_login);
roundedImageView = view.findViewById(R.id.photoImage);
phoneNumber = view.findViewById(R.id.et_phoneNumber);
@@ -79,6 +90,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
phoneNumber.addTextChangedListener(textWatcher);
idCode.addTextChangedListener(textWatcher);
password.addTextChangedListener(textWatcher);
+ mPresenter.loginResult("18358585335", "123456");
if ("登录".equals(typepage)) {
idCodeLayout.setVisibility(View.GONE);
loginAndRegister.setText("登录");
@@ -94,32 +106,59 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
@Override
- public void getUserInfo() {
- PopupWindow popupWindow=new PopupWindow();
- popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
- popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
- View view= LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view,null);
- popupWindow.setContentView(view);
- popupWindow.showAtLocation(main_login, Gravity.CENTER,0,0);
+ public void getUserInfo(int type) {
+ progressDialog.dismiss();
+ if (type == 0) {
+ startActivity(new Intent().setClass(getActivity(), MainActivity.class));
+ getActivity().finish();
+ } else if (type == 1) {
+ PopupWindow popupWindow = new PopupWindow();
+ popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+ popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
+ TextView right_btn = view.findViewById(R.id.right_btn);
+ right_btn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ progressDialog.show();
+ mPresenter.loginResult(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME),AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_PWD));
+ }
+ });
+ TextView cancel_btn = view.findViewById(R.id.cancel_btn);
+ cancel_btn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+ phoneNumber.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+ password.setFocusable(true);
+ }
+ });
+
+ popupWindow.setContentView(view);
+ popupWindow.showAtLocation(main_login, Gravity.CENTER, 0, 0);
+ }
}
+ @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@Override
public void onClick(View v) {
if (v == loginAndRegister) {
- ToastUtils.showToast("onClick");
+ progressDialog.show();
+ Date l = Calendar.getInstance().getTime();
+
+ Log.e("1111--==", l.getTime() + "");
if (loginAndRegister.getText().toString().trim().equals("登录")) {
- mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString());
+ 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());
+ mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
}
} else if (v == tv_goto) {
if (tv_goto.getText().toString().equals("登录")) {
startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
-
} else if (tv_goto.getText().toString().equals("注册")) {
startActivity(new Intent().putExtra("type", "注册").setClass(getActivity(), LoginAndRegistActivity.class));
}
@@ -139,6 +178,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
password.setSelection(password.getText().toString().length());
}
}
+
TextWatcher textWatcher = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/java/com/shunzhi/parent/views/MyProcessDialog.java b/app/src/main/java/com/shunzhi/parent/views/MyProcessDialog.java
new file mode 100644
index 0000000..d7709e9
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/views/MyProcessDialog.java
@@ -0,0 +1,25 @@
+package com.shunzhi.parent.views;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.widget.TextView;
+
+import com.shunzhi.parent.R;
+
+
+public class MyProcessDialog extends Dialog {
+ private TextView txt_info;
+
+ public MyProcessDialog(Context context) {
+ super(context, R.style.MyProgressDialog);
+ this.setContentView(R.layout.ui_progress_dialog);
+ txt_info = (TextView)this.findViewById(R.id.txt_wait);
+ }
+
+ public void setMsg(String msg){
+ if(null != txt_info){
+ txt_info.setText(msg);
+ }
+ }
+}
diff --git a/app/src/main/java/com/shunzhi/parent/views/ProgressView.java b/app/src/main/java/com/shunzhi/parent/views/ProgressView.java
index c66ccd5..3bc4e3e 100644
--- a/app/src/main/java/com/shunzhi/parent/views/ProgressView.java
+++ b/app/src/main/java/com/shunzhi/parent/views/ProgressView.java
@@ -55,7 +55,7 @@ public class ProgressView extends View {
super.onDraw(canvas);
initPaint();
RectF rectBlackBg = new RectF(20, 20, mWidth - 20, mHeight - 20);
- canvas.drawArc(rectBlackBg, 0, 275, false, mPaint);
+ canvas.drawArc(rectBlackBg, 0, 270, false, mPaint);
mPaint.setColor(getColor(score));
canvas.drawText(score + "%", mWidth / 2, mHeight / 2, mTextPaint);
mTextPaint.setTextSize(40);
@@ -70,7 +70,7 @@ public class ProgressView extends View {
mPaint.setShader(sweepGradient);
mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP));
mPaint.setStyle(Style.STROKE);
- canvas.drawArc(rectBlackBg, 135, section * 275, false, mPaint);
+ canvas.drawArc(rectBlackBg, 135, section * 270, false, mPaint);
}
diff --git a/app/src/main/res/drawable-xhdpi/ic_loading_white.png b/app/src/main/res/drawable-xhdpi/ic_loading_white.png
new file mode 100644
index 0000000..ac7a5df
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_loading_white.png differ
diff --git a/app/src/main/res/drawable/ic_progressbar.xml b/app/src/main/res/drawable/ic_progressbar.xml
new file mode 100644
index 0000000..90d5670
--- /dev/null
+++ b/app/src/main/res/drawable/ic_progressbar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <rotate
+ android:drawable="@drawable/ic_loading_white"
+ android:duration="1000"
+ android:fromDegrees="0.0"
+ android:interpolator="@android:anim/linear_interpolator"
+ android:pivotX="50.0%"
+ android:pivotY="50.0%"
+ android:toDegrees="360.0" />
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_check_info.xml b/app/src/main/res/layout/activity_check_info.xml
index 21bdf96..0eb5b04 100644
--- a/app/src/main/res/layout/activity_check_info.xml
+++ b/app/src/main/res/layout/activity_check_info.xml
@@ -78,7 +78,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="性 别："
+ android:text="性 别："
android:textSize="@dimen/sp_16" />
<EditText
@@ -102,7 +102,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="年 级："
+ android:text="年 级："
android:textSize="@dimen/sp_16" />
<EditText
@@ -126,7 +126,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="班 级："
+ android:text="班 级："
android:textSize="@dimen/sp_16" />
<EditText
diff --git a/app/src/main/res/layout/activity_create_childinfo.xml b/app/src/main/res/layout/activity_create_childinfo.xml
index 109fe3b..7b385c4 100644
--- a/app/src/main/res/layout/activity_create_childinfo.xml
+++ b/app/src/main/res/layout/activity_create_childinfo.xml
@@ -63,7 +63,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="性 别："
+ android:text="性 别："
android:textSize="@dimen/sp_16" />
<EditText
@@ -88,7 +88,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="年 级："
+ android:text="年 级："
android:textSize="@dimen/sp_16" />
<EditText
@@ -113,7 +113,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="班 级："
+ android:text="班 级："
android:textSize="@dimen/sp_16" />
<EditText
diff --git a/app/src/main/res/layout/activity_personinfo.xml b/app/src/main/res/layout/activity_personinfo.xml
index efafb30..8f3db3c 100644
--- a/app/src/main/res/layout/activity_personinfo.xml
+++ b/app/src/main/res/layout/activity_personinfo.xml
@@ -48,10 +48,13 @@
android:layout_centerInParent="true">
<com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/user_photo"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@color/white"
- app:riv_corner_radius="20dp" />
+ app:riv_corner_radius="20dp"
+ app:riv_oval="false"
+ />
</FrameLayout>
<LinearLayout
@@ -65,12 +68,14 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="马铂骞"
android:textSize="@dimen/txtsize_title" />
<TextView
+ android:id="@+id/user_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="账号：12345678991"
@@ -95,6 +100,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout
@@ -126,7 +133,6 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:background="@null"
- android:focusable="false"
android:text="马铂骞"
android:textColor="@color/text_color"
android:textSize="@dimen/txtsize_title" />
@@ -168,6 +174,7 @@
android:orientation="horizontal">
<RadioButton
+ android:id="@+id/man"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@null"
@@ -178,6 +185,7 @@
android:textSize="@dimen/txtsize_title" />
<RadioButton
+ android:id="@+id/women"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
@@ -203,6 +211,7 @@
</LinearLayout>
<TextView
+ android:id="@+id/change_info"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_margin="20dp"
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 018680a..728dea6 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -44,6 +44,7 @@
android:layout_height="50dp"
android:background="@null"
android:hint="请输入手机号码"
+ android:text="18358585335"
android:maxLength="11"
android:textColorHint="@color/hintTextColor"
android:textSize="@dimen/sp_16" />
@@ -116,6 +117,7 @@
android:layout_weight="1"
android:background="@null"
android:hint="请设置密码：6～16个字符"
+ android:text="123456"
android:maxLength="16"
android:inputType="textPassword"
android:textColorHint="@color/hintTextColor"
@@ -197,7 +199,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center"
- android:visibility="gone"
android:orientation="horizontal">
<TextView
@@ -222,6 +223,7 @@
android:id="@+id/denglu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:layout_marginTop="30dp"
android:orientation="horizontal">
@@ -240,6 +242,17 @@
android:text="注册"
android:textColor="#acc9fc"
android:textSize="@dimen/sp_16" />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="忘记密码"
+ android:textColor="#acc9fc"
+ android:textSize="@dimen/sp_16" />
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 01191a2..e967a1b 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -36,6 +36,7 @@
android:orientation="horizontal">
<com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/user_photo"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="20dp"
@@ -50,6 +51,7 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="马铂賽"
@@ -57,6 +59,7 @@
android:textSize="@dimen/txtsize_headline" />
<TextView
+ android:id="@+id/user_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="账号：12345678991"
diff --git a/app/src/main/res/layout/item_school.xml b/app/src/main/res/layout/item_school.xml
index 48ff1c4..7ec5558 100644
--- a/app/src/main/res/layout/item_school.xml
+++ b/app/src/main/res/layout/item_school.xml
@@ -19,6 +19,7 @@
android:textColor="#454545" />
</LinearLayout>
<RelativeLayout
+ android:id="@+id/item_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -38,6 +39,7 @@
android:layout_width="20dp"
android:layout_height="40dp"
android:layout_marginRight="40dp"
+ android:visibility="invisible"
android:gravity="center_vertical"
android:src="@drawable/select_ok" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/ui_progress_dialog.xml b/app/src/main/res/layout/ui_progress_dialog.xml
new file mode 100644
index 0000000..5dfe860
--- /dev/null
+++ b/app/src/main/res/layout/ui_progress_dialog.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/progress_bg"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:focusable="false"
+ android:indeterminateDrawable="@drawable/ic_progressbar"
+ />
+
+ <TextView
+ android:id="@+id/txt_wait"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="8.0dip"
+ android:focusable="false"
+ android:singleLine="true"
+ android:textColor="@color/white"
+ android:text="加载中..."
+ android:textSize="12.0sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6a78ac2..787a673 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,4 +19,5 @@
<color name="huodong_blue">#ACD1FB</color>
<color name="text_color">#757575</color>
<color name="textGreen">#5FB762</color>
+ <color name="transparent">#00000000</color>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 78fa2a2..bbe6ef3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,5 +32,13 @@
<item name="android:layout_height">match_parent</item>
<item name="android:textSize">@dimen/textSize16</item>
</style>
+ <style name="MyProgressDialog" parent="@android:style/Theme.Dialog">
+ <item name="android:windowBackground">@color/transparent</item>
+ <item name="android:windowFrame">@color/transparent</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:backgroundDimEnabled">true</item>
+ </style>
</resources>
diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java b/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java
index 471d198..c2cdb5a 100644
--- a/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java
+++ b/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java
@@ -1,13 +1,8 @@
package com.share.mvpsdk.helper;
-import android.util.Log;
-
import com.share.mvpsdk.helper.okhttp.CacheInterceptor;
-import com.share.mvpsdk.helper.okhttp.HttpCache;
-import com.share.mvpsdk.helper.okhttp.TrustManager;
import com.share.mvpsdk.utils.StringUtils;
-import com.share.mvpsdk.utils.ToastUtils;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java b/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
index b48edf3..8e8ffea 100644
--- a/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
+++ b/mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java
@@ -1,7 +1,6 @@
package com.share.mvpsdk.utils;
import android.support.annotation.NonNull;
-import android.util.Log;
import org.json.JSONObject;
@@ -21,7 +20,7 @@ public class OkHttpExceptionUtil {
if (responseBody==null)return;
try {
JSONObject json = new JSONObject(responseBody.string());
- ToastUtils.showToast(json.optString("error"));
+ ToastUtils.showToast(json.optString("message"));
} catch (Exception e1) {
e1.printStackTrace();
}
--
libgit2 0.21.0