Commit c2f64dd6c945aebe8d7ee6b81d4dbefe190f0226
1 parent
4912f2ed51
Exists in
master
完善电子保卡
Showing
19 changed files
with
511 additions
and
72 deletions
Show diff stats
PersonalCenter/app/src/main/AndroidManifest.xml
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java
... | ... | @@ -0,0 +1,18 @@ |
1 | +package com.hjx.personalcenter.activity; | |
2 | + | |
3 | +import android.app.Activity; | |
4 | +import android.os.Bundle; | |
5 | + | |
6 | +import com.hjx.personalcenter.R; | |
7 | + | |
8 | +/** | |
9 | + * Created by h on 2017/8/9. | |
10 | + */ | |
11 | + | |
12 | +public class ChangeElectronicCardAdressInfoActivity extends Activity{ | |
13 | + @Override | |
14 | + protected void onCreate(Bundle savedInstanceState) { | |
15 | + super.onCreate(savedInstanceState); | |
16 | + setContentView(R.layout.activity_change_card_validation); | |
17 | + } | |
18 | +} | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java
... | ... | @@ -1,18 +0,0 @@ |
1 | -package com.hjx.personalcenter.activity; | |
2 | - | |
3 | -import android.app.Activity; | |
4 | -import android.os.Bundle; | |
5 | - | |
6 | -import com.hjx.personalcenter.R; | |
7 | - | |
8 | -/** | |
9 | - * Created by h on 2017/8/9. | |
10 | - */ | |
11 | - | |
12 | -public class ChangeElectronicCardInfoActivity extends Activity{ | |
13 | - @Override | |
14 | - protected void onCreate(Bundle savedInstanceState) { | |
15 | - super.onCreate(savedInstanceState); | |
16 | - setContentView(R.layout.activity_change_card_validation); | |
17 | - } | |
18 | -} |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
... | ... | @@ -4,6 +4,7 @@ import android.app.Activity; |
4 | 4 | import android.content.Intent; |
5 | 5 | import android.graphics.Color; |
6 | 6 | import android.os.Bundle; |
7 | +import android.text.TextUtils; | |
7 | 8 | import android.view.View; |
8 | 9 | import android.widget.Button; |
9 | 10 | import android.widget.EditText; |
... | ... | @@ -13,6 +14,8 @@ import android.widget.TextView; |
13 | 14 | |
14 | 15 | import com.bigkoo.pickerview.TimePickerView; |
15 | 16 | import com.hjx.personalcenter.R; |
17 | +import com.hjx.personalcenter.db.SaveParam; | |
18 | +import com.hjx.personalcenter.util.AlertUtils; | |
16 | 19 | |
17 | 20 | import java.text.SimpleDateFormat; |
18 | 21 | import java.util.Date; |
... | ... | @@ -111,19 +114,47 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC |
111 | 114 | pvTime.show(tv_buy_time);//弹出时间选择器,传递参数过去,回调的时候则可以绑定此view |
112 | 115 | break; |
113 | 116 | case R.id.btn_change_info: |
114 | - Intent intent = new Intent(); | |
115 | - intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class); | |
116 | - startActivity(intent); | |
117 | - overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
117 | + String info1 =username.getText().toString().trim(); | |
118 | + String info2 =adress_custem.getText().toString().trim(); | |
119 | + String info3 =detalAdress.getText().toString().trim(); | |
120 | + String info4 =tv_buy_time.getText().toString().trim(); | |
121 | + String info5 =adress_shop.getText().toString().trim(); | |
122 | + String info6 =store.getText().toString().trim(); | |
123 | + String info7 =telphone.getText().toString().trim(); | |
124 | + | |
125 | + if (TextUtils.isEmpty(info1) || TextUtils.isEmpty(info2)||TextUtils.isEmpty(info3) | |
126 | + ||TextUtils.isEmpty(info4)||TextUtils.isEmpty(info5)||TextUtils.isEmpty(info6) | |
127 | + ||TextUtils.isEmpty(info7)) { | |
128 | + AlertUtils.showToast(ElectronicCardEditInfoActivity.this, "所有内容不能为空。"); | |
129 | + return; | |
130 | + }else { | |
131 | + savedata(); | |
132 | + Intent intent = new Intent(); | |
133 | + intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class); | |
134 | + startActivity(intent); | |
135 | + overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
136 | + } | |
137 | + | |
118 | 138 | break; |
119 | 139 | case R.id.tv_edit_adress_shop: |
120 | 140 | |
141 | + adress_shop.setText("湖南省益阳市上河区"); | |
121 | 142 | break; |
122 | 143 | case R.id.tv_edit_adress_custem: |
144 | + adress_custem.setText("湖南省益阳市上河区"); | |
123 | 145 | break; |
124 | 146 | |
125 | 147 | } |
126 | 148 | |
127 | 149 | |
128 | 150 | } |
151 | + //保存数据 | |
152 | + private void savedata() { | |
153 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.CUNSTEMNAME, username.getText().toString().trim()); | |
154 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.ADRESSCUNSTEM, adress_custem.getText().toString().trim()+detalAdress.getText().toString().trim()); | |
155 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPTIME, tv_buy_time.getText().toString().trim()); | |
156 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPADRESS, adress_shop.getText().toString().trim()+store.getText().toString().trim()); | |
157 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.SHOPTLEPHONE, telphone.getText().toString().trim()); | |
158 | + | |
159 | + } | |
129 | 160 | } | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java
1 | 1 | package com.hjx.personalcenter.activity; |
2 | 2 | |
3 | 3 | import android.app.Activity; |
4 | -import android.content.Intent; | |
5 | 4 | import android.os.Bundle; |
6 | 5 | import android.view.View; |
7 | 6 | import android.widget.Button; |
... | ... | @@ -9,6 +8,8 @@ import android.widget.ImageView; |
9 | 8 | import android.widget.TextView; |
10 | 9 | |
11 | 10 | import com.hjx.personalcenter.R; |
11 | +import com.hjx.personalcenter.db.SaveParam; | |
12 | +import com.hjx.personalcenter.http.HttpManager; | |
12 | 13 | import com.hjx.personalcenter.util.GetDevicesUtil; |
13 | 14 | |
14 | 15 | /**确认保卡信息 |
... | ... | @@ -29,6 +30,7 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli |
29 | 30 | } |
30 | 31 | private void initView() { |
31 | 32 | btn_finish = (Button) findViewById(R.id.btn_finish); |
33 | + iv_last_step = (ImageView) findViewById(R.id.cancel); | |
32 | 34 | usename = (TextView) findViewById(R.id.iv_card_username); |
33 | 35 | deviceModel = (TextView) findViewById(R.id.tv_card_deviceModel); |
34 | 36 | customer_address = (TextView) findViewById(R.id.tv_card_adress); |
... | ... | @@ -46,10 +48,18 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli |
46 | 48 | deviceNumber.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceNumber()); |
47 | 49 | mac_adress.setText(GetDevicesUtil.getDevicesInfo(this).getMac()); |
48 | 50 | //获取保卡信息 |
51 | + usename.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CUNSTEMNAME)); | |
52 | + customer_address.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.ADRESSCUNSTEM)); | |
53 | + shoptime.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTIME)); | |
54 | + shopadress.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPADRESS)); | |
55 | + tlePhone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTLEPHONE)); | |
56 | + phone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CARDPHONE)); | |
57 | + | |
49 | 58 | |
50 | 59 | } |
51 | 60 | |
52 | 61 | private void initLister() { |
62 | + iv_last_step.setOnClickListener(this); | |
53 | 63 | btn_finish.setOnClickListener(this); |
54 | 64 | } |
55 | 65 | |
... | ... | @@ -57,11 +67,17 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli |
57 | 67 | public void onClick(View v) { |
58 | 68 | switch (v.getId()){ |
59 | 69 | case R.id.btn_finish: |
60 | - Intent intent = new Intent(); | |
61 | - intent.setClass(ElectronicCardInfoOKActivity.this,TheStartPageActivity.class); | |
62 | - startActivity(intent); | |
63 | - overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
70 | + HttpManager.getInstance().subcardinfo(this,636,usename.getText().toString().trim(), | |
71 | + customer_address.getText().toString().trim(),shopadress.getText().toString().trim(), | |
72 | + shoptime.getText().toString().trim(),tlePhone.getText().toString().trim(), | |
73 | + deviceModel.getText().toString().trim(),deviceNumber.getText().toString().trim(), | |
74 | + mac_adress.getText().toString().trim(),phone.getText().toString().trim()); | |
75 | + break; | |
76 | + case R.id.cancel: | |
77 | + finish(); | |
64 | 78 | break; |
65 | 79 | } |
66 | 80 | } |
81 | + | |
82 | + | |
67 | 83 | } | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java
1 | 1 | package com.hjx.personalcenter.activity; |
2 | 2 | |
3 | -import android.app.Activity; | |
3 | +import android.content.Intent; | |
4 | 4 | import android.os.Bundle; |
5 | +import android.support.v7.app.AppCompatActivity; | |
6 | +import android.view.View; | |
7 | +import android.widget.ImageView; | |
8 | +import android.widget.TextView; | |
5 | 9 | |
6 | 10 | import com.hjx.personalcenter.R; |
11 | +import com.hjx.personalcenter.db.Content; | |
12 | +import com.hjx.personalcenter.db.SaveParam; | |
13 | +import com.hjx.personalcenter.util.GetDevicesUtil; | |
7 | 14 | |
8 | 15 | /** |
9 | 16 | * Created by h on 2017/8/11. |
10 | 17 | */ |
11 | 18 | |
12 | -public class ElectronicCardLookInfoActivity extends Activity{ | |
19 | +public class ElectronicCardLookInfoActivity extends AppCompatActivity implements View.OnClickListener{ | |
20 | + private ImageView iv_last_step; | |
21 | + private TextView usename,deviceModel,customer_address,mac_adress,shoptime,deviceNumber, | |
22 | + shopadress,phone,tlePhone,tv_card_adress_change,tv_card_phone_change; | |
23 | + | |
13 | 24 | @Override |
14 | 25 | protected void onCreate(Bundle savedInstanceState) { |
15 | 26 | super.onCreate(savedInstanceState); |
16 | 27 | setContentView(R.layout.activity_electronic_look_cardinfo); |
28 | + initView(); | |
29 | + initData(); | |
30 | + initLister(); | |
31 | + } | |
32 | + private void initView() { | |
33 | + usename = (TextView) findViewById(R.id.iv_card_username); | |
34 | + iv_last_step = (ImageView) findViewById(R.id.cancel); | |
35 | + deviceModel = (TextView) findViewById(R.id.tv_card_deviceModel); | |
36 | + customer_address = (TextView) findViewById(R.id.tv_card_adress); | |
37 | + mac_adress = (TextView) findViewById(R.id.tv_card_mac); | |
38 | + shoptime = (TextView) findViewById(R.id.tv_card_time); | |
39 | + deviceNumber = (TextView) findViewById(R.id.tv_card_deviceNumber); | |
40 | + shopadress = (TextView) findViewById(R.id.tv_card_shopAdress); | |
41 | + phone = (TextView) findViewById(R.id.tv_card_phone); | |
42 | + tlePhone = (TextView) findViewById(R.id.tv_card_tleNember); | |
43 | + tv_card_adress_change = (TextView) findViewById(R.id.tv_card_adress_change); | |
44 | + tv_card_phone_change = (TextView) findViewById(R.id.tv_card_phone_change); | |
45 | + } | |
46 | + private void initData() { | |
47 | + //获取设备信息 | |
48 | + deviceModel.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceModel()); | |
49 | + deviceNumber.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceNumber()); | |
50 | + mac_adress.setText(GetDevicesUtil.getDevicesInfo(this).getMac()); | |
51 | + //获取保卡信息 | |
52 | + usename.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CUNSTEMNAME)); | |
53 | + customer_address.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.ADRESSCUNSTEM)); | |
54 | + shoptime.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTIME)); | |
55 | + shopadress.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPADRESS)); | |
56 | + tlePhone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.SHOPTLEPHONE)); | |
57 | + phone.setText(SaveParam.getInstance().getCustomizeParam(this,SaveParam.CARDPHONE)); | |
58 | + | |
59 | + | |
60 | + } | |
61 | + private void initLister() { | |
62 | + tv_card_adress_change.setOnClickListener(this); | |
63 | + tv_card_phone_change.setOnClickListener(this); | |
64 | + iv_last_step.setOnClickListener(this); | |
17 | 65 | } |
66 | + @Override | |
67 | + public void onClick(View v) { | |
68 | + switch (v.getId()){ | |
69 | + case R.id.tv_card_adress_change: | |
70 | + Intent intent = new Intent(); | |
71 | + intent.setClass(this,ChangeElectronicCardAdressInfoActivity.class); | |
72 | + startActivity(intent); | |
73 | + overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
74 | + | |
75 | + break; | |
76 | + case R.id.tv_card_phone_change: | |
77 | + Content.authcodeflag =2; | |
78 | + Intent intent1 = new Intent(); | |
79 | + intent1.setClass(this,ElectronicCardValidationActivity.class); | |
80 | + startActivity(intent1); | |
81 | + overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
82 | + | |
83 | + | |
84 | + break; | |
85 | + case R.id.cancel: | |
86 | + finish(); | |
87 | + break; | |
88 | + } | |
89 | + } | |
90 | + | |
18 | 91 | } | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
... | ... | @@ -3,17 +3,69 @@ package com.hjx.personalcenter.activity; |
3 | 3 | import android.app.Activity; |
4 | 4 | import android.content.Intent; |
5 | 5 | import android.os.Bundle; |
6 | +import android.os.Handler; | |
7 | +import android.os.Message; | |
8 | +import android.text.TextUtils; | |
6 | 9 | import android.view.View; |
7 | 10 | import android.widget.Button; |
11 | +import android.widget.EditText; | |
12 | +import android.widget.TextView; | |
8 | 13 | |
9 | 14 | import com.hjx.personalcenter.R; |
15 | +import com.hjx.personalcenter.db.Content; | |
16 | +import com.hjx.personalcenter.db.SaveParam; | |
17 | +import com.hjx.personalcenter.http.HttpCode; | |
18 | +import com.hjx.personalcenter.http.HttpManager; | |
19 | +import com.hjx.personalcenter.util.AlertUtils; | |
20 | +import com.hjx.personalcenter.util.PhoneNumCheckUtils; | |
21 | + | |
22 | +import org.json.JSONObject; | |
10 | 23 | |
11 | 24 | /** |
12 | 25 | * Created by h on 2017/8/9. |
13 | 26 | */ |
14 | 27 | |
15 | 28 | public class ElectronicCardValidationActivity extends Activity implements View.OnClickListener { |
16 | - private Button btn_card_valiyanzhen; | |
29 | + private Button btn_card_valiyanzhen,get_authcode; | |
30 | + private EditText phonenumber,anth_6num;//;//密码 | |
31 | + private TextView menu_title; | |
32 | + private int i = 0; | |
33 | + private Thread thread; | |
34 | + private String sourceStr ="android"; | |
35 | + private String typeStr = "register"; | |
36 | + String authcode = ""; | |
37 | + Handler handler = new Handler() { | |
38 | + @Override | |
39 | + public void handleMessage(Message msg) { | |
40 | + super.handleMessage(msg); | |
41 | + JSONObject jsonObject; | |
42 | + String status; | |
43 | + switch (msg.what) { | |
44 | + case HttpCode.AUTHCODE_SUCESS: | |
45 | + jsonObject = (JSONObject) msg.obj; | |
46 | + status = jsonObject.optString("status"); | |
47 | + authcode = jsonObject.optString("jsessionid"); | |
48 | + if (status.equals("100")) { | |
49 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "验证码发送成功"); | |
50 | + } | |
51 | + | |
52 | + break; | |
53 | + case HttpCode.AUTHCODE_FAIL: | |
54 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "验证码发送失败"); | |
55 | + break; | |
56 | + case 1: | |
57 | + get_authcode.setEnabled(false); | |
58 | + get_authcode.setClickable(false); | |
59 | + get_authcode.setText(Integer.toString(i--)+" s"); | |
60 | + if (i<=0){ | |
61 | + get_authcode.setEnabled(true); | |
62 | + get_authcode.setClickable(true); | |
63 | + get_authcode.setText("获取验证码"); | |
64 | + } | |
65 | + break; | |
66 | + } | |
67 | + } | |
68 | + }; | |
17 | 69 | @Override |
18 | 70 | protected void onCreate(Bundle savedInstanceState) { |
19 | 71 | super.onCreate(savedInstanceState); |
... | ... | @@ -25,13 +77,28 @@ public class ElectronicCardValidationActivity extends Activity implements View.O |
25 | 77 | |
26 | 78 | private void initView() { |
27 | 79 | btn_card_valiyanzhen = (Button) findViewById(R.id.btn_card_valiyanzhen); |
80 | + get_authcode = (Button) findViewById(R.id.btn_authcode); | |
81 | + anth_6num = (EditText) findViewById(R.id.et_authcode); | |
82 | + phonenumber = (EditText) findViewById(R.id.et_phonenumber); | |
83 | + menu_title = (TextView) findViewById(R.id.menu_title); | |
28 | 84 | } |
29 | 85 | |
30 | 86 | private void initData() { |
87 | + if (Content.authcodeflag==1){ | |
88 | + menu_title.setText("填写保卡信息"); | |
89 | + | |
90 | + }else if (Content.authcodeflag==2){ | |
91 | + menu_title.setText("修改保卡信息"); | |
92 | + }else { | |
93 | + menu_title.setText("更换绑定"); | |
94 | + } | |
95 | + | |
96 | + | |
31 | 97 | |
32 | 98 | } |
33 | 99 | |
34 | 100 | private void initLister() { |
101 | + get_authcode.setOnClickListener(this); | |
35 | 102 | btn_card_valiyanzhen.setOnClickListener(this); |
36 | 103 | |
37 | 104 | } |
... | ... | @@ -40,11 +107,77 @@ public class ElectronicCardValidationActivity extends Activity implements View.O |
40 | 107 | public void onClick(View v) { |
41 | 108 | switch (v.getId()){ |
42 | 109 | case R.id.btn_card_valiyanzhen: |
110 | + SaveParam.getInstance().saveCustomizeParam(this,SaveParam.CARDPHONE, phonenumber.getText().toString().trim()); | |
43 | 111 | Intent intent = new Intent(); |
44 | - intent.setClass(ElectronicCardValidationActivity.this,ElectronicCardEditInfoActivity.class); | |
112 | + intent.setClass(ElectronicCardValidationActivity.this, ElectronicCardEditInfoActivity.class); | |
45 | 113 | startActivity(intent); |
46 | 114 | overridePendingTransition(R.anim.rightin, R.anim.rightout); |
115 | + | |
116 | + String usernameStr = phonenumber.getText().toString().trim(); | |
117 | + String authcodeStr = anth_6num.getText().toString().trim(); | |
118 | + if (TextUtils.isEmpty(usernameStr) || TextUtils.isEmpty(authcodeStr)) { | |
119 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "手机号,和验证码不能为空"); | |
120 | + return; | |
121 | + } else if (!PhoneNumCheckUtils.isPhone(usernameStr)){ | |
122 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "手机号码输入错误"); | |
123 | + | |
124 | + }else if (!authcode.equals(authcodeStr)){ | |
125 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "您输入的验证码不正确"); | |
126 | + }else { | |
127 | + if (Content.authcodeflag==1){ | |
128 | + menu_title.setText("填写保卡信息"); | |
129 | + | |
130 | + }else if (Content.authcodeflag==2){ | |
131 | + //调用接口 | |
132 | + menu_title.setText("修改保卡信息"); | |
133 | + }else { | |
134 | + //修改手机号 | |
135 | + menu_title.setText("更换绑定"); | |
136 | + } | |
137 | +// SaveParam.getInstance().saveLoginParam(this,SaveParam.CARDPHONE, phonenumber.getText().toString().trim()); | |
138 | +// Intent intent = new Intent(); | |
139 | +// intent.setClass(ElectronicCardValidationActivity.this, ElectronicCardEditInfoActivity.class); | |
140 | +// startActivity(intent); | |
141 | +// overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
142 | + } | |
143 | + break; | |
144 | + case R.id.btn_authcode: | |
145 | + String usernameStr1 = phonenumber.getText().toString().trim(); | |
146 | + if (!PhoneNumCheckUtils.isPhone(usernameStr1)){ | |
147 | + AlertUtils.showToast(ElectronicCardValidationActivity.this, "请输入正确的手机号"); | |
148 | + }else { | |
149 | + anth_6num.requestFocus(); | |
150 | + HttpManager.getInstance().authCode(typeStr, usernameStr1, handler, ElectronicCardValidationActivity.this); | |
151 | + i = 60; | |
152 | + if(thread == null){ | |
153 | + thread = new Thread( new ThreadShow()); | |
154 | + thread.start(); | |
155 | + } | |
156 | + | |
157 | + } | |
158 | + | |
47 | 159 | break; |
48 | 160 | } |
49 | 161 | } |
162 | + // 线程类 定时器 | |
163 | + class ThreadShow implements Runnable { | |
164 | + | |
165 | + @Override | |
166 | + public void run() { | |
167 | + // TODO Auto-generated method stub | |
168 | + while (true) { | |
169 | + try { | |
170 | + Thread.sleep(1000); | |
171 | + Message msg = new Message(); | |
172 | + msg.what = 1; | |
173 | + handler.sendMessage(msg); | |
174 | + System.out.println("send..."); | |
175 | + } catch (Exception e) { | |
176 | + // TODO Auto-generated catch block | |
177 | + e.printStackTrace(); | |
178 | + System.out.println("thread error..."); | |
179 | + } | |
180 | + } | |
181 | + } | |
182 | + } | |
50 | 183 | } | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java
... | ... | @@ -112,7 +112,7 @@ public class ForgotPasswordActivity extends Activity implements View.OnClickList |
112 | 112 | //获取验证码 |
113 | 113 | private void getauthcode() { |
114 | 114 | forot_pwd_anthcode.requestFocus(); |
115 | - HttpManager.getInstance().forgetauthCode(typeStr, forot_pwd_phone1, handler, this); | |
115 | + HttpManager.getInstance().authCode(typeStr, forot_pwd_phone1, handler, this); | |
116 | 116 | i = 60; |
117 | 117 | if(thread == null){ |
118 | 118 | thread = new Thread( new ThreadShow()); | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java
... | ... | @@ -0,0 +1,85 @@ |
1 | +package com.hjx.personalcenter.customdialog; | |
2 | + | |
3 | +import android.content.Context; | |
4 | +import android.graphics.Color; | |
5 | +import android.os.Bundle; | |
6 | +import android.view.Gravity; | |
7 | +import android.view.LayoutInflater; | |
8 | +import android.view.View; | |
9 | +import android.view.ViewGroup; | |
10 | +import android.widget.AdapterView; | |
11 | +import android.widget.ArrayAdapter; | |
12 | +import android.widget.ListView; | |
13 | + | |
14 | +import com.hjx.personalcenter.R; | |
15 | +import com.hjx.personalcenter.db.SaveParam; | |
16 | +import com.hjx.personalcenter.http.HttpManager; | |
17 | +import com.mylhyl.circledialog.BaseCircleDialog; | |
18 | +import com.mylhyl.circledialog.res.values.CircleDimen; | |
19 | + | |
20 | +import java.util.ArrayList; | |
21 | + | |
22 | +/** | |
23 | + * 自定义年级列表对话框 | |
24 | + * Created by h on 2017/8/10. | |
25 | + */ | |
26 | + | |
27 | +public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener { | |
28 | + ArrayAdapter listadapter; | |
29 | + ListView listView; | |
30 | + ArrayList<String> data = new ArrayList<>(); | |
31 | + | |
32 | + public static CitysListDialog getInstance() { | |
33 | + CitysListDialog dialogFragment = new CitysListDialog(); | |
34 | + dialogFragment.setCanceledBack(true); | |
35 | + dialogFragment.setCanceledOnTouchOutside(true); | |
36 | + dialogFragment.setRadius(CircleDimen.RADIUS); | |
37 | + dialogFragment.setWidth(0.5f); | |
38 | + dialogFragment.setGravity(Gravity.CENTER); | |
39 | + dialogFragment.setBackgroundColor(Color.WHITE); | |
40 | + return dialogFragment; | |
41 | + } | |
42 | + | |
43 | + @Override | |
44 | + public View createView(Context context, LayoutInflater inflater, ViewGroup container) { | |
45 | + return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); | |
46 | + } | |
47 | + | |
48 | + @Override | |
49 | + public void onActivityCreated(Bundle savedInstanceState) { | |
50 | + super.onActivityCreated(savedInstanceState); | |
51 | + listView = (ListView) getView().findViewById(R.id.listadapter); | |
52 | + String provinces = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); | |
53 | + if (provinces != null) { | |
54 | + | |
55 | + for (int i = 0; i < provinces.split(",").length; i++) { | |
56 | + String[] itmt = provinces.split(","); | |
57 | + data.add(itmt[i] + "区"); | |
58 | + //data.add(i,provinces.replaceAll(",","省")); | |
59 | + | |
60 | + } | |
61 | + } else { | |
62 | + HttpManager.getInstance().provices(getActivity()); | |
63 | + } | |
64 | + | |
65 | + listadapter = new ArrayAdapter(getActivity(), R.layout.custom_adilog_list_item, R.id.list_items, data); | |
66 | + listView.setAdapter(listadapter); | |
67 | + listView.setOnItemClickListener(this); | |
68 | + | |
69 | + } | |
70 | + | |
71 | + @Override | |
72 | + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { | |
73 | + //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show(); | |
74 | + switch (position){ | |
75 | + | |
76 | + | |
77 | + | |
78 | + } | |
79 | + | |
80 | + | |
81 | + | |
82 | + dismiss(); | |
83 | + | |
84 | + } | |
85 | +} | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
... | ... | @@ -11,6 +11,7 @@ import android.view.ViewGroup; |
11 | 11 | |
12 | 12 | import com.hjx.personalcenter.R; |
13 | 13 | import com.hjx.personalcenter.activity.ElectronicCardValidationActivity; |
14 | +import com.hjx.personalcenter.db.Content; | |
14 | 15 | import com.mylhyl.circledialog.BaseCircleDialog; |
15 | 16 | import com.mylhyl.circledialog.res.values.CircleDimen; |
16 | 17 | |
... | ... | @@ -44,6 +45,7 @@ public class ElectronicCardDialog extends BaseCircleDialog { |
44 | 45 | // intent.setClass(getActivity(),TheStartPageActivity.class); |
45 | 46 | // startActivity(intent); |
46 | 47 | // getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); |
48 | + Content.authcodeflag =1; | |
47 | 49 | Intent intent = new Intent(); |
48 | 50 | intent.setClass(getActivity(),ElectronicCardValidationActivity.class); |
49 | 51 | startActivity(intent); | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java
... | ... | @@ -10,16 +10,17 @@ import android.view.ViewGroup; |
10 | 10 | import android.widget.AdapterView; |
11 | 11 | import android.widget.ArrayAdapter; |
12 | 12 | import android.widget.ListView; |
13 | -import android.widget.Toast; | |
14 | 13 | |
15 | 14 | import com.hjx.personalcenter.R; |
16 | 15 | import com.hjx.personalcenter.db.SaveParam; |
16 | +import com.hjx.personalcenter.http.HttpManager; | |
17 | 17 | import com.mylhyl.circledialog.BaseCircleDialog; |
18 | 18 | import com.mylhyl.circledialog.res.values.CircleDimen; |
19 | 19 | |
20 | 20 | import java.util.ArrayList; |
21 | 21 | |
22 | -/**自定义年级列表对话框 | |
22 | +/** | |
23 | + * 自定义年级列表对话框 | |
23 | 24 | * Created by h on 2017/8/10. |
24 | 25 | */ |
25 | 26 | |
... | ... | @@ -27,6 +28,7 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. |
27 | 28 | ArrayAdapter listadapter; |
28 | 29 | ListView listView; |
29 | 30 | ArrayList<String> data = new ArrayList<>(); |
31 | + | |
30 | 32 | public static ProvinceListDialog getInstance() { |
31 | 33 | ProvinceListDialog dialogFragment = new ProvinceListDialog(); |
32 | 34 | dialogFragment.setCanceledBack(true); |
... | ... | @@ -37,21 +39,30 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. |
37 | 39 | dialogFragment.setBackgroundColor(Color.WHITE); |
38 | 40 | return dialogFragment; |
39 | 41 | } |
42 | + | |
40 | 43 | @Override |
41 | 44 | public View createView(Context context, LayoutInflater inflater, ViewGroup container) { |
42 | 45 | return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); |
43 | 46 | } |
47 | + | |
44 | 48 | @Override |
45 | 49 | public void onActivityCreated(Bundle savedInstanceState) { |
46 | 50 | super.onActivityCreated(savedInstanceState); |
47 | 51 | listView = (ListView) getView().findViewById(R.id.listadapter); |
48 | - String ranging = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.PROVINCES); | |
49 | - for (int i =0 ; i<ranging.split(",").length;i++){ | |
50 | - data.add(i,ranging.replaceAll(",","省")); | |
52 | + String provinces = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.PROVINCES); | |
53 | + if (provinces != null) { | |
54 | + | |
55 | + for (int i = 0; i < provinces.split(",").length; i++) { | |
56 | + String[] itmt = provinces.split(","); | |
57 | + data.add(itmt[i] + "省"); | |
58 | + //data.add(i,provinces.replaceAll(",","省")); | |
51 | 59 | |
60 | + } | |
61 | + } else { | |
62 | + HttpManager.getInstance().provices(getActivity()); | |
52 | 63 | } |
53 | 64 | |
54 | - listadapter = new ArrayAdapter(getActivity(),R.layout.custom_adilog_list_item,R.id.list_items,data); | |
65 | + listadapter = new ArrayAdapter(getActivity(), R.layout.custom_adilog_list_item, R.id.list_items, data); | |
55 | 66 | listView.setAdapter(listadapter); |
56 | 67 | listView.setOnItemClickListener(this); |
57 | 68 | |
... | ... | @@ -59,7 +70,12 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView. |
59 | 70 | |
60 | 71 | @Override |
61 | 72 | public void onItemClick(AdapterView<?> parent, View view, int position, long id) { |
62 | - Toast.makeText(getActivity(),"你点击了第"+position+"个",Toast.LENGTH_LONG).show(); | |
73 | + //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show(); | |
74 | + switch (position){ | |
75 | + | |
76 | + } | |
77 | + | |
78 | + | |
63 | 79 | |
64 | 80 | dismiss(); |
65 | 81 | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/Content.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
... | ... | @@ -13,8 +13,18 @@ public class SaveParam { |
13 | 13 | } |
14 | 14 | return instance; |
15 | 15 | } |
16 | + //个人信息 | |
17 | + //电子保卡信息 | |
18 | + public static String CARDPHONE = "cardphone";//保卡手机号 | |
19 | + public static String CUNSTEMNAME = "cunstemname";//客户姓名 | |
20 | + public static String ADRESSCUNSTEM = "adresscunstem";//客户地址 | |
21 | + public static String SHOPTIME = "shoptime";//购买时间 | |
22 | + public static String SHOPADRESS = "shopadress";//购买地址 | |
23 | + public static String SHOPTLEPHONE = "shoptlephone";//售后电话 | |
24 | + | |
25 | + //省市区参数 | |
16 | 26 | public static String PROVINCES = "provinces";//省 |
17 | - public static String OBJECTIVE = "objective"; | |
27 | + public static String CITYS = "citys"; | |
18 | 28 | |
19 | 29 | |
20 | 30 | public void saveLoginParam(Context context,String spname, String spstr) { | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java
... | ... | @@ -18,6 +18,20 @@ public class HttpKey { |
18 | 18 | //修改密码 |
19 | 19 | public static String OLDPASS = "oldPass"; |
20 | 20 | public static String NEWPASS = "newPass"; |
21 | + //提交保卡 | |
22 | + public static String USEID = "userId"; | |
23 | + public static String CUSTOMENAME = "customerName"; | |
24 | + public static String CUSTOMADRESS = "customerAddress"; | |
25 | + public static String BUYADREES = "buyAddress"; | |
26 | + public static String BUYTIME = "buyTime"; | |
27 | + public static String ALTERSALECALL = "alterSaleCall"; | |
28 | + public static String PRODUCTMODEL = "productModel"; | |
29 | + public static String DEVICENUMBER = "deviceNumber"; | |
30 | + public static String MACADRESS = "macAddress"; | |
31 | + public static String MOBILPHONE = "customerPhone"; | |
32 | + | |
33 | + | |
34 | + | |
21 | 35 | |
22 | 36 | |
23 | 37 | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
... | ... | @@ -10,7 +10,9 @@ import android.util.Log; |
10 | 10 | import android.widget.Toast; |
11 | 11 | |
12 | 12 | import com.google.gson.Gson; |
13 | +import com.hjx.personalcenter.R; | |
13 | 14 | import com.hjx.personalcenter.activity.LoginAndRegisterActivity; |
15 | +import com.hjx.personalcenter.activity.TheStartPageActivity; | |
14 | 16 | import com.hjx.personalcenter.db.SaveParam; |
15 | 17 | import com.hjx.personalcenter.gson.GsonTool; |
16 | 18 | import com.hjx.personalcenter.model.CityInfo; |
... | ... | @@ -160,29 +162,6 @@ public class HttpManager { |
160 | 162 | }); |
161 | 163 | } |
162 | 164 | |
163 | - //验证码 | |
164 | - public void forgetauthCode(final String type, final String mobile, final Handler handler, final Context mContext) { | |
165 | - RequestParams params = new RequestParams(); | |
166 | - params.put("type", type); | |
167 | - params.put("mobile", mobile); | |
168 | - HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); | |
169 | - HttpClient.getInstance().post(HttpUrl.authCodedUrl, params, new JsonHttpResponseHandler() { | |
170 | - | |
171 | - @Override | |
172 | - public void onSuccess(int statusCode, Header[] headers, JSONObject response) { | |
173 | - Log.e("test", "onSuccess-----" + response); | |
174 | - Message msg = Message.obtain(); | |
175 | - msg.what = HttpCode.AUTHCODE_SUCESS1; | |
176 | - msg.obj = response; | |
177 | - handler.sendMessage(msg); | |
178 | - } | |
179 | - | |
180 | - @Override | |
181 | - public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { | |
182 | - Toast.makeText(mContext, "请检查网络。。" + errorResponse, Toast.LENGTH_LONG).show(); | |
183 | - } | |
184 | - }); | |
185 | - } | |
186 | 165 | |
187 | 166 | //手机号是否注册 |
188 | 167 | public void isregistered(final String mobile, final Handler handler, final Context mContext) { |
... | ... | @@ -294,7 +273,67 @@ public class HttpManager { |
294 | 273 | SaveParam.getInstance().saveLoginParam(context,"gender", gender); |
295 | 274 | SaveParam.getInstance().saveLoginParam(context,"mobilePortrait", mobilePortrait); |
296 | 275 | } |
297 | -///省级接口 | |
276 | + //提交保卡信息 | |
277 | + public void subcardinfo(final Context context, int userId, String customerName, String customerAddress, | |
278 | + String buyAddress,String buyTime,String alterSaleCall, | |
279 | + String productModel,String deviceNumber,String macAddress, | |
280 | + String mobilePhone) { | |
281 | + JSONObject params = new JSONObject(); | |
282 | + ByteArrayEntity entity = null; | |
283 | + try { | |
284 | + params.put(HttpKey.USEID, userId); | |
285 | + params.put(HttpKey.CUSTOMENAME, customerName); | |
286 | + params.put(HttpKey.CUSTOMADRESS, customerAddress); | |
287 | + params.put(HttpKey.BUYADREES, buyAddress); | |
288 | + params.put(HttpKey.BUYTIME, buyTime); | |
289 | + params.put(HttpKey.ALTERSALECALL, alterSaleCall); | |
290 | + params.put(HttpKey.PRODUCTMODEL, productModel); | |
291 | + params.put(HttpKey.DEVICENUMBER, deviceNumber); | |
292 | + params.put(HttpKey.MACADRESS, macAddress); | |
293 | + params.put(HttpKey.MOBILPHONE, mobilePhone); | |
294 | + entity = new ByteArrayEntity(params.toString().getBytes("UTF-8")); | |
295 | + entity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json")); | |
296 | + } catch (Exception e) { | |
297 | + e.printStackTrace(); | |
298 | + } | |
299 | + | |
300 | + HttpClient.getInstance().addHeader("Accept", "*/*"); | |
301 | + | |
302 | + Log.e("test", "params" + params); | |
303 | + HttpClient.getInstance().post(context,HttpUrl.subcardinfo, entity, "application/json", new JsonHttpResponseHandler() { | |
304 | + @Override | |
305 | + public void onSuccess(int statusCode, Header[] headers, JSONObject response) { | |
306 | + super.onSuccess(statusCode, headers, response); | |
307 | + String status = response.optString("status"); | |
308 | + if (status.equals("1")) { | |
309 | + Log.e("test", "onSuccess" +response); | |
310 | + Toast.makeText(context, "保卡绑定成功!", Toast.LENGTH_LONG).show(); | |
311 | + Intent intent = new Intent(); | |
312 | + intent.setClass((Activity) context,TheStartPageActivity.class); | |
313 | + ((Activity) context).startActivity(intent); | |
314 | + ((Activity) context).overridePendingTransition(R.anim.rightin, R.anim.rightout); | |
315 | + ((Activity) context).finish(); | |
316 | + } | |
317 | + | |
318 | + } | |
319 | + | |
320 | + @Override | |
321 | + public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { | |
322 | + super.onFailure(statusCode, headers, throwable, errorResponse); | |
323 | + Log.e("test", "onFailure" + (errorResponse)); | |
324 | + Toast.makeText(context, "保卡绑定失败!", Toast.LENGTH_LONG).show(); | |
325 | + } | |
326 | + }); | |
327 | + | |
328 | + } | |
329 | + | |
330 | + | |
331 | + | |
332 | + | |
333 | + | |
334 | + | |
335 | + | |
336 | + ///省级接口 | |
298 | 337 | public void provices(final Context mContext) { |
299 | 338 | HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); |
300 | 339 | HttpClient.getInstance().get(HttpUrl.provinceUrl, new AsyncHttpResponseHandler() { |
... | ... | @@ -304,17 +343,15 @@ public class HttpManager { |
304 | 343 | ProvinceInfo provinceInfo = GsonTool.getPerson(new String(arg2), ProvinceInfo.class);//解析json数据 |
305 | 344 | Log.e("test", "状态码" +provinceInfo.getStatus()); |
306 | 345 | StringBuffer sb = new StringBuffer(); |
346 | + StringBuffer sb1 = new StringBuffer(); | |
307 | 347 | for (int i =0 ; i<provinceInfo.getProvinces().size();i++){ |
308 | - Log.e("test", "省" +provinceInfo.getProvinces().get(i) | |
309 | - .getParentId()); | |
310 | - Log.e("test", "省" +provinceInfo.getProvinces().get(i) | |
311 | - .getRegionId()); | |
312 | - Log.e("test", "省" +provinceInfo.getProvinces().get(i).getRegionName()); | |
313 | 348 | sb.append(provinceInfo.getProvinces().get(i).getRegionName()+","); |
349 | + sb1.append(provinceInfo.getProvinces().get(i).getRegionId()+","); | |
314 | 350 | |
315 | 351 | } |
316 | 352 | Log.e("test", "省" +sb.toString()); |
317 | - SaveParam.getInstance().saveCustomizeParam(mContext,SaveParam.PROVINCES, "" + sb.toString()); | |
353 | + SaveParam.getInstance().saveLoginParam(mContext,SaveParam.PROVINCES, "" + sb.toString()); | |
354 | + SaveParam.getInstance().saveLoginParam(mContext,SaveParam.CITYS, sb1.toString()); | |
318 | 355 | |
319 | 356 | |
320 | 357 | } | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java
... | ... | @@ -20,5 +20,6 @@ public class HttpUrl { |
20 | 20 | public static String authCodedUrl=GetDomain()+"/ozing/timer/user/fetchAuthCode";//验证码 |
21 | 21 | public static String isRegiterUrl=GetDomain()+"/ozing/timer/user/registered";//手机号是否注册 |
22 | 22 | public static String changepassword=GetDomain()+"/ozing/timer/user/changepassword";//修改密码 |
23 | + public static String subcardinfo=GetDomain()+"/electronicCard/addCustomer";//提交保卡信息 | |
23 | 24 | |
24 | 25 | } | ... | ... |
PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
... | ... | @@ -83,6 +83,7 @@ |
83 | 83 | android:textSize="22sp" /> |
84 | 84 | |
85 | 85 | <TextView |
86 | + android:id="@+id/iv_card_username" | |
86 | 87 | android:layout_width="wrap_content" |
87 | 88 | android:layout_height="wrap_content" |
88 | 89 | android:layout_marginLeft="60dp" |
... | ... | @@ -115,6 +116,7 @@ |
115 | 116 | android:textSize="22sp" /> |
116 | 117 | |
117 | 118 | <TextView |
119 | + android:id="@+id/tv_card_deviceModel" | |
118 | 120 | android:layout_width="wrap_content" |
119 | 121 | android:layout_height="wrap_content" |
120 | 122 | android:layout_marginLeft="50dp" |
... | ... | @@ -138,6 +140,7 @@ |
138 | 140 | android:textSize="22sp" /> |
139 | 141 | |
140 | 142 | <TextView |
143 | + android:id="@+id/tv_card_adress" | |
141 | 144 | android:layout_width="wrap_content" |
142 | 145 | android:layout_height="wrap_content" |
143 | 146 | android:layout_marginLeft="60dp" |
... | ... | @@ -145,6 +148,7 @@ |
145 | 148 | android:text="北京市昭阳区三里屯" |
146 | 149 | android:textSize="22sp" /> |
147 | 150 | <TextView |
151 | + android:id="@+id/tv_card_adress_change" | |
148 | 152 | android:layout_width="wrap_content" |
149 | 153 | android:layout_height="wrap_content" |
150 | 154 | android:layout_marginLeft="18dp" |
... | ... | @@ -180,6 +184,7 @@ |
180 | 184 | android:textSize="22sp" /> |
181 | 185 | |
182 | 186 | <TextView |
187 | + android:id="@+id/tv_card_mac" | |
183 | 188 | android:layout_width="wrap_content" |
184 | 189 | android:layout_height="wrap_content" |
185 | 190 | android:layout_marginLeft="50dp" |
... | ... | @@ -204,6 +209,7 @@ |
204 | 209 | android:textSize="22sp" /> |
205 | 210 | |
206 | 211 | <TextView |
212 | + android:id="@+id/tv_card_time" | |
207 | 213 | android:layout_width="wrap_content" |
208 | 214 | android:layout_height="wrap_content" |
209 | 215 | android:layout_marginLeft="60dp" |
... | ... | @@ -236,6 +242,7 @@ |
236 | 242 | android:textSize="22sp" /> |
237 | 243 | |
238 | 244 | <TextView |
245 | + android:id="@+id/tv_card_deviceNumber" | |
239 | 246 | android:layout_width="wrap_content" |
240 | 247 | android:layout_height="wrap_content" |
241 | 248 | android:layout_marginLeft="50dp" |
... | ... | @@ -252,6 +259,7 @@ |
252 | 259 | android:gravity="center_vertical"> |
253 | 260 | |
254 | 261 | <TextView |
262 | + android:id="@+id/tv_card_shopAdress" | |
255 | 263 | android:layout_width="wrap_content" |
256 | 264 | android:layout_height="wrap_content" |
257 | 265 | android:text="购买地址" |
... | ... | @@ -291,12 +299,14 @@ |
291 | 299 | android:textSize="22sp" /> |
292 | 300 | |
293 | 301 | <TextView |
302 | + android:id="@+id/tv_card_phone" | |
294 | 303 | android:layout_width="wrap_content" |
295 | 304 | android:layout_height="wrap_content" |
296 | 305 | android:layout_marginLeft="50dp" |
297 | 306 | android:text="IPone888" |
298 | 307 | android:textSize="22sp" /> |
299 | 308 | <TextView |
309 | + android:id="@+id/tv_card_phone_change" | |
300 | 310 | android:layout_width="wrap_content" |
301 | 311 | android:layout_height="wrap_content" |
302 | 312 | android:layout_marginLeft="18dp" |
... | ... | @@ -324,6 +334,7 @@ |
324 | 334 | android:textSize="22sp" /> |
325 | 335 | |
326 | 336 | <TextView |
337 | + android:id="@+id/tv_card_tleNember" | |
327 | 338 | android:layout_width="wrap_content" |
328 | 339 | android:layout_height="wrap_content" |
329 | 340 | android:layout_marginLeft="60dp" | ... | ... |
PersonalCenter/app/src/main/res/layout/activity_electroniccard_validation.xml
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 | android:layout_width="wrap_content" |
26 | 26 | android:layout_height="wrap_content" |
27 | 27 | android:layout_centerInParent="true" |
28 | - android:text="@string/string_electroniccard_info_change" | |
28 | + android:text="@string/string_electroniccard_info_title" | |
29 | 29 | android:textColor="@android:color/white" |
30 | 30 | android:textSize="22sp" /> |
31 | 31 | </RelativeLayout> | ... | ... |