diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index 5d19981..fbb6828 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/PersonalCenter/app/build.gradle b/PersonalCenter/app/build.gradle index d8cc5b1..bea56c5 100644 --- a/PersonalCenter/app/build.gradle +++ b/PersonalCenter/app/build.gradle @@ -42,5 +42,6 @@ dependencies { compile 'com.zaaach:toprightmenu:1.0' compile 'com.facebook.fresco:fresco:1.1.0' compile'com.android.support:recyclerview-v7:25.+' - + debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3' + releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3' } diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml index e8ef015..7d39674 100644 --- a/PersonalCenter/app/src/main/AndroidManifest.xml +++ b/PersonalCenter/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ - + diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java index e244cfe..33a3493 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java @@ -79,12 +79,14 @@ public class AccountManagementActivity extends AppCompatActivity implements View iv_account_head = (ImageView) findViewById(R.id.tv_account_head); cancel = (ImageView) findViewById(R.id.cancel); add_accunt = (LinearLayout) findViewById(R.id.add_account); - - listview = (RecyclerView) findViewById(R.id.id_recyclerview_horizontal); } private void initData() { + if (Content.changgeaccountflag ==1){ + tv_delete.setText("使用中"); + tv_delete.setEnabled(true); + } String cunt_username = SaveParam.getInstance().getLoginParam(this,"username"); String tv_usernames = SaveParam.getInstance().getLoginParam(this,SaveParam.USERNAME); String tv_grades = SaveParam.getInstance().getLoginParam(this,SaveParam.GRADES); @@ -132,7 +134,6 @@ public class AccountManagementActivity extends AppCompatActivity implements View overridePendingTransition(R.anim.rightin, R.anim.rightout); break; case R.id.add_account: - Content.accountflag = 2; Intent account = new Intent(); account.setClass(AccountManagementActivity.this,RegisterInfoActivity.class); @@ -140,9 +141,15 @@ public class AccountManagementActivity extends AppCompatActivity implements View overridePendingTransition(R.anim.rightin, R.anim.rightout); break; + case R.id.tv_account_delete: + Content.changgeaccountflag =1; + SaveParam.getInstance().saveLoginParam(this,SaveParam.ACCOUNT,"1"); + + break; case R.id.cancel: finish(); break; + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java index ff1fb72..488f8fb 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java @@ -10,6 +10,8 @@ import com.hjx.personalcenter.R; */ public class ChangeEletronicCardPhoneActivity extends Activity { + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java index d451c2b..a139690 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java @@ -4,6 +4,8 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import com.hjx.personalcenter.R; @@ -20,10 +22,11 @@ import java.util.List; * Created by h on 2017/8/12. */ -public class ChangePresonalInfoActivity extends AppCompatActivity { +public class ChangePresonalInfoActivity extends AppCompatActivity implements View.OnClickListener { private ViewPager viewPager; private SlidingTabLayout tableLayout; private TextView subsave; + private ImageView cancel; private List presoninfo; private LoginAndRegisterAdapter presoninfodapter; private List title = Arrays.asList("个人信息", "版本信息"); @@ -39,6 +42,7 @@ public class ChangePresonalInfoActivity extends AppCompatActivity { private void initView() { viewPager = (ViewPager) findViewById(R.id.viewpager_login); tableLayout = (SlidingTabLayout) findViewById(R.id.TabLayout_id); + cancel = (ImageView) findViewById(R.id.cancel); subsave = (TextView) findViewById(R.id.presonal_sub); } @@ -66,6 +70,16 @@ public class ChangePresonalInfoActivity extends AppCompatActivity { } private void setLister() { + cancel.setOnClickListener(this); } + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.cancel: + finish(); + break; + } + + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java index d2a0988..2608b1b 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java @@ -8,6 +8,7 @@ import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.GridView; +import android.widget.ImageView; import android.widget.SimpleAdapter; import com.hjx.personalcenter.R; @@ -31,6 +32,7 @@ import java.util.Map; public class ChoiseTextBookActivity extends AppCompatActivity implements View.OnClickListener { private GridView gridView; private Button btn_ok; + private ImageView cancel; private List> data_list; private SimpleAdapter sim_adapter; // 图片封装为一个数组 @@ -88,6 +90,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On private void initView() { gridView = (GridView) findViewById(R.id.grideview); + cancel = (ImageView) findViewById(R.id.cancel); btn_ok = (Button) findViewById(R.id.btn_ok); } @@ -104,6 +107,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On private void initLister() { btn_ok.setOnClickListener(this); + cancel.setOnClickListener(this); } public List> getData(){ @@ -132,6 +136,9 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On } break; + case R.id.cancel: + finish(); + break; } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java index 13b478c..5758368 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java @@ -9,6 +9,7 @@ import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import android.widget.TextView; import com.hjx.personalcenter.R; @@ -29,6 +30,7 @@ public class ElectronicCardValidationActivity extends Activity implements View.O private Button btn_card_valiyanzhen,get_authcode; private EditText phonenumber,anth_6num;//;//密码 private TextView menu_title; + private ImageView cancel; private int i = 0; private Thread thread; private String sourceStr ="android"; @@ -81,6 +83,7 @@ public class ElectronicCardValidationActivity extends Activity implements View.O anth_6num = (EditText) findViewById(R.id.et_authcode); phonenumber = (EditText) findViewById(R.id.et_phonenumber); menu_title = (TextView) findViewById(R.id.menu_title); + cancel = (ImageView) findViewById(R.id.cancel); } private void initData() { @@ -104,6 +107,7 @@ public class ElectronicCardValidationActivity extends Activity implements View.O private void initLister() { get_authcode.setOnClickListener(this); btn_card_valiyanzhen.setOnClickListener(this); + cancel.setOnClickListener(this); } @@ -171,6 +175,9 @@ public class ElectronicCardValidationActivity extends Activity implements View.O } break; + case R.id.cancel: + finish(); + break; } } // 线程类 定时器 diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java index a704589..ccaf00e 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java @@ -5,6 +5,7 @@ import android.content.Context; import com.facebook.drawee.backends.pipeline.Fresco; import com.hjx.personalcenter.util.ImageCache; +import com.squareup.leakcanary.LeakCanary; import com.tencent.bugly.crashreport.CrashReport; /** @@ -20,6 +21,8 @@ public class MyApplication extends Application { public void onCreate() { super.onCreate(); context = getApplicationContext(); + //c初始化内存检测 + LeakCanary.install(this); //初始化Fresco Fresco.initialize(this); mImageCache = new ImageCache(); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java index 6446666..ce0861c 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java @@ -10,6 +10,8 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.Content; +import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.model.ChildsInfo; import com.mylhyl.circledialog.CircleDialog; @@ -50,7 +52,6 @@ public class AccountChildsAdapter extends RecyclerView.Adapter gradeInfoLists = new ArrayList(); - for (int i = 0 ;i gradeinfoList = gradeInfo.getData().get(i).getChildren(); @@ -719,6 +754,7 @@ public class HttpManager { /** * 获取学校 + * * @param mContext * @param regionId * @param gradeId @@ -726,16 +762,29 @@ public class HttpManager { */ public void getschool(final Context mContext, int regionId, int gradeId, final Handler handler) { HttpClient.getInstance().addHeader("Accept", "application/json"); - HttpClient.getInstance().get(HttpUrl.schoolUrl+ "?regionId=" + regionId+ "&gradeId=" + gradeId, new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.schoolUrl + "?regionId=" + regionId + "&gradeId=" + gradeId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "学校" + new String(arg2)); - SchoolInfo schoolInfo = GsonTool.getPerson(new String(arg2), SchoolInfo.class);//解析json数据 - List schoolInfoBeanList = schoolInfo.getData(); - Message message = Message.obtain(); - message.what = HttpCode.SCHOOL; - message.obj = schoolInfoBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 1) { + SchoolInfo schoolInfo = GsonTool.getPerson(new String(arg2), SchoolInfo.class);//解析json数据 + List schoolInfoBeanList = schoolInfo.getData(); + Message message = Message.obtain(); + message.what = HttpCode.SCHOOL; + message.obj = schoolInfoBeanList; + handler.sendMessage(message); + + + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } } @@ -767,9 +816,9 @@ public class HttpManager { } - /** * 获取个人信息 + * * @param mContext * @param userId * @param handler @@ -778,18 +827,32 @@ public class HttpManager { mProgress = DialogPermission.showProgress(mContext, null, "正在获取个人信息...", false, true, null); HttpClient.getInstance().addHeader("Accept", "application/json"); - HttpClient.getInstance().setConnectTimeout(5*1000); - HttpClient.getInstance().get(HttpUrl.getpresonalinfo+ "?userId=" + userId, new AsyncHttpResponseHandler() { + HttpClient.getInstance().setConnectTimeout(5 * 1000); + HttpClient.getInstance().get(HttpUrl.getpresonalinfo + "?userId=" + userId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); Log.e("test", "个人信息" + new String(arg2)); - PesonalInfo pesonalInfo = GsonTool.getPerson(new String(arg2), PesonalInfo.class);//解析json数据 - PesonalInfo.DataBean pesonalInfoBeanList = pesonalInfo.getData(); - Message message = Message.obtain(); - message.what = HttpCode.GETINFO; - message.obj = pesonalInfoBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 1) { + PesonalInfo pesonalInfo = GsonTool.getPerson(new String(arg2), PesonalInfo.class);//解析json数据 + PesonalInfo.DataBean pesonalInfoBeanList = pesonalInfo.getData(); + Message message = Message.obtain(); + message.what = HttpCode.GETINFO; + message.obj = pesonalInfoBeanList; + handler.sendMessage(message); + + + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } + } @@ -820,6 +883,7 @@ public class HttpManager { } }); } + //修改个人信息 public void changepresonalinfo(final Context mContext, Object object) throws UnsupportedEncodingException { Gson gson = new Gson(); @@ -828,8 +892,8 @@ public class HttpManager { mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...", false, true, null); ByteArrayEntity entity = null; - entity = new ByteArrayEntity(jsonObject.getBytes("UTF-8")); - entity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); + entity = new ByteArrayEntity(jsonObject.getBytes("UTF-8")); + entity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); HttpClient.getInstance().addHeader("Accept", "*/*"); HttpClient.getInstance().put(mContext, HttpUrl.changepresonalinfo, entity, "application/json", new JsonHttpResponseHandler() { @@ -837,11 +901,13 @@ public class HttpManager { public void onSuccess(int statusCode, Header[] headers, JSONObject response) { super.onSuccess(statusCode, headers, response); closeProgress(); - String status = response.optString("status"); - if (status.equals("1")) { - Toast.makeText(mContext, "个人信息保存成功", Toast.LENGTH_LONG).show(); - ((Activity) mContext).finish(); - } + String status = response.optString("status"); + if (status.equals("1")) { + Toast.makeText(mContext, "个人信息保存成功", Toast.LENGTH_LONG).show(); + ((Activity) mContext).finish(); + } else { + AlertUtils.showToast(mContext, "您好，服务器异常，请稍后重试"); + } Log.e("test", "onSuccess" + response); } @@ -876,6 +942,7 @@ public class HttpManager { }); } + //修改个性签名 public void changsignature(final Context mContext, long userId, final String signature) { RequestParams params = new RequestParams(); @@ -890,6 +957,8 @@ public class HttpManager { String status = jsonObject.optString("status"); if (status.equals("1")) { Toast.makeText(mContext, "个性签名修改成功", Toast.LENGTH_LONG).show(); + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试"); } } catch (JSONException e) { e.printStackTrace(); @@ -926,22 +995,37 @@ public class HttpManager { /** * 获取个性签名 + * * @param mContext * @param userId * @param handler */ - public void getsignatures(final Context mContext,long userId , final Handler handler) { + public void getsignatures(final Context mContext, long userId, final Handler handler) { HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().get(HttpUrl.getsignature+"?userId="+userId, new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.getsignature + "?userId=" + userId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "个性签名" + new String(arg2)); - SignInfo signInfo = GsonTool.getPerson(new String(arg2), SignInfo.class);//解析json数据 - SignInfo.DataBean signInfoBeanList = signInfo.getData(); - Message message = Message.obtain(); - message.what = HttpCode.SIGN; - message.obj = signInfoBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 1) { + SignInfo signInfo = GsonTool.getPerson(new String(arg2), SignInfo.class);//解析json数据 + SignInfo.DataBean signInfoBeanList = signInfo.getData(); + Message message = Message.obtain(); + message.what = HttpCode.SIGN; + message.obj = signInfoBeanList; + handler.sendMessage(message); + + + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } + } @@ -975,6 +1059,7 @@ public class HttpManager { /** * 用户反馈 + * * @param mContext * @param object * @throws UnsupportedEncodingException @@ -999,6 +1084,8 @@ public class HttpManager { if (status.equals("1")) { Toast.makeText(mContext, "反馈成功，我们会尽快处理", Toast.LENGTH_LONG).show(); ((Activity) mContext).finish(); + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试"); } Log.e("test", "onSuccess" + response); @@ -1037,16 +1124,17 @@ public class HttpManager { /** * 查询子账户信息 + * * @param mContext * @param userId * @param handler */ - public void getchildAccountinfo(final Context mContext, long userId , final Handler handler) { + public void getchildAccountinfo(final Context mContext, long userId, final Handler handler) { mProgress = DialogPermission.showProgress(mContext, null, "正在获取信息...", false, true, null); HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().get(HttpUrl.childUserURL+ "?userId=" + userId , new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.childUserURL + "?userId=" + userId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); @@ -1054,11 +1142,13 @@ public class HttpManager { try { JSONObject jsonObject = new JSONObject(new String(arg2)); int status = jsonObject.optInt("status"); - if (status ==1000){ - AlertUtils.showToast(mContext,"你好，你还未添加子账号，子账号为空!"); - }else { + if (status == 0) { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!"); + } else if (status == 1000) { + AlertUtils.showToast(mContext, "你好，你还未添加子账号，子账号为空!"); + } else { ChildsInfo childsInfo = GsonTool.getPerson(new String(arg2), ChildsInfo.class);//解析json数据 - List schoolInfoBeanList = childsInfo.getData(); + List schoolInfoBeanList = childsInfo.getData(); Message msg = Message.obtain(); msg.what = HttpCode.CHILDS_SUCESS; msg.obj = schoolInfoBeanList; @@ -1096,22 +1186,23 @@ public class HttpManager { } }) .show(); - } + } }); } + /** * 删除子账户信息 + * * @param mContext * @param subAccountId - * */ - public void deletechildAccountinfo(final Context mContext, long subAccountId ) { + public void deletechildAccountinfo(final Context mContext, long subAccountId) { mProgress = DialogPermission.showProgress(mContext, null, "正在删除子账户...", false, true, null); HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().get(HttpUrl.deletechildUserURL+ "?subAccountId=" + subAccountId , new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.deletechildUserURL + "?subAccountId=" + subAccountId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); @@ -1119,10 +1210,10 @@ public class HttpManager { try { JSONObject jsonObject = new JSONObject(new String(arg2)); int status = jsonObject.optInt("status"); - if (status ==1){ - AlertUtils.showToast(mContext,"子账号删除成功!"); - }else { - AlertUtils.showToast(mContext,"你好，子账号删除失败!"); + if (status == 1) { + AlertUtils.showToast(mContext, "子账号删除成功!"); + } else { + AlertUtils.showToast(mContext, "你好，子账号删除失败!"); } } catch (JSONException e) { @@ -1160,12 +1251,12 @@ public class HttpManager { }); } + /** * 添加子账户信息 - * */ - public void addchildAccountinfo(final Context mContext, long parentId,String image, - String name,String grade,String school,String region) { + public void addchildAccountinfo(final Context mContext, long parentId, String image, + String name, String grade, String school, String region) { mProgress = DialogPermission.showProgress(mContext, null, "正在添加子账户...", false, true, null); RequestParams params = new RequestParams(); @@ -1181,7 +1272,7 @@ public class HttpManager { HttpClient.getInstance().addHeader("Accept", "*/*"); HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().post(HttpUrl.addchildUserURL ,params, new AsyncHttpResponseHandler() { + HttpClient.getInstance().post(HttpUrl.addchildUserURL, params, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); @@ -1190,11 +1281,11 @@ public class HttpManager { try { JSONObject jsonObject = new JSONObject(new String(arg2)); int status = jsonObject.optInt("status"); - if (status ==1){ - AlertUtils.showToast(mContext,"子账号添加成功!"); + if (status == 1) { + AlertUtils.showToast(mContext, "子账号添加成功!"); ((Activity) mContext).finish(); - }else { - AlertUtils.showToast(mContext,"你好，子账号添加失败!"); + } else { + AlertUtils.showToast(mContext, "你好，子账号添加失败!"); } } catch (JSONException e) { @@ -1235,16 +1326,16 @@ public class HttpManager { /** * 切换子账户信息 + * * @param mContext * @param subAccountId - * */ - public void changechildAccountinfo(final Context mContext, long subAccountId ,long userId) { + public void changechildAccountinfo(final Context mContext, long subAccountId, long userId) { mProgress = DialogPermission.showProgress(mContext, null, "正在切换子账户...", false, true, null); HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().get(HttpUrl.changechildUserURL+ "?subAccountId=" + subAccountId+"&userId="+ userId, new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.changechildUserURL + "?subAccountId=" + subAccountId + "&userId=" + userId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); @@ -1252,11 +1343,11 @@ public class HttpManager { try { JSONObject jsonObject = new JSONObject(new String(arg2)); int status = jsonObject.optInt("status"); - if (status ==1){ - AlertUtils.showToast(mContext,"子账号切换成功!"); + if (status == 1) { + AlertUtils.showToast(mContext, "子账号切换成功!"); - }else { - AlertUtils.showToast(mContext,"你好，子账号切换失败!"); + } else { + AlertUtils.showToast(mContext, "你好，子账号切换失败!"); } } catch (JSONException e) { @@ -1294,19 +1385,19 @@ public class HttpManager { }); } + /** * 系统升级 - * @param mContext - * @param pid - * appName * + * @param mContext + * @param pid appName */ - public void updateAPP(final Context mContext, String pid , String appName, final Handler handler) { + public void updateAPP(final Context mContext, String pid, String appName, final Handler handler) { mProgress = DialogPermission.showProgress(mContext, null, "正在切换子账户...", false, true, null); HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().get(HttpUrl.updateappURL+ "?pid=" + pid+"&appName="+ appName, new AsyncHttpResponseHandler() { + HttpClient.getInstance().get(HttpUrl.updateappURL + "?pid=" + pid + "&appName=" + appName, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); @@ -1351,9 +1442,6 @@ public class HttpManager { } - - - ///省级接口 public void provices(final Context mContext, final Handler handler) { HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); @@ -1361,13 +1449,27 @@ public class HttpManager { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "省" + new String(arg2)); - ProvinceInfo provinceInfo = GsonTool.getPerson(new String(arg2), ProvinceInfo.class);//解析json数据 - Log.e("test", "状态码" + provinceInfo.getStatus()); - List provincesBeanList = provinceInfo.getProvinces(); - Message message = Message.obtain(); - message.what = HttpCode.PROVICES; - message.obj = provincesBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 100) { + ProvinceInfo provinceInfo = GsonTool.getPerson(new String(arg2), ProvinceInfo.class);//解析json数据 + Log.e("test", "状态码" + provinceInfo.getStatus()); + List provincesBeanList = provinceInfo.getProvinces(); + Message message = Message.obtain(); + message.what = HttpCode.PROVICES; + message.obj = provincesBeanList; + handler.sendMessage(message); + + + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } + } @@ -1399,19 +1501,31 @@ public class HttpManager { } //市级接口 - public void cityinfo(final Context mContext, long regionId , final Handler handler) { + public void cityinfo(final Context mContext, long regionId, final Handler handler) { HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); HttpClient.getInstance().get(HttpUrl.cityUrl + "?regionId=" + regionId, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "市" + new String(arg2)); - Gson gson = new Gson(); - CityInfo cityInfo = gson.fromJson(new String(arg2), CityInfo.class); - List cityInfoBeanList = cityInfo.getCities(); - Message message = Message.obtain(); - message.what = HttpCode.CITYS; - message.obj = cityInfoBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 100) { + Gson gson = new Gson(); + CityInfo cityInfo = gson.fromJson(new String(arg2), CityInfo.class); + List cityInfoBeanList = cityInfo.getCities(); + Message message = Message.obtain(); + message.what = HttpCode.CITYS; + message.obj = cityInfoBeanList; + handler.sendMessage(message); + + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } } @@ -1450,13 +1564,24 @@ public class HttpManager { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "区" + new String(arg2)); - Gson gson = new Gson(); - CountyInfo countyInfo = gson.fromJson(new String(arg2), CountyInfo.class); - List countyInfoInfoBeanList = countyInfo.getCounties(); - Message message = Message.obtain(); - message.what = HttpCode.COUNTRY; - message.obj = countyInfoInfoBeanList; - handler.sendMessage(message); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 100) { + Gson gson = new Gson(); + CountyInfo countyInfo = gson.fromJson(new String(arg2), CountyInfo.class); + List countyInfoInfoBeanList = countyInfo.getCounties(); + Message message = Message.obtain(); + message.what = HttpCode.COUNTRY; + message.obj = countyInfoInfoBeanList; + handler.sendMessage(message); + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + } } diff --git a/PersonalCenter/app/src/main/res/layout/activity_account_management.xml b/PersonalCenter/app/src/main/res/layout/activity_account_management.xml index 382929f..63fd8d3 100644 --- a/PersonalCenter/app/src/main/res/layout/activity_account_management.xml +++ b/PersonalCenter/app/src/main/res/layout/activity_account_management.xml @@ -260,15 +260,14 @@ android:orientation="horizontal"> diff --git a/PersonalCenter/app/src/main/res/layout/recycler_childaccunt_item_view.xml b/PersonalCenter/app/src/main/res/layout/recycler_childaccunt_item_view.xml index 764b1f8..f11b3c9 100644 --- a/PersonalCenter/app/src/main/res/layout/recycler_childaccunt_item_view.xml +++ b/PersonalCenter/app/src/main/res/layout/recycler_childaccunt_item_view.xml @@ -36,31 +36,32 @@ android:id="@+id/iv_child_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="删除用户" + android:text="" android:textSize="18sp" /> +