diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml index 168845f..f55828c 100644 --- a/PersonalCenter/app/src/main/AndroidManifest.xml +++ b/PersonalCenter/app/src/main/AndroidManifest.xml @@ -56,7 +56,7 @@ diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java new file mode 100644 index 0000000..63e3070 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java @@ -0,0 +1,18 @@ +package com.hjx.personalcenter.activity; + +import android.app.Activity; +import android.os.Bundle; + +import com.hjx.personalcenter.R; + +/** + * Created by h on 2017/8/9. + */ + +public class ChangeElectronicCardAdressInfoActivity extends Activity{ + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_change_card_validation); + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java deleted file mode 100644 index 792561f..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hjx.personalcenter.activity; - -import android.app.Activity; -import android.os.Bundle; - -import com.hjx.personalcenter.R; - -/** - * Created by h on 2017/8/9. - */ - -public class ChangeElectronicCardInfoActivity extends Activity{ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_change_card_validation); - } -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java index 6cc8e90..7f5913a 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -13,6 +14,8 @@ import android.widget.TextView; import com.bigkoo.pickerview.TimePickerView; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.util.AlertUtils; import java.text.SimpleDateFormat; import java.util.Date; @@ -111,19 +114,47 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC pvTime.show(tv_buy_time);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view break; case R.id.btn_change_info: - Intent intent = new Intent(); - intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class); - startActivity(intent); - overridePendingTransition(R.anim.rightin, R.anim.rightout); + String info1 =username.getText().toString().trim(); + String info2 =adress_custem.getText().toString().trim(); + String info3 =detalAdress.getText().toString().trim(); + String info4 =tv_buy_time.getText().toString().trim(); + String info5 =adress_shop.getText().toString().trim(); + String info6 =store.getText().toString().trim(); + String info7 =telphone.getText().toString().trim(); + + if (TextUtils.isEmpty(info1) || TextUtils.isEmpty(info2)||TextUtils.isEmpty(info3) + ||TextUtils.isEmpty(info4)||TextUtils.isEmpty(info5)||TextUtils.isEmpty(info6) + ||TextUtils.isEmpty(info7)) { + AlertUtils.showToast(ElectronicCardEditInfoActivity.this, "所有内容不能为空。"); + return; + }else { + savedata(); + Intent intent = new Intent(); + intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + } + break; case R.id.tv_edit_adress_shop: + adress_shop.setText("湖南省益阳市上河区"); break; case R.id.tv_edit_adress_custem: + adress_custem.setText("湖南省益阳市上河区"); break; } } + //保存数据 + private void savedata() { + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.CUNSTEMNAME, username.getText().toString().trim()); + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.ADRESSCUNSTEM, adress_custem.getText().toString().trim()+detalAdress.getText().toString().trim()); + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPTIME, tv_buy_time.getText().toString().trim()); + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPADRESS, adress_shop.getText().toString().trim()+store.getText().toString().trim()); + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPTLEPHONE, telphone.getText().toString().trim()); + + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java index 434d5d3..2443fbd 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java @@ -1,7 +1,6 @@ package com.hjx.personalcenter.activity; import android.app.Activity; -import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -9,6 +8,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.util.GetDevicesUtil; /**确认保卡信息 @@ -29,6 +30,7 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli } private void initView() { btn_finish = (Button) findViewById(R.id.btn_finish); + iv_last_step = (ImageView) findViewById(R.id.cancel); usename = (TextView) findViewById(R.id.iv_card_username); deviceModel = (TextView) findViewById(R.id.tv_card_deviceModel); customer_address = (TextView) findViewById(R.id.tv_card_adress); @@ -46,10 +48,18 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli 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)); + } private void initLister() { + iv_last_step.setOnClickListener(this); btn_finish.setOnClickListener(this); } @@ -57,11 +67,17 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli public void onClick(View v) { switch (v.getId()){ case R.id.btn_finish: - Intent intent = new Intent(); - intent.setClass(ElectronicCardInfoOKActivity.this,TheStartPageActivity.class); - startActivity(intent); - overridePendingTransition(R.anim.rightin, R.anim.rightout); + HttpManager.getInstance().subcardinfo(this,636,usename.getText().toString().trim(), + customer_address.getText().toString().trim(),shopadress.getText().toString().trim(), + shoptime.getText().toString().trim(),tlePhone.getText().toString().trim(), + deviceModel.getText().toString().trim(),deviceNumber.getText().toString().trim(), + mac_adress.getText().toString().trim(),phone.getText().toString().trim()); + break; + case R.id.cancel: + finish(); break; } } + + } 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 3c8551a..18c571d 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 @@ -1,18 +1,91 @@ package com.hjx.personalcenter.activity; -import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.Content; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.util.GetDevicesUtil; /** * Created by h on 2017/8/11. */ -public class ElectronicCardLookInfoActivity extends Activity{ +public class ElectronicCardLookInfoActivity extends AppCompatActivity implements View.OnClickListener{ + 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; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_electronic_look_cardinfo); + initView(); + initData(); + initLister(); + } + private void initView() { + usename = (TextView) findViewById(R.id.iv_card_username); + iv_last_step = (ImageView) findViewById(R.id.cancel); + deviceModel = (TextView) findViewById(R.id.tv_card_deviceModel); + customer_address = (TextView) findViewById(R.id.tv_card_adress); + mac_adress = (TextView) findViewById(R.id.tv_card_mac); + shoptime = (TextView) findViewById(R.id.tv_card_time); + deviceNumber = (TextView) findViewById(R.id.tv_card_deviceNumber); + shopadress = (TextView) findViewById(R.id.tv_card_shopAdress); + phone = (TextView) findViewById(R.id.tv_card_phone); + tlePhone = (TextView) findViewById(R.id.tv_card_tleNember); + tv_card_adress_change = (TextView) findViewById(R.id.tv_card_adress_change); + tv_card_phone_change = (TextView) findViewById(R.id.tv_card_phone_change); + } + private void initData() { + //获取设备信息 + 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)); + + + } + private void initLister() { + tv_card_adress_change.setOnClickListener(this); + tv_card_phone_change.setOnClickListener(this); + iv_last_step.setOnClickListener(this); } + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.tv_card_adress_change: + Intent intent = new Intent(); + intent.setClass(this,ChangeElectronicCardAdressInfoActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + + break; + case R.id.tv_card_phone_change: + Content.authcodeflag =2; + Intent intent1 = new Intent(); + intent1.setClass(this,ElectronicCardValidationActivity.class); + startActivity(intent1); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + + + 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 5a8d622..2804386 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 @@ -3,17 +3,69 @@ package com.hjx.personalcenter.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.text.TextUtils; import android.view.View; import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.Content; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.http.HttpCode; +import com.hjx.personalcenter.http.HttpManager; +import com.hjx.personalcenter.util.AlertUtils; +import com.hjx.personalcenter.util.PhoneNumCheckUtils; + +import org.json.JSONObject; /** * Created by h on 2017/8/9. */ public class ElectronicCardValidationActivity extends Activity implements View.OnClickListener { - private Button btn_card_valiyanzhen; + private Button btn_card_valiyanzhen,get_authcode; + private EditText phonenumber,anth_6num;//;//密码 + private TextView menu_title; + private int i = 0; + private Thread thread; + private String sourceStr ="android"; + private String typeStr = "register"; + String authcode = ""; + Handler handler = new Handler() { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + JSONObject jsonObject; + String status; + switch (msg.what) { + case HttpCode.AUTHCODE_SUCESS: + jsonObject = (JSONObject) msg.obj; + status = jsonObject.optString("status"); + authcode = jsonObject.optString("jsessionid"); + if (status.equals("100")) { + AlertUtils.showToast(ElectronicCardValidationActivity.this, "验证码发送成功"); + } + + break; + case HttpCode.AUTHCODE_FAIL: + AlertUtils.showToast(ElectronicCardValidationActivity.this, "验证码发送失败"); + break; + case 1: + get_authcode.setEnabled(false); + get_authcode.setClickable(false); + get_authcode.setText(Integer.toString(i--)+" s"); + if (i<=0){ + get_authcode.setEnabled(true); + get_authcode.setClickable(true); + get_authcode.setText("获取验证码"); + } + break; + } + } + }; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -25,13 +77,28 @@ public class ElectronicCardValidationActivity extends Activity implements View.O private void initView() { btn_card_valiyanzhen = (Button) findViewById(R.id.btn_card_valiyanzhen); + get_authcode = (Button) findViewById(R.id.btn_authcode); + anth_6num = (EditText) findViewById(R.id.et_authcode); + phonenumber = (EditText) findViewById(R.id.et_phonenumber); + menu_title = (TextView) findViewById(R.id.menu_title); } private void initData() { + if (Content.authcodeflag==1){ + menu_title.setText("填写保卡信息"); + + }else if (Content.authcodeflag==2){ + menu_title.setText("修改保卡信息"); + }else { + menu_title.setText("更换绑定"); + } + + } private void initLister() { + get_authcode.setOnClickListener(this); btn_card_valiyanzhen.setOnClickListener(this); } @@ -40,11 +107,77 @@ public class ElectronicCardValidationActivity extends Activity implements View.O public void onClick(View v) { switch (v.getId()){ case R.id.btn_card_valiyanzhen: + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.CARDPHONE, phonenumber.getText().toString().trim()); Intent intent = new Intent(); - intent.setClass(ElectronicCardValidationActivity.this,ElectronicCardEditInfoActivity.class); + intent.setClass(ElectronicCardValidationActivity.this, ElectronicCardEditInfoActivity.class); startActivity(intent); overridePendingTransition(R.anim.rightin, R.anim.rightout); + + String usernameStr = phonenumber.getText().toString().trim(); + String authcodeStr = anth_6num.getText().toString().trim(); + if (TextUtils.isEmpty(usernameStr) || TextUtils.isEmpty(authcodeStr)) { + AlertUtils.showToast(ElectronicCardValidationActivity.this, "手机号，和验证码不能为空"); + return; + } else if (!PhoneNumCheckUtils.isPhone(usernameStr)){ + AlertUtils.showToast(ElectronicCardValidationActivity.this, "手机号码输入错误"); + + }else if (!authcode.equals(authcodeStr)){ + AlertUtils.showToast(ElectronicCardValidationActivity.this, "您输入的验证码不正确"); + }else { + if (Content.authcodeflag==1){ + menu_title.setText("填写保卡信息"); + + }else if (Content.authcodeflag==2){ + //调用接口 + menu_title.setText("修改保卡信息"); + }else { + //修改手机号 + menu_title.setText("更换绑定"); + } +// SaveParam.getInstance().saveLoginParam(this,SaveParam.CARDPHONE, phonenumber.getText().toString().trim()); +// Intent intent = new Intent(); +// intent.setClass(ElectronicCardValidationActivity.this, ElectronicCardEditInfoActivity.class); +// startActivity(intent); +// overridePendingTransition(R.anim.rightin, R.anim.rightout); + } + break; + case R.id.btn_authcode: + String usernameStr1 = phonenumber.getText().toString().trim(); + if (!PhoneNumCheckUtils.isPhone(usernameStr1)){ + AlertUtils.showToast(ElectronicCardValidationActivity.this, "请输入正确的手机号"); + }else { + anth_6num.requestFocus(); + HttpManager.getInstance().authCode(typeStr, usernameStr1, handler, ElectronicCardValidationActivity.this); + i = 60; + if(thread == null){ + thread = new Thread( new ThreadShow()); + thread.start(); + } + + } + break; } } + // 线程类 定时器 + class ThreadShow implements Runnable { + + @Override + public void run() { + // TODO Auto-generated method stub + while (true) { + try { + Thread.sleep(1000); + Message msg = new Message(); + msg.what = 1; + handler.sendMessage(msg); + System.out.println("send..."); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + System.out.println("thread error..."); + } + } + } + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java index e104b55..19aa221 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java @@ -112,7 +112,7 @@ public class ForgotPasswordActivity extends Activity implements View.OnClickList //获取验证码 private void getauthcode() { forot_pwd_anthcode.requestFocus(); - HttpManager.getInstance().forgetauthCode(typeStr, forot_pwd_phone1, handler, this); + HttpManager.getInstance().authCode(typeStr, forot_pwd_phone1, handler, this); i = 60; if(thread == null){ thread = new Thread( new ThreadShow()); 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 new file mode 100644 index 0000000..954fc7c --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java @@ -0,0 +1,85 @@ +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.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; + +import com.hjx.personalcenter.R; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.http.HttpManager; +import com.mylhyl.circledialog.BaseCircleDialog; +import com.mylhyl.circledialog.res.values.CircleDimen; + +import java.util.ArrayList; + +/** + * 自定义年级列表对话框 + * Created by h on 2017/8/10. + */ + +public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener { + ArrayAdapter listadapter; + ListView listView; + ArrayList data = new ArrayList<>(); + + public static CitysListDialog getInstance() { + CitysListDialog dialogFragment = new CitysListDialog(); + dialogFragment.setCanceledBack(true); + dialogFragment.setCanceledOnTouchOutside(true); + dialogFragment.setRadius(CircleDimen.RADIUS); + dialogFragment.setWidth(0.5f); + dialogFragment.setGravity(Gravity.CENTER); + dialogFragment.setBackgroundColor(Color.WHITE); + return dialogFragment; + } + + @Override + public View createView(Context context, LayoutInflater inflater, ViewGroup container) { + return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + listView = (ListView) getView().findViewById(R.id.listadapter); + String provinces = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); + if (provinces != null) { + + for (int i = 0; i < provinces.split(",").length; i++) { + String[] itmt = provinces.split(","); + data.add(itmt[i] + "区"); + //data.add(i,provinces.replaceAll(",","省")); + + } + } else { + HttpManager.getInstance().provices(getActivity()); + } + + listadapter = new ArrayAdapter(getActivity(), R.layout.custom_adilog_list_item, R.id.list_items, data); + listView.setAdapter(listadapter); + listView.setOnItemClickListener(this); + + } + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show(); + switch (position){ + + + + } + + + + dismiss(); + + } +} 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 520c213..da63f42 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 @@ -11,6 +11,7 @@ import android.view.ViewGroup; import com.hjx.personalcenter.R; import com.hjx.personalcenter.activity.ElectronicCardValidationActivity; +import com.hjx.personalcenter.db.Content; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -44,6 +45,7 @@ public class ElectronicCardDialog extends BaseCircleDialog { // intent.setClass(getActivity(),TheStartPageActivity.class); // startActivity(intent); // getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); + Content.authcodeflag =1; Intent intent = new Intent(); intent.setClass(getActivity(),ElectronicCardValidationActivity.class); startActivity(intent); 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 e4b2f89..fda281c 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 @@ -10,16 +10,17 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; -import android.widget.Toast; import com.hjx.personalcenter.R; import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.http.HttpManager; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; import java.util.ArrayList; -/**自定义年级列表对话框 +/** + * 自定义年级列表对话框 * Created by h on 2017/8/10. */ @@ -27,6 +28,7 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. ArrayAdapter listadapter; ListView listView; ArrayList data = new ArrayList<>(); + public static ProvinceListDialog getInstance() { ProvinceListDialog dialogFragment = new ProvinceListDialog(); dialogFragment.setCanceledBack(true); @@ -37,21 +39,30 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. dialogFragment.setBackgroundColor(Color.WHITE); return dialogFragment; } + @Override public View createView(Context context, LayoutInflater inflater, ViewGroup container) { return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); listView = (ListView) getView().findViewById(R.id.listadapter); - String ranging = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.PROVINCES); - for (int i =0 ; i parent, View view, int position, long id) { - Toast.makeText(getActivity(),"你点击了第"+position+"个",Toast.LENGTH_LONG).show(); + //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show(); + switch (position){ + + } + + dismiss(); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/Content.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/Content.java new file mode 100644 index 0000000..57c124c --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/Content.java @@ -0,0 +1,9 @@ +package com.hjx.personalcenter.db; + +/** + * Created by h on 2017/8/17. + */ + +public class Content { + public static int authcodeflag;//1是进入填写保卡信息验证，2是修改保卡手机号验证，3是更改绑定验证 +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java index 2e7e9e3..6168e88 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java @@ -13,8 +13,18 @@ public class SaveParam { } return instance; } + //个人信息 + //电子保卡信息 + public static String CARDPHONE = "cardphone";//保卡手机号 + public static String CUNSTEMNAME = "cunstemname";//客户姓名 + public static String ADRESSCUNSTEM = "adresscunstem";//客户地址 + public static String SHOPTIME = "shoptime";//购买时间 + public static String SHOPADRESS = "shopadress";//购买地址 + public static String SHOPTLEPHONE = "shoptlephone";//售后电话 + + //省市区参数 public static String PROVINCES = "provinces";//省 - public static String OBJECTIVE = "objective"; + public static String CITYS = "citys"; public void saveLoginParam(Context context,String spname, String spstr) { diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java index 38e05a6..2da1d5e 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java @@ -14,4 +14,5 @@ public class HttpClient extends AsyncHttpClient { } private HttpClient() {} + } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java index 2c2c8f7..a43b68d 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java @@ -18,6 +18,20 @@ public class HttpKey { //修改密码 public static String OLDPASS = "oldPass"; public static String NEWPASS = "newPass"; + //提交保卡 + public static String USEID = "userId"; + public static String CUSTOMENAME = "customerName"; + public static String CUSTOMADRESS = "customerAddress"; + public static String BUYADREES = "buyAddress"; + public static String BUYTIME = "buyTime"; + public static String ALTERSALECALL = "alterSaleCall"; + public static String PRODUCTMODEL = "productModel"; + public static String DEVICENUMBER = "deviceNumber"; + public static String MACADRESS = "macAddress"; + public static String MOBILPHONE = "customerPhone"; + + + 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 cd13dd5..bd0cce0 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 @@ -10,7 +10,9 @@ import android.util.Log; import android.widget.Toast; import com.google.gson.Gson; +import com.hjx.personalcenter.R; 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.CityInfo; @@ -160,29 +162,6 @@ public class HttpManager { }); } - //验证码 - public void forgetauthCode(final String type, final String mobile, final Handler handler, final Context mContext) { - RequestParams params = new RequestParams(); - params.put("type", type); - params.put("mobile", mobile); - HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - HttpClient.getInstance().post(HttpUrl.authCodedUrl, params, new JsonHttpResponseHandler() { - - @Override - public void onSuccess(int statusCode, Header[] headers, JSONObject response) { - Log.e("test", "onSuccess-----" + response); - Message msg = Message.obtain(); - msg.what = HttpCode.AUTHCODE_SUCESS1; - msg.obj = response; - handler.sendMessage(msg); - } - - @Override - public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { - Toast.makeText(mContext, "请检查网络。。" + errorResponse, Toast.LENGTH_LONG).show(); - } - }); - } //手机号是否注册 public void isregistered(final String mobile, final Handler handler, final Context mContext) { @@ -294,7 +273,67 @@ public class HttpManager { SaveParam.getInstance().saveLoginParam(context,"gender", gender); SaveParam.getInstance().saveLoginParam(context,"mobilePortrait", mobilePortrait); } -///省级接口 + //提交保卡信息 + public void subcardinfo(final Context context, int userId, String customerName, String customerAddress, + String buyAddress,String buyTime,String alterSaleCall, + String productModel,String deviceNumber,String macAddress, + String mobilePhone) { + JSONObject params = new JSONObject(); + ByteArrayEntity entity = null; + try { + params.put(HttpKey.USEID, userId); + params.put(HttpKey.CUSTOMENAME, customerName); + params.put(HttpKey.CUSTOMADRESS, customerAddress); + params.put(HttpKey.BUYADREES, buyAddress); + params.put(HttpKey.BUYTIME, buyTime); + params.put(HttpKey.ALTERSALECALL, alterSaleCall); + params.put(HttpKey.PRODUCTMODEL, productModel); + params.put(HttpKey.DEVICENUMBER, deviceNumber); + params.put(HttpKey.MACADRESS, macAddress); + params.put(HttpKey.MOBILPHONE, mobilePhone); + entity = new ByteArrayEntity(params.toString().getBytes("UTF-8")); + entity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); + } catch (Exception e) { + e.printStackTrace(); + } + + HttpClient.getInstance().addHeader("Accept", "*/*"); + + Log.e("test", "params" + params); + HttpClient.getInstance().post(context,HttpUrl.subcardinfo, entity, "application/json", new JsonHttpResponseHandler() { + @Override + public void onSuccess(int statusCode, Header[] headers, JSONObject response) { + super.onSuccess(statusCode, headers, response); + String status = response.optString("status"); + if (status.equals("1")) { + Log.e("test", "onSuccess" +response); + Toast.makeText(context, "保卡绑定成功！", Toast.LENGTH_LONG).show(); + Intent intent = new Intent(); + intent.setClass((Activity) context,TheStartPageActivity.class); + ((Activity) context).startActivity(intent); + ((Activity) context).overridePendingTransition(R.anim.rightin, R.anim.rightout); + ((Activity) context).finish(); + } + + } + + @Override + public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { + super.onFailure(statusCode, headers, throwable, errorResponse); + Log.e("test", "onFailure" + (errorResponse)); + Toast.makeText(context, "保卡绑定失败！", Toast.LENGTH_LONG).show(); + } + }); + + } + + + + + + + + ///省级接口 public void provices(final Context mContext) { HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); HttpClient.getInstance().get(HttpUrl.provinceUrl, new AsyncHttpResponseHandler() { @@ -304,17 +343,15 @@ public class HttpManager { ProvinceInfo provinceInfo = GsonTool.getPerson(new String(arg2), ProvinceInfo.class);//解析json数据 Log.e("test", "状态码" +provinceInfo.getStatus()); StringBuffer sb = new StringBuffer(); + StringBuffer sb1 = new StringBuffer(); for (int i =0 ; i