From e93f210b0a757e5c10e6595fd72a2578e3dc2c79 Mon Sep 17 00:00:00 2001 From: xiongwei <861739889@qq.com> Date: Tue, 22 Aug 2017 18:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=EF=BC=8C=E5=A4=B4=E5=83=8F=E5=92=8C=E6=8B=8D=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PersonalCenter/.idea/misc.xml | 2 +- .../activity/ChangePresonalInfoActivity.java | 3 + .../activity/ElectronicCardLookInfoActivity.java | 63 +++--- .../hjx/personalcenter/activity/MainActivity.java | 184 +++++++++++++++-- .../activity/RegisterInfoActivity.java | 57 +++--- .../hjx/personalcenter/adapter/GrandeAdapter.java | 4 +- .../customdialog/CitysListDialog.java | 5 +- .../personalcenter/customdialog/CountryDialog.java | 5 +- .../customdialog/GradeListDialog.java | 46 +++-- .../personalcenter/customdialog/HeadDialog.java | 30 ++- .../customdialog/ProvinceListDialog.java | 2 +- .../customdialog/SchoolListDialog.java | 28 +-- .../fragment/PresonInfoFragment.java | 65 +++++- .../java/com/hjx/personalcenter/http/HttpCode.java | 4 +- .../com/hjx/personalcenter/http/HttpManager.java | 27 +-- .../personalcenter/interfaces/DialogCallBack.java | 6 +- .../com/hjx/personalcenter/model/CardInfo.java | 198 ++++++++++++------- .../com/hjx/personalcenter/model/CityInfo.java | 3 +- .../com/hjx/personalcenter/model/CountyInfo.java | 3 +- .../com/hjx/personalcenter/model/PesonalInfo.java | 218 +++++++++++++++++++++ .../com/hjx/personalcenter/util/BrithdayStar.java | 25 +++ .../res/layout/activity_change_preson_info.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 13 +- .../main/res/layout/custom_adilog_cityslist.xml | 38 ++++ .../main/res/layout/custom_adilog_countrylist.xml | 38 ++++ .../src/main/res/layout/custom_adilog_lhead.xml | 4 +- 26 files changed, 859 insertions(+), 214 deletions(-) create mode 100644 PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/PesonalInfo.java create mode 100644 PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/BrithdayStar.java create mode 100644 PersonalCenter/app/src/main/res/layout/custom_adilog_cityslist.xml create mode 100644 PersonalCenter/app/src/main/res/layout/custom_adilog_countrylist.xml diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index fbb6828..5d19981 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -37,7 +37,7 @@ - + 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 e93ac3b..d451c2b 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,7 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; +import android.widget.TextView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.adapter.LoginAndRegisterAdapter; @@ -22,6 +23,7 @@ import java.util.List; public class ChangePresonalInfoActivity extends AppCompatActivity { private ViewPager viewPager; private SlidingTabLayout tableLayout; + private TextView subsave; private List presoninfo; private LoginAndRegisterAdapter presoninfodapter; private List title = Arrays.asList("个人信息", "版本信息"); @@ -37,6 +39,7 @@ public class ChangePresonalInfoActivity extends AppCompatActivity { private void initView() { viewPager = (ViewPager) findViewById(R.id.viewpager_login); tableLayout = (SlidingTabLayout) findViewById(R.id.TabLayout_id); + subsave = (TextView) findViewById(R.id.presonal_sub); } private void initData() { diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java index 8d13bef..bc34b2f 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java @@ -16,10 +16,8 @@ import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.model.CardInfo; import com.hjx.personalcenter.util.AlertUtils; -import com.hjx.personalcenter.util.GetDevicesUtil; -import org.json.JSONException; -import org.json.JSONObject; +import java.util.ArrayList; /** * Created by h on 2017/8/11. @@ -29,31 +27,29 @@ public class ElectronicCardLookInfoActivity extends AppCompatActivity implements private ImageView iv_last_step; private TextView usename,deviceModel,customer_address,mac_adress,shoptime,deviceNumber, shopadress,phone,tlePhone,tv_card_adress_change,tv_card_phone_change; + private ArrayList data = new ArrayList<>(); Handler handler = new Handler(){ @Override public void handleMessage(Message msg) { super.handleMessage(msg); - JSONObject jsonObject; - String status; switch (msg.what){ case HttpCode.SUCHCARDINFO: - CardInfo cardInfo = new CardInfo(); - try { - jsonObject = new JSONObject( (String) msg.obj); - status = jsonObject.optString("status"); - if (status.equals("1")){ AlertUtils.showToast(ElectronicCardLookInfoActivity.this,"显示电子保卡信息"); - cardInfo.setCustomerName(jsonObject.optString("customerName")); + CardInfo.DataBean cardinfoBean =(CardInfo.DataBean)msg.obj; + //获取设备信息 + deviceModel.setText(cardinfoBean.getProductModel()); + deviceNumber.setText(cardinfoBean.getDeviceNumber()); + mac_adress.setText(cardinfoBean.getMacAddress()); + //获取保卡信息 + usename.setText(cardinfoBean.getCustomerName()); + customer_address.setText(cardinfoBean.getCustomerAddress()); + shoptime.setText(cardinfoBean.getBuyTime()); + shopadress.setText(cardinfoBean.getBuyAddress()); + tlePhone.setText(cardinfoBean.getAlterSaleCall()); + phone.setText(cardinfoBean.getMobilePhone()); - }else { - AlertUtils.showToast(ElectronicCardLookInfoActivity.this,"保卡信息查询失败"); - } - - } catch (JSONException e) { - e.printStackTrace(); - } break; @@ -85,18 +81,25 @@ public class ElectronicCardLookInfoActivity extends AppCompatActivity implements tv_card_phone_change = (TextView) findViewById(R.id.tv_card_phone_change); } private void initData() { - HttpManager.getInstance().getcardinfo(this,736,handler); - //获取设备信息 - deviceModel.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceModel()); - deviceNumber.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceNumber()); - mac_adress.setText(GetDevicesUtil.getDevicesInfo(this).getMac()); - //获取保卡信息 - usename.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CUNSTEMNAME)); - customer_address.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.ADRESSCUNSTEM)); - shoptime.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTIME)); - shopadress.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPADRESS)); - tlePhone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTLEPHONE)); - phone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CARDPHONE)); + String userID = SaveParam.getInstance().getLoginParam(this,"userId"); + try { + int a = Integer.parseInt(userID); + HttpManager.getInstance().getcardinfo(this,a,handler); + } catch (NumberFormatException e) { + e.printStackTrace(); + } + +// //获取设备信息 +// deviceModel.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceModel()); +// deviceNumber.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceNumber()); +// mac_adress.setText(GetDevicesUtil.getDevicesInfo(this).getMac()); +// //获取保卡信息 +// usename.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CUNSTEMNAME)); +// customer_address.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.ADRESSCUNSTEM)); +// shoptime.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTIME)); +// shopadress.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPADRESS)); +// tlePhone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTLEPHONE)); +// phone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CARDPHONE)); } 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 9a2471d..015f8d6 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 @@ -2,19 +2,35 @@ package com.hjx.personalcenter.activity; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.provider.MediaStore; +import android.support.annotation.NonNull; +import android.support.v4.content.FileProvider; import android.support.v7.app.AppCompatActivity; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; +import com.facebook.drawee.backends.pipeline.Fresco; +import com.facebook.drawee.generic.GenericDraweeHierarchy; +import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder; +import com.facebook.drawee.generic.RoundingParams; +import com.facebook.drawee.interfaces.DraweeController; +import com.facebook.drawee.view.SimpleDraweeView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.customdialog.HeadDialog; import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.util.AlertUtils; +import com.hjx.personalcenter.util.CropUtils; +import com.hjx.personalcenter.util.DialogPermission; +import com.hjx.personalcenter.util.FileUtil; +import com.hjx.personalcenter.util.PermissionUtil; +import com.hjx.personalcenter.util.SharedPreferenceMark; import com.mylhyl.circledialog.CircleDialog; import com.mylhyl.circledialog.callback.ConfigInput; import com.mylhyl.circledialog.params.InputParams; @@ -22,12 +38,13 @@ import com.mylhyl.circledialog.view.listener.OnInputClickListener; import com.zaaach.toprightmenu.MenuItem; import com.zaaach.toprightmenu.TopRightMenu; +import java.io.File; import java.util.ArrayList; import java.util.List; public class MainActivity extends AppCompatActivity implements View.OnClickListener, DialogCallBack.CallBackView { - private ImageView iv_imformatioan, iv_look_card, iv_setting, iv_sign, iv_head, iv_sex; - private TextView tv_edit_presoninfo, tv_sign, oktakephone, cancetakephone, + private ImageView iv_imformatioan, iv_look_card, iv_setting, iv_sign, iv_sex; + private TextView tv_edit_presoninfo, tv_sign, tv_username, tv_username1, tv_mygad, tv_sex, tv_useinfo_adress, tv_useinfo_birthday, tv_useinfo_qq, tv_useinfo_school, tv_useinfo_gender; private LinearLayout linel_mycuoti, linel_mynote, linel_mycollege, linel_myclass; @@ -35,10 +52,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private boolean showIcon = true; private boolean dimBg = true; private boolean needAnim = true; + private static final int REQUEST_CODE_TAKE_PHOTO = 1; + private static final int REQUEST_CODE_ALBUM = 2; + private static final int REQUEST_CODE_CROUP_PHOTO = 3; + SimpleDraweeView mSimpleDraweeView; + private File file; + private Uri uri; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Fresco.initialize(this); setContentView(R.layout.activity_main); initView(); initData(); @@ -53,7 +77,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe iv_sign = (ImageView) findViewById(R.id.iv_sign); tv_sign = (TextView) findViewById(R.id.tv_sign); //头像 - iv_head = (ImageView) findViewById(R.id.iv_head); + mSimpleDraweeView = (SimpleDraweeView) findViewById(R.id.iv_head); //初始化个人信息 iv_sex = (ImageView) findViewById(R.id.iv_sex); tv_username = (TextView) findViewById(R.id.tv_username); @@ -76,6 +100,15 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private void initData() { //加载个人信息 + //初始化图片 + file = new File(FileUtil.getCachePath(this), "user-avatar.jpg"); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { + uri = Uri.fromFile(file); + } else { + //通过FileProvider创建一个content类型的Uri(android 7.0需要这样的方法跨应用访问) + uri = FileProvider.getUriForFile(MyApplication.getContext(), "com.hjx.personalcenter", file); + } + } private void initLister() { @@ -84,7 +117,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe tv_edit_presoninfo.setOnClickListener(this); iv_setting.setOnClickListener(this); iv_sign.setOnClickListener(this); - iv_head.setOnClickListener(this); + mSimpleDraweeView.setOnClickListener(this); linel_mycuoti.setOnClickListener(this); linel_mynote.setOnClickListener(this); linel_mycollege.setOnClickListener(this); @@ -190,24 +223,147 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe case R.id.linel_myclass: AlertUtils.showToast(this, "hhahahah "); break; + } + + } + //回调头像监听 + @Override + public void heard(Context context, View v) { + switch (v.getId()){ + //选择默认图片 case R.id.oktakephone: - AlertUtils.showToast(this, "hhahahah "); + AlertUtils.showToast(this, "您选择了默认图片 "); break; case R.id.canceltakephone: - AlertUtils.showToast(this, "hhahahah "); + + break; + //拍摄和相册 + case R.id.take_pic: + if (PermissionUtil.hasCameraPermission(MainActivity.this)) { + uploadAvatarFromPhotoRequest(); + } + + break; + case R.id.xiangce: + uploadAvatarFromAlbumRequest(); break; } } + //照相 + private void uploadAvatarFromPhotoRequest() { + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + intent.putExtra(MediaStore.Images.Media.ORIENTATION, 0); + intent.putExtra(MediaStore.EXTRA_OUTPUT, uri); + startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO); + } + + //选择图库 + private void uploadAvatarFromAlbumRequest() { + Intent photoPickerIntent = new Intent(Intent.ACTION_PICK); + photoPickerIntent.setType("image/*"); + startActivityForResult(photoPickerIntent, REQUEST_CODE_ALBUM); + } + //回掉 @Override - public void provinceOnItemClick(Context context, LayoutInflater inflater, ViewGroup container) { - View mView = inflater.inflate(R.layout.custom_adilog_lhead, container, false); - oktakephone = (TextView) mView.findViewById(R.id.oktakephone); - cancetakephone = (TextView) mView.findViewById(R.id.canceltakephone); - oktakephone.setOnClickListener(this); - cancetakephone.setOnClickListener(this); + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode != -1) { + return; + } + if (requestCode == REQUEST_CODE_ALBUM && data != null) { + Uri newUri; + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { + newUri = Uri.parse("file:///" + CropUtils.getPath(this, data.getData())); + } else { + newUri = data.getData(); + } + if (newUri != null) { + startPhotoZoom(newUri); + } else { + Toast.makeText(this, "没有得到相册图片", Toast.LENGTH_LONG).show(); + } + } else if (requestCode == REQUEST_CODE_TAKE_PHOTO) { + startPhotoZoom(uri); + } else if (requestCode == REQUEST_CODE_CROUP_PHOTO) { + uploadAvatarFromPhoto(); + } + } + private void uploadAvatarFromPhoto() { + compressAndUploadAvatar(file.getPath()); + + } + private void compressAndUploadAvatar(String fileSrc) { + + + //上传到服务器 + + final File cover = FileUtil.getSmallBitmap(this, fileSrc); + String mimeType = "image/*"; + //requestBody = RequestBody.create(MediaType.parse(mimeType), file); + //String fileName = cover.getName(); + //HttpManager.getInstance().header(this, fileSrc); + //photo = MultipartBody.Part.createFormData("portrait", fileName.substring(fileName.lastIndexOf("/") + 1, fileName.length()), requestBody); + //Fresco设置圆形头像 + GenericDraweeHierarchyBuilder builder = new GenericDraweeHierarchyBuilder(getResources()); + GenericDraweeHierarchy hierarchy = builder + .setDesiredAspectRatio(1f) + .setFailureImage(R.mipmap.blank) + //圆形头像 + .setRoundingParams(RoundingParams.asCircle()) + .build(); + + //加载本地图片 + Uri uri = Uri.fromFile(cover); + DraweeController controller = Fresco.newDraweeControllerBuilder() + .setOldController(mSimpleDraweeView.getController()) + .setUri(uri) + .build(); + mSimpleDraweeView.setHierarchy(hierarchy); + mSimpleDraweeView.setController(controller); + + } + + public void startPhotoZoom(Uri uri) { + Intent intent = new Intent("com.android.camera.action.CROP"); + intent.setDataAndType(uri, "image/*"); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + intent.putExtra("crop", "true");// crop=true 有这句才能出来最后的裁剪页面. + intent.putExtra("aspectX", 1);// 这两项为裁剪框的比例. + intent.putExtra("aspectY", 1);// x:y=1:1 +// intent.putExtra("outputX", 400);//图片输出大小 +// intent.putExtra("outputY", 400); + intent.putExtra("output", Uri.fromFile(file)); + intent.putExtra("outputFormat", "JPEG");// 返回格式 + startActivityForResult(intent, REQUEST_CODE_CROUP_PHOTO); + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + switch (requestCode) { + + case PermissionUtil.REQUEST_SHOWCAMERA: + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + // Permission Granted + uploadAvatarFromPhotoRequest(); + + } else { + if (!SharedPreferenceMark.getHasShowCamera()) { + SharedPreferenceMark.setHasShowCamera(true); + new DialogPermission(this, "关闭摄像头权限影响扫描功能"); + + } else { + Toast.makeText(this, "未获取摄像头权限", Toast.LENGTH_SHORT) + .show(); + } + } + break; + default: + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + } } } 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 9da8fce..b375ab4 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 @@ -18,7 +18,6 @@ import com.hjx.personalcenter.customdialog.GradeListDialog; import com.hjx.personalcenter.customdialog.ProvinceListDialog; import com.hjx.personalcenter.customdialog.SchoolListDialog; import com.hjx.personalcenter.db.SaveParam; -import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.util.AlertUtils; @@ -104,50 +103,52 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl //选择地区 private void choiseregion() { - ProvinceListDialog.getInstance(this).show(getSupportFragmentManager(), "ProvinceListDialog"); } -//选择年级 + //选择年级 private void choisegrade() { - HttpManager.getInstance().getgrade(RegisterInfoActivity.this); - GradeListDialog.getInstance().show(getSupportFragmentManager(), "GradeListDialog"); + GradeListDialog.getInstance(this).show(getSupportFragmentManager(), "GradeListDialog"); } //选择学校 private void choiseschool() { - SchoolListDialog.getInstance().show(getSupportFragmentManager(), "SchoolListDialog"); + SchoolListDialog.getInstance(this).show(getSupportFragmentManager(), "SchoolListDialog"); } @Override public void provinceOnItemClick(AdapterView parent, View view, int position, long id,int type) { + View View = parent.getChildAt(position); + TextView Tv = (TextView)View.findViewById(R.id.list_items); + switch (type){ - if (type==1){ - View gradeView = parent.getChildAt(position); - TextView gradeTv = (TextView)gradeView.findViewById(R.id.list_items); - SaveParam.getInstance().saveLoginParam(this,"sheng",gradeTv.getText().toString()); - CitysListDialog.getInstance(this).show(getSupportFragmentManager(), "CitysListDialog"); - } - - if (type==2){ - View gradeView = parent.getChildAt(position); - TextView gradeTv = (TextView)gradeView.findViewById(R.id.list_items); - SaveParam.getInstance().saveLoginParam(this,"shi",gradeTv.getText().toString()); - CountryDialog.getInstance(this).show(getSupportFragmentManager(), "CountryDialog"); - } - - if (type==3){ - View gradeView = parent.getChildAt(position); - TextView gradeTv = (TextView)gradeView.findViewById(R.id.list_items); - String provice = SaveParam.getInstance().getLoginParam(this,"sheng"); - String citys = SaveParam.getInstance().getLoginParam(this,"shi"); - et_region.setText(provice+citys+gradeTv.getText().toString()); + case 1: + SaveParam.getInstance().saveLoginParam(this,"sheng",Tv.getText().toString()); + CitysListDialog.getInstance(this).show(getSupportFragmentManager(), "CitysListDialog"); + break; + case 2: + String provice = SaveParam.getInstance().getLoginParam(this,"sheng"); + SaveParam.getInstance().saveLoginParam(this,"shi",Tv.getText().toString()); + CountryDialog.getInstance(this).show(getSupportFragmentManager(), "CountryDialog"); + et_region.setText(""); + et_region.setText(provice+Tv.getText().toString()); + break; + case 3: + String provices = SaveParam.getInstance().getLoginParam(this,"sheng"); + String citys = SaveParam.getInstance().getLoginParam(this,"shi"); + et_region.setText(""); + et_region.setText(provices+citys+Tv.getText().toString()); + break; + case 4: + et_school.setText(Tv.getText().toString()); + break; + case 5: + et_grade.setText(Tv.getText().toString()); + break; } - - } @Override public boolean onKeyUp(int keyCode, KeyEvent event) { diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GrandeAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GrandeAdapter.java index 454a7ce..dcc31d7 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GrandeAdapter.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GrandeAdapter.java @@ -16,10 +16,10 @@ import java.util.ArrayList; */ public class GrandeAdapter extends BaseAdapter{ - ArrayList objects; + ArrayList objects; private Context context; - public GrandeAdapter(ArrayList objects, Context context) { + public GrandeAdapter(ArrayList objects, Context context) { this.objects = objects; this.context = context; } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java index b40759b..5fc1469 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java @@ -19,7 +19,6 @@ import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.model.CityInfo; -import com.hjx.personalcenter.model.ProvinceInfo; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -65,7 +64,7 @@ public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnI @Override public View createView(Context context, LayoutInflater inflater, ViewGroup container) { - return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); + return inflater.inflate(R.layout.custom_adilog_cityslist, container, false); } @Override @@ -77,7 +76,7 @@ public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnI listView.setAdapter(listadapter); listView.setOnItemClickListener(this); try { - int a = Integer.parseInt(citys); + long a = Long.parseLong(citys); HttpManager.getInstance().cityinfo(getActivity(),a,handler); } catch (NumberFormatException e) { e.printStackTrace(); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CountryDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CountryDialog.java index ce81c64..da86975 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CountryDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CountryDialog.java @@ -13,13 +13,11 @@ import android.widget.AdapterView; import android.widget.ListView; import com.hjx.personalcenter.R; -import com.hjx.personalcenter.adapter.CitysAdapter; import com.hjx.personalcenter.adapter.CountryAdapter; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; -import com.hjx.personalcenter.model.CityInfo; import com.hjx.personalcenter.model.CountyInfo; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -55,6 +53,7 @@ public class CountryDialog extends BaseCircleDialog implements AdapterView.OnIte super.handleMessage(msg); switch (msg.what){ case HttpCode.COUNTRY: + data.clear(); data.addAll( (List)msg.obj); listadapter.notifyDataSetChanged(); @@ -65,7 +64,7 @@ public class CountryDialog extends BaseCircleDialog implements AdapterView.OnIte @Override public View createView(Context context, LayoutInflater inflater, ViewGroup container) { - return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); + return inflater.inflate(R.layout.custom_adilog_countrylist, container, false); } @Override diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java index 3a15198..75e3cf6 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java @@ -3,23 +3,27 @@ package com.hjx.personalcenter.customdialog; import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ListView; -import android.widget.Toast; import com.hjx.personalcenter.R; import com.hjx.personalcenter.adapter.GrandeAdapter; import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; +import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.model.GradeInfo; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; import java.util.ArrayList; +import java.util.List; /**自定义年级列表对话框 * Created by h on 2017/8/10. @@ -28,9 +32,13 @@ import java.util.ArrayList; public class GradeListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener { private GrandeAdapter listadapter; private ListView listView; - ArrayList data = new ArrayList<>(); - public static GradeListDialog getInstance() { - GradeListDialog dialogFragment = new GradeListDialog(); + ArrayList data = new ArrayList<>(); + private DialogCallBack.CallBack mCallBack; + public GradeListDialog(DialogCallBack.CallBack callBack) { + this.mCallBack = callBack; + } + public static GradeListDialog getInstance(DialogCallBack.CallBack callBack) { + GradeListDialog dialogFragment = new GradeListDialog(callBack); dialogFragment.setCanceledBack(true); dialogFragment.setCanceledOnTouchOutside(true); dialogFragment.setRadius(CircleDimen.RADIUS); @@ -39,6 +47,19 @@ public class GradeListDialog extends BaseCircleDialog implements AdapterView.OnI dialogFragment.setBackgroundColor(Color.WHITE); return dialogFragment; } + Handler handler = new Handler(){ + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what){ + case HttpCode.GRADER: + data.clear(); + data.addAll( (List)msg.obj); + listadapter.notifyDataSetChanged(); + break; + } + } + }; @Override public View createView(Context context, LayoutInflater inflater, ViewGroup container) { @@ -48,29 +69,20 @@ public class GradeListDialog extends BaseCircleDialog implements AdapterView.OnI public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); listView = (ListView) getView().findViewById(R.id.listadapter); - String gradens = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS); - if (gradens != null) { - - for (int i = 0; i < gradens.split(",").length; i++) { - GradeInfo.DataBean dataBean = new GradeInfo.DataBean(); - dataBean.setName(gradens.split(",")[i]); - data.add(dataBean); - } - } else { - HttpManager.getInstance().getgrade(getActivity()); - } listadapter = new GrandeAdapter(data,getActivity()); listView.setAdapter(listadapter); listView.setOnItemClickListener(this); + HttpManager.getInstance().getgrade(getActivity(),handler); } @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - Toast.makeText(getActivity(),"你点击了第"+position+"个",Toast.LENGTH_LONG).show(); - + SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.GRADENS, ""+data.get(position).getId()); + mCallBack.provinceOnItemClick(parent,view,position,id,5); dismiss(); + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/HeadDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/HeadDialog.java index 367b4c8..3d4ed62 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/HeadDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/HeadDialog.java @@ -2,10 +2,13 @@ package com.hjx.personalcenter.customdialog; import android.content.Context; import android.graphics.Color; +import android.os.Bundle; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.interfaces.DialogCallBack; @@ -16,13 +19,16 @@ import com.mylhyl.circledialog.res.values.CircleDimen; * Created by h on 2017/8/20. */ -public class HeadDialog extends BaseCircleDialog { +public class HeadDialog extends BaseCircleDialog implements View.OnClickListener { private View mView; + private TextView oktakephone, cancetakephone; + private LinearLayout take_pic,xiangce; private DialogCallBack.CallBackView mCallBack; public HeadDialog(DialogCallBack.CallBackView callBack) { this.mCallBack = callBack; } + public static HeadDialog getInstance(DialogCallBack.CallBackView callBackview) { HeadDialog dialogFragment = new HeadDialog(callBackview); dialogFragment.setCanceledBack(true); @@ -39,8 +45,28 @@ public class HeadDialog extends BaseCircleDialog { if (mView == null) { mView = inflater.inflate(R.layout.custom_adilog_lhead, container, false); - mCallBack.provinceOnItemClick(context,inflater,container); } return mView; } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + oktakephone = (TextView) mView.findViewById(R.id.oktakephone); + cancetakephone = (TextView) mView.findViewById(R.id.canceltakephone); + take_pic = (LinearLayout) mView.findViewById(R.id.take_pic); + xiangce = (LinearLayout) mView.findViewById(R.id.xiangce); + oktakephone.setOnClickListener(this); + cancetakephone.setOnClickListener(this); + take_pic.setOnClickListener(this); + xiangce.setOnClickListener(this); + + + } + + @Override + public void onClick(View v) { + mCallBack.heard(getActivity(), v); + dismiss(); + } } 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 781db63..0a137b3 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 @@ -13,7 +13,6 @@ import android.widget.AdapterView; import android.widget.ListView; import com.hjx.personalcenter.R; -import com.hjx.personalcenter.activity.RegisterInfoActivity; import com.hjx.personalcenter.adapter.ProvincesAdapter; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; @@ -47,6 +46,7 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. data.clear(); data.addAll( (List)msg.obj); listadapter.notifyDataSetChanged(); + break; } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java index 4057680..e8bfb94 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java @@ -16,13 +16,11 @@ import android.widget.EditText; import android.widget.ListView; import com.hjx.personalcenter.R; -import com.hjx.personalcenter.activity.RegisterInfoActivity; import com.hjx.personalcenter.adapter.SchoolAdapter; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; -import com.hjx.personalcenter.model.CountyInfo; import com.hjx.personalcenter.model.SchoolInfo; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -34,21 +32,24 @@ import java.util.List; * Created by h on 2017/8/21. */ -public class SchoolListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener, View.OnClickListener { +public class SchoolListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener { private ListView school_list; private EditText school_sech; private SchoolAdapter listadapter; private View mView; boolean isFilter; - private DialogCallBack.CallBackView mCallBack; ArrayList data = new ArrayList<>(); + private DialogCallBack.CallBack mCallBack; // public SchoolListDialog(DialogCallBack.CallBackView callBack) { // this.mCallBack = callBack; // } + public SchoolListDialog(DialogCallBack.CallBack callBack) { + this.mCallBack = callBack; + } - public static SchoolListDialog getInstance() { - SchoolListDialog dialogFragment = new SchoolListDialog(); + public static SchoolListDialog getInstance(DialogCallBack.CallBack mCallBack) { + SchoolListDialog dialogFragment = new SchoolListDialog(mCallBack); dialogFragment.setCanceledBack(true); dialogFragment.setCanceledOnTouchOutside(true); dialogFragment.setRadius(CircleDimen.RADIUS); @@ -57,6 +58,7 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On dialogFragment.setBackgroundColor(Color.WHITE); return dialogFragment; } + Handler handler = new Handler(){ @Override public void handleMessage(Message msg) { @@ -70,6 +72,8 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On } } }; + + @Override public View createView(Context context, LayoutInflater inflater, ViewGroup container) { @@ -86,13 +90,14 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On school_list = (ListView) getView().findViewById(R.id.listschooladapter); school_sech = (EditText) getView().findViewById(R.id.et_school_sech); String citys = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); + String grade = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS); listadapter = new SchoolAdapter(data, getActivity()); school_list.setAdapter(listadapter); school_list.setOnItemClickListener(this); - school_sech.setOnClickListener(this); try { int a = Integer.parseInt(citys); - HttpManager.getInstance().getschool(getActivity(),a,14,handler); + int b = Integer.parseInt(grade); + HttpManager.getInstance().getschool(getActivity(),130102,14,handler); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -122,12 +127,9 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On } @Override - public void onClick(View v) { - - } - - @Override public void onItemClick(AdapterView parent, View view, int position, long id) { + mCallBack.provinceOnItemClick(parent,view,position,id,4); + dismiss(); } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java index 3484d6b..9fe2480 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java @@ -1,18 +1,26 @@ package com.hjx.personalcenter.fragment; +import android.app.Activity; import android.graphics.Color; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.EditText; import android.widget.TextView; import com.bigkoo.pickerview.TimePickerView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.util.AlertUtils; +import com.mylhyl.circledialog.CircleDialog; +import com.mylhyl.circledialog.callback.ConfigButton; +import com.mylhyl.circledialog.callback.ConfigDialog; +import com.mylhyl.circledialog.params.ButtonParams; +import com.mylhyl.circledialog.params.DialogParams; import java.text.SimpleDateFormat; import java.util.Date; @@ -78,19 +86,60 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener public void onClick(View v) { switch (v.getId()){ case R.id.tv_sex: - AlertUtils.showToast(getActivity(),"正在开发"); + final String[] items = {"男", "女"}; + new CircleDialog.Builder(getActivity()) + .configDialog(new ConfigDialog() { + @Override + public void onConfig(DialogParams params) { + //增加弹出动画 + params.gravity = Gravity.CENTER; + } + }) + .setTitle("请选择性别") + .setWidth(0.5f) + .setItems(items, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int + position, long id) { + switch (position){ + case 0: + tv_sex.setText("男"); + break; + case 1: + tv_sex.setText("女"); + break; + } + + } + }) + .setNegative("取消", null) + .configNegative(new ConfigButton() { + @Override + public void onConfig(ButtonParams params) { + //取消按钮字体颜色 + params.textColor = Color.RED; + } + }) + .show(); break; case R.id.tv_useinfo_adress: - AlertUtils.showToast(getActivity(),"正在开发"); + //ProvinceListDialog.getInstance(getActivity()).show(getSupportFragmentManager(), "ProvinceListDialog"); break; case R.id.tv_useinfo_birthday: pvTime.show(tv_useinfo_birthday);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view break; case R.id.tv_useinfo_school: - AlertUtils.showToast(getActivity(),"正在开发"); + //SchoolListDialog.getInstance(getActivity()).show(getSupportFragmentManager(), "SchoolListDialog"); + break; case R.id.tv_useinfo_gender: - AlertUtils.showToast(getActivity(),"正在开发"); + //GradeListDialog.getInstance(getActivity()).show(getSupportFragmentManager(), "GradeListDialog"); + break; + case R.id.presonal_sub: + AlertUtils.showToast(getActivity(),"你点击了提交"); + //保存星座 +// BrithdayStar brithdayStar = new BrithdayStar(); +// String s =brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString()); break; } } @@ -135,4 +184,12 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); return format.format(date); } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + View rootView = activity.getWindow().getDecorView(); + TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub); + sub.setOnClickListener(this); + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java index 54c299f..12c4900 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java @@ -31,8 +31,8 @@ public class HttpCode { public static final int COUNTRY = 13; //学校 public static final int SCHOOL = 14; - //私人订制查询 - public static final int PRIVATEDZ = 15; + //年级 + public static final int GRADER = 15; 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 fd85bc7..0553af6 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 @@ -20,6 +20,7 @@ import com.hjx.personalcenter.activity.LoginAndRegisterActivity; import com.hjx.personalcenter.activity.TheStartPageActivity; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.gson.GsonTool; +import com.hjx.personalcenter.model.CardInfo; import com.hjx.personalcenter.model.CityInfo; import com.hjx.personalcenter.model.CountyInfo; import com.hjx.personalcenter.model.GradeInfo; @@ -492,10 +493,12 @@ public class HttpManager { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { closeProgress(); - Log.e("test", "省" + new String(arg2)); + Log.e("test", "保卡信息" + new String(arg2)); + CardInfo cardInfo = GsonTool.getPerson(new String(arg2), CardInfo.class);//解析json数据 + CardInfo.DataBean schoolInfoBeanList = cardInfo.getData(); Message msg = Message.obtain(); msg.what = HttpCode.SUCHCARDINFO; - msg.obj = new String(arg2); + msg.obj = schoolInfoBeanList; handler.sendMessage(msg); } @@ -673,20 +676,22 @@ public class HttpManager { } ///获取年级 - public void getgrade(final Context mContext) { + public void getgrade(final Context mContext, final Handler handler) { HttpClient.getInstance().addHeader("Accept", "application/json"); HttpClient.getInstance().get(HttpUrl.gradesUrl, new AsyncHttpResponseHandler() { @Override public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { Log.e("test", "年级" + new String(arg2)); - GradeInfo gradensInfo = GsonTool.getPerson(new String(arg2), GradeInfo.class);//解析json数据 - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < gradensInfo.getData().size(); i++) { - sb.append(gradensInfo.getData().get(i).getName() + ","); - + GradeInfo gradeInfo = GsonTool.getPerson(new String(arg2), GradeInfo.class);//解析json数据 + List gradeInfoBeanList = null; + for (int i = 0 ;i<3;i++) { + gradeInfoBeanList=(gradeInfo.getData().get(i).getChildren()); } - Log.e("test", "年级" + sb.toString()); - SaveParam.getInstance().saveLoginParam(mContext, SaveParam.GRADENS, "" + sb.toString()); + + Message message = Message.obtain(); + message.what = HttpCode.GRADER; + message.obj = gradeInfoBeanList; + handler.sendMessage(message); } @@ -809,7 +814,7 @@ public class HttpManager { } //市级接口 - public void cityinfo(final Context mContext, int 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 diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java index 2c97dc3..3c1034d 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java @@ -1,9 +1,7 @@ package com.hjx.personalcenter.interfaces; import android.content.Context; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.AdapterView; /** @@ -11,10 +9,12 @@ import android.widget.AdapterView; */ public class DialogCallBack { + //对话框回调 public interface CallBack{ void provinceOnItemClick(AdapterView parent, View view, int position, long id,int type); } + //头像回调 public interface CallBackView{ - void provinceOnItemClick(Context context, LayoutInflater inflater, ViewGroup container); + void heard(Context context,View v); } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CardInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CardInfo.java index b04f635..56fe265 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CardInfo.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CardInfo.java @@ -7,107 +7,163 @@ package com.hjx.personalcenter.model; public class CardInfo { /** - * customerName : FuQiang - * createTime : 2017-08-01 13:21:00 - * mobilePhone : 13162530008 - * buyTime : 2017-08-01 12:23:50 - * productModel : GT-N7100 - * buyAddress : HaojixingZhengZhou - * customerAddress : HeNamZhengSheng - * alterSaleCall : 4022210201 - * macAddress : 00:22:F4:93:7A:B - - * deviceNumber : A909A90997011012 + * status : 1 + * pageSize : 1 + * data : {"customerName":"FuQiang","createTime":"2017-08-01 13:21:00","mobilePhone":"13162530008","buyTime":"2017-08-01 12:23:50","productModel":"GT-N7100","buyAddress":"HaojixingZhengZhou","customerAddress":"HeNamZhengSheng","alterSaleCall":"4022210201","macAddress":"00:22:F4:93:7A:B\n","deviceNumber":"A909A90997011012"} + * msg : success + * pageNum : 9 */ - private String customerName; - private String createTime; - private String mobilePhone; - private String buyTime; - private String productModel; - private String buyAddress; - private String customerAddress; - private String alterSaleCall; - private String macAddress; - private String deviceNumber; - - public String getCustomerName() { - return customerName; - } + private int status; + private int pageSize; + private DataBean data; + private String msg; + private int pageNum; - public void setCustomerName(String customerName) { - this.customerName = customerName; + public int getStatus() { + return status; } - public String getCreateTime() { - return createTime; + public void setStatus(int status) { + this.status = status; } - public void setCreateTime(String createTime) { - this.createTime = createTime; + public int getPageSize() { + return pageSize; } - public String getMobilePhone() { - return mobilePhone; + public void setPageSize(int pageSize) { + this.pageSize = pageSize; } - public void setMobilePhone(String mobilePhone) { - this.mobilePhone = mobilePhone; + public DataBean getData() { + return data; } - public String getBuyTime() { - return buyTime; + public void setData(DataBean data) { + this.data = data; } - public void setBuyTime(String buyTime) { - this.buyTime = buyTime; + public String getMsg() { + return msg; } - public String getProductModel() { - return productModel; + public void setMsg(String msg) { + this.msg = msg; } - public void setProductModel(String productModel) { - this.productModel = productModel; + public int getPageNum() { + return pageNum; } - public String getBuyAddress() { - return buyAddress; + public void setPageNum(int pageNum) { + this.pageNum = pageNum; } - public void setBuyAddress(String buyAddress) { - this.buyAddress = buyAddress; - } + public static class DataBean { + /** + * customerName : FuQiang + * createTime : 2017-08-01 13:21:00 + * mobilePhone : 13162530008 + * buyTime : 2017-08-01 12:23:50 + * productModel : GT-N7100 + * buyAddress : HaojixingZhengZhou + * customerAddress : HeNamZhengSheng + * alterSaleCall : 4022210201 + * macAddress : 00:22:F4:93:7A:B - public String getCustomerAddress() { - return customerAddress; - } + * deviceNumber : A909A90997011012 + */ - public void setCustomerAddress(String customerAddress) { - this.customerAddress = customerAddress; - } + private String customerName; + private String createTime; + private String mobilePhone; + private String buyTime; + private String productModel; + private String buyAddress; + private String customerAddress; + private String alterSaleCall; + private String macAddress; + private String deviceNumber; - public String getAlterSaleCall() { - return alterSaleCall; - } + public String getCustomerName() { + return customerName; + } - public void setAlterSaleCall(String alterSaleCall) { - this.alterSaleCall = alterSaleCall; - } + public void setCustomerName(String customerName) { + this.customerName = customerName; + } - public String getMacAddress() { - return macAddress; - } + public String getCreateTime() { + return createTime; + } - public void setMacAddress(String macAddress) { - this.macAddress = macAddress; - } + public void setCreateTime(String createTime) { + this.createTime = createTime; + } - public String getDeviceNumber() { - return deviceNumber; - } + public String getMobilePhone() { + return mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getBuyTime() { + return buyTime; + } + + public void setBuyTime(String buyTime) { + this.buyTime = buyTime; + } + + public String getProductModel() { + return productModel; + } + + public void setProductModel(String productModel) { + this.productModel = productModel; + } + + public String getBuyAddress() { + return buyAddress; + } + + public void setBuyAddress(String buyAddress) { + this.buyAddress = buyAddress; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getAlterSaleCall() { + return alterSaleCall; + } - public void setDeviceNumber(String deviceNumber) { - this.deviceNumber = deviceNumber; + public void setAlterSaleCall(String alterSaleCall) { + this.alterSaleCall = alterSaleCall; + } + + public String getMacAddress() { + return macAddress; + } + + public void setMacAddress(String macAddress) { + this.macAddress = macAddress; + } + + public String getDeviceNumber() { + return deviceNumber; + } + + public void setDeviceNumber(String deviceNumber) { + this.deviceNumber = deviceNumber; + } } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CityInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CityInfo.java index 033ebe7..df3accd 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CityInfo.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CityInfo.java @@ -1,12 +1,13 @@ package com.hjx.personalcenter.model; +import java.io.Serializable; import java.util.List; /** * Created by h on 2017/8/16. */ -public class CityInfo { +public class CityInfo implements Serializable { /** * status : 100 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 index 85b4318..71bf56d 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CountyInfo.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/CountyInfo.java @@ -1,12 +1,13 @@ package com.hjx.personalcenter.model; +import java.io.Serializable; import java.util.List; /** * Created by h on 2017/8/16. */ -public class CountyInfo { +public class CountyInfo implements Serializable{ /** diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/PesonalInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/PesonalInfo.java new file mode 100644 index 0000000..4b992ab --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/PesonalInfo.java @@ -0,0 +1,218 @@ +package com.hjx.personalcenter.model; + +import java.io.Serializable; + +/** + * Created by h on 2017/8/22. + */ + +public class PesonalInfo implements Serializable{ + + /** + * status : 1 + * pageSize : 0 + * data : {"region":{"regionName":"闵行区","regionId":"310112"},"nickName":"1688kkkkkkkkk","gender":"female","school":{"schoolId":"499705","schoolName":"上海五中"},"grade":{"gradeName":"初中六年级","gradeId":"9"},"birthday":"2017-09-12","qq":"1666600"} + * msg : success + * pageNum : 0 + */ + + private int status; + private int pageSize; + private DataBean data; + private String msg; + private int pageNum; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public static class DataBean { + /** + * region : {"regionName":"闵行区","regionId":"310112"} + * nickName : 1688kkkkkkkkk + * gender : female + * school : {"schoolId":"499705","schoolName":"上海五中"} + * grade : {"gradeName":"初中六年级","gradeId":"9"} + * birthday : 2017-09-12 + * qq : 1666600 + */ + + private RegionBean region; + private String nickName; + private String gender; + private SchoolBean school; + private GradeBean grade; + private String birthday; + private String qq; + + public RegionBean getRegion() { + return region; + } + + public void setRegion(RegionBean region) { + this.region = region; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public SchoolBean getSchool() { + return school; + } + + public void setSchool(SchoolBean school) { + this.school = school; + } + + public GradeBean getGrade() { + return grade; + } + + public void setGrade(GradeBean grade) { + this.grade = grade; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getQq() { + return qq; + } + + public void setQq(String qq) { + this.qq = qq; + } + + public static class RegionBean { + /** + * regionName : 闵行区 + * regionId : 310112 + */ + + private String regionName; + private String regionId; + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + + public String getRegionId() { + return regionId; + } + + public void setRegionId(String regionId) { + this.regionId = regionId; + } + } + + public static class SchoolBean { + /** + * schoolId : 499705 + * schoolName : 上海五中 + */ + + private String schoolId; + private String schoolName; + + public String getSchoolId() { + return schoolId; + } + + public void setSchoolId(String schoolId) { + this.schoolId = schoolId; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + } + + public static class GradeBean { + /** + * gradeName : 初中六年级 + * gradeId : 9 + */ + + private String gradeName; + private String gradeId; + + public String getGradeName() { + return gradeName; + } + + public void setGradeName(String gradeName) { + this.gradeName = gradeName; + } + + public String getGradeId() { + return gradeId; + } + + public void setGradeId(String gradeId) { + this.gradeId = gradeId; + } + } + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/BrithdayStar.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/BrithdayStar.java new file mode 100644 index 0000000..dc8b85c --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/BrithdayStar.java @@ -0,0 +1,25 @@ +package com.hjx.personalcenter.util; + +/** + * Created by h on 2017/8/22. + */ + +public class BrithdayStar { + String[][] constellations = {{"摩羯座", "水瓶座"}, {"水瓶座", "双鱼座"}, {"双鱼座", "白羊座"}, {"白羊座", "金牛座"}, {"金牛座", "双子座"}, {"双子座", "巨蟹座"}, {"巨蟹座", "狮子座"}, + {"狮子座", "处女座"}, {"处女座", "天秤座"}, {"天秤座", "天蝎座"}, {"天蝎座", "射手座"}, {"射手座", "摩羯座"}}; + //星座分割时间 + int[] date = {20, 19, 21, 20, 21, 22, 23, 23, 23, 24, 23, 22}; + //星座生成 传进是日期格式为: yyyy-mm-dd + public String getConstellations(String birthday) { + String become_constellation = null; + String[] data = birthday.split("-"); + int day = date[Integer.parseInt(data[1]) - 1]; + String[] cl1 = constellations[Integer.parseInt(data[1]) - 1]; + if (Integer.parseInt(data[2]) >= day) { + become_constellation =cl1[1]; + } else { + become_constellation=cl1[0]; + } + return become_constellation; + } +} diff --git a/PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml b/PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml index 86e00a0..bf749b3 100644 --- a/PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml +++ b/PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml @@ -30,7 +30,7 @@ android:textColor="@android:color/white" android:textSize="22sp" /> - - + android:layout_gravity="center" + fresco:placeholderImage="@mipmap/header_default" + fresco:roundAsCircle="true" + fresco:placeholderImageScaleType="fitCenter" /> + + + + + + + + + + + + diff --git a/PersonalCenter/app/src/main/res/layout/custom_adilog_countrylist.xml b/PersonalCenter/app/src/main/res/layout/custom_adilog_countrylist.xml new file mode 100644 index 0000000..3fa5b03 --- /dev/null +++ b/PersonalCenter/app/src/main/res/layout/custom_adilog_countrylist.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/PersonalCenter/app/src/main/res/layout/custom_adilog_lhead.xml b/PersonalCenter/app/src/main/res/layout/custom_adilog_lhead.xml index 42b8c47..f7fdf47 100644 --- a/PersonalCenter/app/src/main/res/layout/custom_adilog_lhead.xml +++ b/PersonalCenter/app/src/main/res/layout/custom_adilog_lhead.xml @@ -22,7 +22,7 @@