diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index d4f4821..ba05410 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -77,7 +77,7 @@ - + diff --git a/PersonalCenter/app/build.gradle b/PersonalCenter/app/build.gradle index ab09fa1..6257ec4 100644 --- a/PersonalCenter/app/build.gradle +++ b/PersonalCenter/app/build.gradle @@ -38,4 +38,5 @@ dependencies { compile project(':circledialog') compile project(':pickerview') compile files('libs/android-async-http-1.4.8.jar') + compile 'com.google.code.gson:gson:2.7' } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java index 78a059f..a7f8a25 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java @@ -14,7 +14,7 @@ import com.hjx.personalcenter.R; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.util.AlertUtils; import com.hjx.personalcenter.util.PasswordCheckUtils; -import com.hjx.personalcenter.util.SaveParam; +import com.hjx.personalcenter.db.SaveParam; /**修改密码 * Created by h on 2017/6/27. diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java index d3cbc37..9278527 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java @@ -2,8 +2,6 @@ package com.hjx.personalcenter.activity; import android.content.Intent; import android.os.Bundle; -import android.os.Handler; -import android.os.Message; import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; @@ -13,12 +11,8 @@ import android.widget.TextView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.customdialog.GradeListDialog; import com.hjx.personalcenter.customdialog.ProvinceListDialog; -import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; -import org.json.JSONException; -import org.json.JSONObject; - /**填写注册信息 熊巍 * Created by h on 2017/8/9. */ @@ -28,24 +22,6 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl private TextView et_region,et_grade,et_school; private Button btn_ok; String[] items; - Handler handler = new Handler() { - @Override - public void handleMessage(Message msg) { - super.handleMessage(msg); - try { - JSONObject jsonObject; - String status; - switch (msg.what) { - case HttpCode.PROVICES: - jsonObject = (JSONObject) msg.obj; - status = jsonObject.getString("status"); - - } - } catch (JSONException e) { - e.printStackTrace(); - } - } - }; @Override protected void onCreate(Bundle savedInstanceState) { @@ -102,7 +78,7 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl } //选择地区 private void choiseregion() { - HttpManager.getInstance().provices(RegisterInfoActivity.this,handler); + HttpManager.getInstance().countyinfo(RegisterInfoActivity.this,210300); ProvinceListDialog.getInstance().show(getSupportFragmentManager(), "ProvinceListDialog"); } //选择年级 diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/areapicker/AreaBean.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/areapicker/AreaBean.java deleted file mode 100644 index dc3dc8e..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/areapicker/AreaBean.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * HaoJiXing Teacher Q&A - * copyright(C)2013- Acorn International - * - * packeage：com.ozing.callteacher.widget.areapicker.Province.java - * create：2013年8月8日上午11:20:30 - */ -package com.hjx.personalcenter.areapicker; - -/** - * @author jixiaolong - * @code: 015261 - */ -public class AreaBean { - public static final int PROVINCE = 0x11; - public static final int CITY = 0x12; - public static final int COUNTY = 0x13; - protected int level; - protected String id; - protected String name; - protected String fullName; - protected String parentId; - - public int getLevel() { - return level; - } - - public void setLevel(int level) { - this.level = level; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - @Override - public String toString() { - return fullName; - } -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java index 4081eee..74b0acb 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java @@ -44,8 +44,10 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); listView = (ListView) getView().findViewById(R.id.listadapter); - for (int i=0;i<=50;i++){ - data.add("aaa"+i); + + for (int i =0 ; i<50;i++){ + data.add("sss"+1); + } listadapter = new ArrayAdapter(getActivity(),R.layout.custom_adilog_list_item,R.id.list_items,data); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java new file mode 100644 index 0000000..42c1c63 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java @@ -0,0 +1,57 @@ +package com.hjx.personalcenter.db; + +import android.app.Activity; +import android.content.Context; +import android.content.SharedPreferences; + +public class SaveParam { + + private static SaveParam instance; + public static SaveParam getInstance(){ + if (instance==null){ + instance = new SaveParam(); + } + return instance; + } + + + public void saveLoginParam(Context context,String spname, String spstr) { + SharedPreferences sp = context.getSharedPreferences("loginparam", + Activity.MODE_PRIVATE); + + sp.edit().putString(spname, spstr).commit(); + } + + public String getLoginParam(Context context,String spname) { + SharedPreferences sp = context.getSharedPreferences("loginparam", + Activity.MODE_PRIVATE); + String param = sp.getString(spname, null); + return param; + } + public void clearData(Context context) { + SharedPreferences sp = context.getSharedPreferences("loginparam", + Activity.MODE_PRIVATE); + sp.edit().clear().commit(); + } + + public void saveCustomizeParam(Context context,String spname, String spstr) { + SharedPreferences sp = context.getSharedPreferences("presoninfo", + Activity.MODE_PRIVATE); + + sp.edit().putString(spname, spstr).commit(); + + } + + public String getCustomizeParam(Context context,String spname) { + SharedPreferences sp = context.getSharedPreferences("presoninfo", + Activity.MODE_PRIVATE); + String param = sp.getString(spname, null); + return param; + } + + public void clearCustomizeParam(Context context ){ + SharedPreferences sp = context.getSharedPreferences("presoninfo", + Activity.MODE_PRIVATE); + sp.edit().clear().commit(); + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/RemoteException.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/RemoteException.java deleted file mode 100644 index b0acb89..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/RemoteException.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * HaoJiXing Teacher Q&A - * copyright(C)2013- Acorn International - * - * packeage：com.ozing.callteacher.parser.RemoteException.java - * create：2013年7月25日下午1:58:14 - */ -package com.hjx.personalcenter.exception; - -/** - * @author jixiaolong - * @code: 015261 - */ -public class RemoteException extends Exception { - private ResponseError error; - /** - * - */ - private static final long serialVersionUID = -9062978963856572686L; - public RemoteException(String error) { - super(error); - this.error = new ResponseError(); - this.error.setMessage(error); - this.error.setStatus(-1); - } - public RemoteException(ResponseError error) { - super(error.getMessage()); - this.error = error; - } - - public ResponseError getError() { - return error; - } -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/ResponseError.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/ResponseError.java deleted file mode 100644 index ad2d605..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/exception/ResponseError.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * HaoJiXing Teacher Q&A - * copyright(C)2013- Acorn International - * - * packeage：com.ozing.callteacher.parser.ResponseError.java - * create：2013年9月29日下午3:30:17 - */ -package com.hjx.personalcenter.exception; - - -/** - * @author jixiaolong - * @code: 015261 - */ -public class ResponseError { - private int status = -1; - private String message; - public int getStatus() { - return status; - } - public void setStatus(int status) { - this.status = status; - } - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - - public boolean hasError(){ - return status!=0 && status!=100; - } - -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java index bb03789..56dc414 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java @@ -9,9 +9,13 @@ import android.os.Message; import android.util.Log; import android.widget.Toast; +import com.google.gson.Gson; import com.hjx.personalcenter.activity.LoginAndRegisterActivity; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.model.CityInfo; +import com.hjx.personalcenter.model.CountyInfo; +import com.hjx.personalcenter.model.ProvinceInfo; import com.hjx.personalcenter.util.DialogPermission; -import com.hjx.personalcenter.util.SaveParam; import com.loopj.android.http.AsyncHttpResponseHandler; import com.loopj.android.http.JsonHttpResponseHandler; import com.loopj.android.http.RequestParams; @@ -289,17 +293,52 @@ public class HttpManager { SaveParam.getInstance().saveLoginParam(context,"gender", gender); SaveParam.getInstance().saveLoginParam(context,"mobilePortrait", mobilePortrait); } +///省级接口 + public void provices(final Context mContext) { + HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); + HttpClient.getInstance().get(HttpUrl.provinceUrl, new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { + Log.e("test", "省" + new String(arg2)); + Gson gson = new Gson(); + ProvinceInfo provinceInfo = gson.fromJson(new String(arg2),ProvinceInfo.class); + for (int i =0 ; i cities; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public List getCities() { + return cities; + } + + public void setCities(List cities) { + this.cities = cities; + } + + public static class CitiesBean { + /** + * regionId : 210100 + * parentId : 210000 + * regionName : 沈阳 + */ + + private int regionId; + private int parentId; + private String regionName; + + public int getRegionId() { + return regionId; + } + + public void setRegionId(int regionId) { + this.regionId = regionId; + } + + public int getParentId() { + return parentId; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CountyInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CountyInfo.java new file mode 100644 index 0000000..52b41ba --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CountyInfo.java @@ -0,0 +1,80 @@ +package com.hjx.personalcenter.model; + +import java.util.List; + +/** + * Created by h on 2017/8/16. + */ + +public class CountyInfo { + + /** + * status : 100 + * message : success + * counties : [{"regionId":210302,"parentId":210300,"regionName":"铁东"},{"regionId":210303,"parentId":210300,"regionName":"铁西"},{"regionId":210304,"parentId":210300,"regionName":"立山"},{"regionId":210311,"parentId":210300,"regionName":"千山"},{"regionId":210321,"parentId":210300,"regionName":"台安"},{"regionId":210323,"parentId":210300,"regionName":"岫岩"},{"regionId":210381,"parentId":210300,"regionName":"海城"}] + */ + + private int status; + private String message; + private List counties; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public List getCounties() { + return counties; + } + + public void setCounties(List counties) { + this.counties = counties; + } + + public static class CountiesBean { + /** + * regionId : 210302 + * parentId : 210300 + * regionName : 铁东 + */ + + private int regionId; + private int parentId; + private String regionName; + + public int getRegionId() { + return regionId; + } + + public void setRegionId(int regionId) { + this.regionId = regionId; + } + + public int getParentId() { + return parentId; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ProvinceInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ProvinceInfo.java new file mode 100644 index 0000000..e53f322 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ProvinceInfo.java @@ -0,0 +1,80 @@ +package com.hjx.personalcenter.model; + +import java.util.List; + +/** + * Created by h on 2017/8/16. + */ + +public class ProvinceInfo { + + /** + * status : 100 + * message : success + * provinces : [{"parentId":0,"regionId":110000,"regionName":"北京"},{"parentId":0,"regionId":120000,"regionName":"天津"},{"parentId":0,"regionId":130000,"regionName":"河北"},{"parentId":0,"regionId":140000,"regionName":"山西"},{"parentId":0,"regionId":150000,"regionName":"内蒙古"},{"parentId":0,"regionId":210000,"regionName":"辽宁"},{"parentId":0,"regionId":220000,"regionName":"吉林"},{"parentId":0,"regionId":230000,"regionName":"黑龙江"},{"parentId":0,"regionId":310000,"regionName":"上海"},{"parentId":0,"regionId":320000,"regionName":"江苏"},{"parentId":0,"regionId":330000,"regionName":"浙江"},{"parentId":0,"regionId":340000,"regionName":"安徽"},{"parentId":0,"regionId":350000,"regionName":"福建"},{"parentId":0,"regionId":360000,"regionName":"江西"},{"parentId":0,"regionId":370000,"regionName":"山东"},{"parentId":0,"regionId":410000,"regionName":"河南"},{"parentId":0,"regionId":420000,"regionName":"湖北"},{"parentId":0,"regionId":430000,"regionName":"湖南"},{"parentId":0,"regionId":440000,"regionName":"广东"},{"parentId":0,"regionId":450000,"regionName":"广西"},{"parentId":0,"regionId":460000,"regionName":"海南"},{"parentId":0,"regionId":500000,"regionName":"重庆"},{"parentId":0,"regionId":510000,"regionName":"四川"},{"parentId":0,"regionId":520000,"regionName":"贵州"},{"parentId":0,"regionId":530000,"regionName":"云南"},{"parentId":0,"regionId":540000,"regionName":"西藏"},{"parentId":0,"regionId":610000,"regionName":"陕西"},{"parentId":0,"regionId":620000,"regionName":"甘肃"},{"parentId":0,"regionId":630000,"regionName":"青海"},{"parentId":0,"regionId":640000,"regionName":"宁夏"},{"parentId":0,"regionId":650000,"regionName":"新疆"},{"parentId":0,"regionId":710000,"regionName":"台湾"},{"parentId":0,"regionId":810000,"regionName":"香港"},{"parentId":0,"regionId":820000,"regionName":"澳门"}] + */ + + private int status; + private String message; + private List provinces; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public List getProvinces() { + return provinces; + } + + public void setProvinces(List provinces) { + this.provinces = provinces; + } + + public static class ProvincesBean { + /** + * parentId : 0 + * regionId : 110000 + * regionName : 北京 + */ + + private int parentId; + private int regionId; + private String regionName; + + public int getParentId() { + return parentId; + } + + public void setParentId(int parentId) { + this.parentId = parentId; + } + + public int getRegionId() { + return regionId; + } + + public void setRegionId(int regionId) { + this.regionId = regionId; + } + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/BaseParser.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/BaseParser.java deleted file mode 100644 index a576854..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/BaseParser.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * HaoJiXing Teacher Q&A - * copyright(C)2013- Acorn International - * - * packeage：com.ozing.callteacher.parser.BaseParser.java - * create：2013年7月25日下午1:58:14 - */ -package com.hjx.personalcenter.parser; - -import android.text.TextUtils; - -import com.hjx.personalcenter.exception.RemoteException; -import com.hjx.personalcenter.exception.ResponseError; - -import org.json.JSONException; -import org.json.JSONObject; - -/** - * @author jixiaolong - * @code: 015261 - */ -public abstract class BaseParser { - public abstract T parse(String response) throws RemoteException, com.hjx.personalcenter.exception.RemoteException; - - public static ResponseError getError(String response){ - ResponseError error = new ResponseError(); - if(TextUtils.isEmpty(response)){ - error.setStatus(-1); - error.setMessage("接口空数据"); - }else{ - if(response.contains("status")){ - //{"status":100,"message":"success","access_token":"0b129fa4-cd71-4777-89d0-215bf4652146"} - //{"status":204,"message":"wrong password"} - //{"status":200,"message":"user not exist"} - try { - JSONObject object = new JSONObject(response); - int status = object.optInt("status"); - error.setStatus(status); - if(status!=0 && status!=100){ - String msg = object.optString("message"); - if(!TextUtils.isEmpty(msg)) - error.setMessage(msg); - } - } catch (JSONException e) { - error.setMessage("返回json数据错误：["+response+"]"); - } - }else if(response.contains("error")){ - error.setMessage("服务器内部错误"); - }else{ - error.setStatus(100); - } - } - return error; - } -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/ProvinceParser.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/ProvinceParser.java deleted file mode 100644 index 7599074..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/parser/ProvinceParser.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * HaoJiXing Teacher Q&A - * copyright(C)2013- Acorn International - * - * packeage：com.ozing.callteacher.parser.ProvinceParser.java - * create：2013年8月8日上午11:40:21 - */ -package com.hjx.personalcenter.parser; - - -import com.hjx.personalcenter.areapicker.AreaBean; -import com.hjx.personalcenter.exception.RemoteException; -import com.hjx.personalcenter.exception.ResponseError; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author jixiaolong - * @code: 015261 - */ -public class ProvinceParser extends BaseParser> { - - @Override - public List parse(String response) throws RemoteException { - ResponseError error = getError(response); - if(error.hasError()){ - throw new RemoteException(error); - } - - List mList = new ArrayList(); - try { - JSONObject object = new JSONObject(response); - JSONArray areaobj = object.getJSONArray("provinces"); - for(int i=0;i