From 15bd869561e68bfaa76ce4e847abc1b566965190 Mon Sep 17 00:00:00 2001 From: xiongwei <861739889@qq.com> Date: Fri, 8 Sep 2017 09:48:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/ChoiseTextBookActivity.java | 2 +- .../hjx/personalcenter/activity/MainActivity.java | 37 ++++++++-- .../customdialog/ElectronicCardDialog.java | 8 +++ .../com/hjx/personalcenter/http/HttpManager.java | 81 +++++++++++++++++++--- .../java/com/hjx/personalcenter/http/HttpUrl.java | 2 + .../hjx/personalcenter/util/GetDevicesUtil.java | 12 +++- 6 files changed, 124 insertions(+), 18 deletions(-) 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 87d1219..90864ce 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 @@ -61,11 +61,11 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On jsonObject = new JSONObject((String) msg.obj); status = jsonObject.optString("status"); if (status.equals("1")) { + AlertUtils.showToast(ChoiseTextBookActivity.this, "您已经填写了保卡信息，请到主界面确认您的保卡信息是否正确！"); Intent intent = new Intent(); intent.setClass(ChoiseTextBookActivity.this, TheStartPageActivity.class); ChoiseTextBookActivity.this.startActivity(intent); overridePendingTransition(R.anim.rightin, R.anim.rightout); - finish(); } else if (status.equals("2001")) { ElectronicCardDialog.getInstance().show(getSupportFragmentManager(), "ElectronicCardDialog"); } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java index f86d8da..dec12b6 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java @@ -99,8 +99,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe tv_sex.setText("女"); iv_sex.setImageResource(R.mipmap.women); } - String imageurl = SaveParam.getInstance().getLoginParam(MainActivity.this,SaveParam.HEADURL); - mSimpleDraweeView.setImageURI(imageurl); + mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait()); break; case HttpCode.SIGN: SignInfo.DataBean dataBean = (SignInfo.DataBean)msg.obj; @@ -124,6 +123,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe initData(); initLister(); updateVersion(); +// String devicenumber = GetDevicesUtil.getDevicesInfo(this).getDeviceNumber(); +// Log.e("test","......."+devicenumber); } //////版本更新 private void updateVersion() { @@ -359,7 +360,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe //回调头像监听 @Override public void heard(Context context, View v,int headpitiaon) { - String picUrl; + String picUrl = ""; + String userID = SaveParam.getInstance().getLoginParam(this,"userId"); + String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT); switch (v.getId()){ //选择默认图片 case R.id.oktakephone: @@ -367,21 +370,43 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe mSimpleDraweeView.setImageDrawable(null); mSimpleDraweeView.setImageResource(R.mipmap.default_avatar1); picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/61e8d8cf-651f-49c9-beb2-ff1387af390a.png"; + try { + HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } }else if (headpitiaon==2){ mSimpleDraweeView.setImageDrawable(null); mSimpleDraweeView.setImageResource(R.mipmap.default_avatar2); picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/8480ff7b-42f1-4d64-b848-c8f4f3afd385.png"; + try { + HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } }else if (headpitiaon==3){ mSimpleDraweeView.setImageDrawable(null); mSimpleDraweeView.setImageResource(R.mipmap.default_avatar3); picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/184112f4-bfe0-4db8-bc1e-6212755b241c.png"; + try { + HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } }else if (headpitiaon==4){ mSimpleDraweeView.setImageDrawable(null); mSimpleDraweeView.setImageResource(R.mipmap.default_avatar4); - picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/e31c9e11-9276-4bf4-a162-b66272fdc351.png "; - }else if (headpitiaon==0){ - AlertUtils.showToast(this, "你还没有设置头像 "); + picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/e31c9e11-9276-4bf4-a162-b66272fdc351.png"; + try { + HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + }else{ + mSimpleDraweeView.setImageDrawable(null); + mSimpleDraweeView.setImageResource(R.mipmap.header_default);; } + break; case R.id.canceltakephone: diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java index 4d7715a..1f34e40 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java @@ -8,6 +8,7 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.activity.ElectronicCardValidationActivity; @@ -19,6 +20,7 @@ import com.mylhyl.circledialog.res.values.CircleDimen; */ public class ElectronicCardDialog extends BaseCircleDialog { + private ImageView cancel; public static ElectronicCardDialog getInstance() { ElectronicCardDialog dialogFragment = new ElectronicCardDialog(); dialogFragment.setCanceledBack(true); @@ -46,6 +48,12 @@ public class ElectronicCardDialog extends BaseCircleDialog { } }); + getView().findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); } 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 7b3eb37..7d4a1d0 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 @@ -1141,11 +1141,7 @@ public class HttpManager { try { JSONObject jsonObject = new JSONObject(new String(arg2)); int status = jsonObject.optInt("status"); - if (status == 0) { - AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!"); - } else if(status == 1000){ - AlertUtils.showToast(mContext, "您还没有子账户哦"); - }else { + if (status == 1) { ChildsInfo childsInfo = GsonTool.getPerson(new String(arg2), ChildsInfo.class);//解析json数据 Log.e("test", "子账户信息" + childsInfo); List schoolInfoBeanList = childsInfo.getData(); @@ -1155,6 +1151,9 @@ public class HttpManager { msg.obj = schoolInfoBeanList; handler.sendMessage(msg); + }else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!"); + } } catch (JSONException e) { e.printStackTrace(); @@ -1461,7 +1460,7 @@ public class HttpManager { } /** - * 头像 + * 头像拍张 * * @param mContext * @param userId @@ -1469,8 +1468,6 @@ public class HttpManager { * @throws UnsupportedEncodingException */ public void header(final Context mContext, String userId, String type, String img) throws UnsupportedEncodingException { -// mProgress = DialogPermission.showProgress(mContext, null, "正在上传头像...", -// false, true, null); File file = new File(img); if (file.exists() && file.length() > 0) { RequestParams params = new RequestParams(); @@ -1481,11 +1478,11 @@ public class HttpManager { } catch (FileNotFoundException e) { e.printStackTrace(); } - Log.e("test", "onSuccess" + params); + Log.e("test", "params" + params); + HttpClient.getInstance().setTimeout(5 * 1000); HttpClient.getInstance().post(HttpUrl.headerURL, params, new AsyncHttpResponseHandler() { @Override public void onSuccess(int i, Header[] headers, byte[] bytes) { - closeProgress(); Log.e("test", "onSuccess" + new String(bytes)); try { JSONObject jsonObject = new JSONObject(new String(bytes)); @@ -1535,6 +1532,70 @@ public class HttpManager { Toast.makeText(mContext, "文件不存在", Toast.LENGTH_LONG).show(); } } + /** + * 头像默认 + * + * @param mContext + * @param userId + * @param + * @throws UnsupportedEncodingException + */ + public void headerdeft(final Context mContext, String userId, String type,String defaultImg) throws UnsupportedEncodingException { + RequestParams params = new RequestParams(); + params.put("userId", userId); + params.put("type", type); + params.put("defaultImg", defaultImg); + Log.e("test", "params" + params); + HttpClient.getInstance().setTimeout(5 * 1000); + HttpClient.getInstance().post(HttpUrl.headerdefaultURL, params, new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int i, Header[] headers, byte[] bytes) { + Log.e("test", "onSuccess" + new String(bytes)); + try { + JSONObject jsonObject = new JSONObject(new String(bytes)); + String status = jsonObject.optString("status"); + JSONObject jsonObject1 =jsonObject.getJSONObject("data"); + String imagUrl = jsonObject1.optString("imgUrl"); + SaveParam.getInstance().saveLoginParam(mContext,SaveParam.HEADURL,imagUrl); + if (status.equals("1")) { + Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show(); + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试"); + } + } catch (JSONException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) { + closeProgress(); + Log.e("test", "错误信息" + new String(bytes)); + new CircleDialog.Builder((FragmentActivity) mContext) + .setCanceledOnTouchOutside(false) + .setCancelable(false) + .setWidth(0.5f) + .configText(new ConfigText() { + @Override + public void onConfig(TextParams params) { + params.gravity = Gravity.CENTER; + params.padding = new int[]{50, 50, 50, 50}; + } + }) + .setText("当前无网络，请检查网络设置") + .setNegative("继续使用", null) + .setPositive("设置网络", new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(Settings.ACTION_SETTINGS);//系统设置界面 + mContext.startActivity(intent); + } + }) + .show(); + + } + }); + } /** diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java index c721d5f..d329c00 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java @@ -37,6 +37,8 @@ public class HttpUrl { public static String changechildUserURL=GetDomain()+"/childUser/update";//切换子账户 public static String updateappURL=GetDomain()+"/general/release/version";//系统升级 public static String headerURL=GetDomain()+"/profile/picture/update";//头像上传 + public static String headerdefaultURL=GetDomain()+"/profile/picture/default";//默认头像上传 + diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java index 61d6aa6..966c370 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java @@ -3,6 +3,8 @@ package com.hjx.personalcenter.util; import android.content.Context; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; +import android.provider.Settings; +import android.telephony.TelephonyManager; import android.util.Log; import com.hjx.personalcenter.model.DeviceInfo; @@ -29,7 +31,15 @@ public class GetDevicesUtil { } private static String getCPUSerial(Context context) { - return MachineUtil.getMachineCode(context); + String cpuAddress = null; + TelephonyManager mTelephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + if (mTelephony.getDeviceId() != null) { + cpuAddress = mTelephony.getDeviceId(); + } else { + //android.provider.Settings; + cpuAddress = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID); + } + return cpuAddress; } private static String getMacAddress(Context mContext){ -- 1.9.0