Browse Source

2.20个人资料

小狼 5 years ago
parent
commit
5ff7020bbe
35 changed files with 252 additions and 80 deletions
  1. 6 1
      app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/DetailActivity.java
  2. 78 15
      app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyBankConver.java
  3. 63 4
      app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyLinkManActivity.java
  4. 9 8
      app/src/main/res/layout/activity_identity_card.xml
  5. 76 32
      app/src/main/res/layout/activity_my_bank_conver.xml
  6. 10 11
      app/src/main/res/layout/activity_my_datum.xml
  7. 9 8
      app/src/main/res/layout/activity_my_link_man.xml
  8. 1 1
      app/src/main/res/layout/activity_pay_edit.xml
  9. BIN
      app/src/main/res/mipmap-xhdpi/address_man.png
  10. BIN
      app/src/main/res/mipmap-xhdpi/animore.png
  11. BIN
      app/src/main/res/mipmap-xhdpi/icon_fan.png
  12. BIN
      app/src/main/res/mipmap-xhdpi/icon_zheng.png
  13. BIN
      app/src/main/res/mipmap-xhdpi/idmycord.png
  14. BIN
      app/src/main/res/mipmap-xhdpi/mybankicon.png
  15. BIN
      app/src/main/res/mipmap-xhdpi/pay_zhiicon.png
  16. BIN
      app/src/main/res/mipmap-xhdpi/scan_icon.png
  17. BIN
      app/src/main/res/mipmap-xhdpi/sos_man.png
  18. BIN
      app/src/main/res/mipmap-xxhdpi/address_man.png
  19. BIN
      app/src/main/res/mipmap-xxhdpi/animore.png
  20. BIN
      app/src/main/res/mipmap-xxhdpi/icon_fan.png
  21. BIN
      app/src/main/res/mipmap-xxhdpi/icon_zheng.png
  22. BIN
      app/src/main/res/mipmap-xxhdpi/idmycord.png
  23. BIN
      app/src/main/res/mipmap-xxhdpi/mybankicon.png
  24. BIN
      app/src/main/res/mipmap-xxhdpi/pay_zhiicon.png
  25. BIN
      app/src/main/res/mipmap-xxhdpi/scan_icon.png
  26. BIN
      app/src/main/res/mipmap-xxhdpi/sos_man.png
  27. BIN
      app/src/main/res/mipmap-xxxhdpi/address_man.png
  28. BIN
      app/src/main/res/mipmap-xxxhdpi/animore.png
  29. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_fan.png
  30. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_zheng.png
  31. BIN
      app/src/main/res/mipmap-xxxhdpi/idmycord.png
  32. BIN
      app/src/main/res/mipmap-xxxhdpi/mybankicon.png
  33. BIN
      app/src/main/res/mipmap-xxxhdpi/pay_zhiicon.png
  34. BIN
      app/src/main/res/mipmap-xxxhdpi/scan_icon.png
  35. BIN
      app/src/main/res/mipmap-xxxhdpi/sos_man.png

+ 6 - 1
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/DetailActivity.java

@@ -707,6 +707,9 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
707 707
                     if (!TextUtils.isEmpty(trim)) {
708 708
                         if (product.getShow_day().equals("参考日利率")) {
709 709
                             double c = Double.parseDouble(product.getDay_rate());
710
+                            if(s1.substring(s1.length()-1,s1.length()).equals("月")){
711
+                                v2=v2*30;
712
+                            }
710 713
                             double ben = v1 + v1 * v2 * c / 100;
711 714
                             double v3 = v1 * v2 * c / 100;
712 715
                             contver.setText(String.format("%.2f", v3));
@@ -754,7 +757,9 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
754 757
             double b = Double.parseDouble(product.getLoan_period().get(pos).getK());
755 758
             if (product.getShow_day().equals("参考日利率")) {
756 759
                 double c = Double.parseDouble(product.getDay_rate());
757
-
760
+                if(s.substring(s.length()-1,s.length()).equals("月")){
761
+                    b=b*30;
762
+                }
758 763
                 double ben = a + b * c * a / 100;
759 764
                 double v = b * c * a / 100;
760 765
                 contver.setText(String.format("%.2f", v));

+ 78 - 15
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyBankConver.java

@@ -1,14 +1,19 @@
1 1
 package com.smileflowpig.money.moneyplatfrom.activities;
2 2
 
3 3
 import android.app.Activity;
4
+import android.content.Context;
4 5
 import android.content.Intent;
6
+import android.graphics.Color;
5 7
 import android.support.v7.app.AppCompatActivity;
6 8
 import android.os.Bundle;
9
+import android.telephony.PhoneNumberUtils;
7 10
 import android.text.Editable;
8 11
 import android.text.TextUtils;
9 12
 import android.text.TextWatcher;
10 13
 import android.view.View;
14
+import android.view.inputmethod.InputMethodManager;
11 15
 import android.widget.EditText;
16
+import android.widget.ImageView;
12 17
 import android.widget.LinearLayout;
13 18
 import android.widget.TextView;
14 19
 import android.widget.Toast;
@@ -20,12 +25,19 @@ import com.baidu.ocr.sdk.model.BankCardParams;
20 25
 import com.baidu.ocr.sdk.model.BankCardResult;
21 26
 import com.baidu.ocr.sdk.model.IDCardParams;
22 27
 import com.baidu.ocr.ui.camera.CameraActivity;
28
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
29
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
30
+import com.bigkoo.pickerview.view.OptionsPickerView;
23 31
 import com.smileflowpig.money.R;
24 32
 import com.smileflowpig.money.common.app.PresenterActivity;
25 33
 import com.smileflowpig.money.common.factory.presenter.BaseContract;
26 34
 import com.smileflowpig.money.moneyplatfrom.util.FileUtil;
27 35
 
28 36
 import java.io.File;
37
+import java.util.ArrayList;
38
+import java.util.List;
39
+import java.util.regex.Matcher;
40
+import java.util.regex.Pattern;
29 41
 
30 42
 import butterknife.BindView;
31 43
 
@@ -37,19 +49,24 @@ public class MyBankConver extends PresenterActivity implements View.OnClickListe
37 49
     EditText name;
38 50
     @BindView(R.id.cord_edit)
39 51
     EditText cord;
40
-    @BindView(R.id.getshort)
41
-    TextView getshort;
52
+    @BindView(R.id.bank_phone)
53
+    EditText bankphone;
42 54
     @BindView(R.id.overget)
43 55
     TextView overget;
56
+    @BindView(R.id.scan)
57
+    ImageView scan;
58
+
44 59
 
45 60
     private int REQUEST_CODE_CAMERB=101;
61
+    private int dayPosition = -1;
46 62
     @Override
47 63
     protected void onCreate(Bundle savedInstanceState) {
48 64
         super.onCreate(savedInstanceState);
49 65
 
50
-        getshort.setOnClickListener(this);
51 66
         back.setOnClickListener(this);
52 67
         overget.setOnClickListener(this);
68
+        scan.setOnClickListener(this);
69
+
53 70
 
54 71
         name.addTextChangedListener(new TextWatcher() {
55 72
             @Override
@@ -85,6 +102,22 @@ public class MyBankConver extends PresenterActivity implements View.OnClickListe
85 102
                 changedata();
86 103
             }
87 104
         });
105
+        bankphone.addTextChangedListener(new TextWatcher() {
106
+            @Override
107
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
108
+
109
+            }
110
+
111
+            @Override
112
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
113
+
114
+            }
115
+
116
+            @Override
117
+            public void afterTextChanged(Editable s) {
118
+                changedata();
119
+            }
120
+        });
88 121
 
89 122
     }
90 123
 
@@ -101,30 +134,59 @@ public class MyBankConver extends PresenterActivity implements View.OnClickListe
101 134
     @Override
102 135
     public void onClick(View v) {
103 136
         switch (v.getId()){
104
-            case R.id.getshort:
105
-                Intent intent = new Intent(MyBankConver.this, CameraActivity.class);
106
-                intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH,
107
-                       FileUtil.getGivFile(getApplication()).getAbsolutePath());
108
-                intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_BANK_CARD);
109
-                startActivityForResult(intent, REQUEST_CODE_CAMERB);
110
-                break;
137
+
111 138
             case R.id.back:
139
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
140
+                imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
112 141
                 finish();
113 142
                 break;
114 143
             case R.id.overget:
115 144
                 String s = name.getText().toString();
116 145
                 String s1 = cord.getText().toString();
146
+                String s2 = bankphone.getText().toString();
117 147
                 if(!TextUtils.isEmpty(s)&&!TextUtils.isEmpty(s1)){
118
-                    if(s1.length()==16){
148
+
149
+                    if(s1.length()==16&&isPhoneNumber(s2)){
119 150
                         //进行提交信息
120 151
                         Toast.makeText(MyBankConver.this,"提交到服务器",Toast.LENGTH_SHORT).show();
121
-                    }else {
122
-                        Toast.makeText(MyBankConver.this,"银行卡号码有误",Toast.LENGTH_SHORT).show();
123
-                    }
152
+                    }else if(!isPhoneNumber(s2)){
153
+                        Toast.makeText(MyBankConver.this,"手机号码有误",Toast.LENGTH_SHORT).show();
154
+                    }else if(s1.length()!=16){
155
+                            Toast.makeText(MyBankConver.this,"银行卡号码有误",Toast.LENGTH_SHORT).show();
156
+
157
+                        }
124 158
                 }
125 159
                 break;
160
+            case R.id.scan:
161
+                Intent intent = new Intent(MyBankConver.this, CameraActivity.class);
162
+                intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH,
163
+                        FileUtil.getGivFile(getApplication()).getAbsolutePath());
164
+                intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_BANK_CARD);
165
+                startActivityForResult(intent, REQUEST_CODE_CAMERB);
166
+                break;
167
+
126 168
         }
127 169
     }
170
+    public static boolean isPhoneNumber(String phoneNo) {
171
+        if (TextUtils.isEmpty(phoneNo)) {
172
+            return false;
173
+        }
174
+        if (phoneNo.length() == 11) {
175
+            for (int i = 0; i < 11; i++) {
176
+                if (!PhoneNumberUtils.isISODigit(phoneNo.charAt(i))) {
177
+                    return false;
178
+                }
179
+            }
180
+            Pattern p = Pattern.compile("^((13[^4,\\D])" + "|(134[^9,\\D])" +
181
+                    "|(14[5,7])" +
182
+                    "|(15[^4,\\D])" +
183
+                    "|(17[3,6-8])" +
184
+                    "|(18[0-9]))\\d{8}$");
185
+            Matcher m = p.matcher(phoneNo);
186
+            return m.matches();
187
+        }
188
+        return false;
189
+    }
128 190
 
129 191
     @Override
130 192
     protected BaseContract.Presenter initPresenter() {
@@ -176,7 +238,7 @@ public class MyBankConver extends PresenterActivity implements View.OnClickListe
176 238
     }
177 239
     private void changedata() {
178 240
 
179
-        if (TextUtils.isEmpty(name.getText().toString()) || TextUtils.isEmpty(cord.getText().toString())) {
241
+        if (TextUtils.isEmpty(name.getText().toString()) || TextUtils.isEmpty(cord.getText().toString())|| TextUtils.isEmpty(bankphone.getText().toString())) {
180 242
             //不可点击确认
181 243
             overget.setClickable(false);
182 244
             overget.setBackground(getResources().getDrawable(R.drawable.buttonnoshap));
@@ -186,4 +248,5 @@ public class MyBankConver extends PresenterActivity implements View.OnClickListe
186 248
         }
187 249
 
188 250
     }
251
+
189 252
 }

+ 63 - 4
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MyLinkManActivity.java

@@ -1,9 +1,11 @@
1 1
 package com.smileflowpig.money.moneyplatfrom.activities;
2 2
 
3 3
 import android.content.ContentResolver;
4
+import android.content.Context;
4 5
 import android.content.DialogInterface;
5 6
 import android.content.Intent;
6 7
 import android.database.Cursor;
8
+import android.graphics.Color;
7 9
 import android.net.Uri;
8 10
 import android.provider.ContactsContract;
9 11
 import android.support.v7.app.AlertDialog;
@@ -14,6 +16,7 @@ import android.view.Gravity;
14 16
 import android.view.LayoutInflater;
15 17
 import android.view.View;
16 18
 import android.view.WindowManager;
19
+import android.view.inputmethod.InputMethodManager;
17 20
 import android.widget.EditText;
18 21
 import android.widget.ImageView;
19 22
 import android.widget.LinearLayout;
@@ -22,11 +25,17 @@ import android.widget.RelativeLayout;
22 25
 import android.widget.TextView;
23 26
 import android.widget.Toast;
24 27
 
28
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
29
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
30
+import com.bigkoo.pickerview.view.OptionsPickerView;
25 31
 import com.smileflowpig.money.R;
26 32
 import com.smileflowpig.money.common.app.PresenterActivity;
27 33
 import com.smileflowpig.money.common.factory.presenter.BaseContract;
28 34
 import com.smileflowpig.money.common.utils.DisplayUtil;
29 35
 
36
+import java.util.ArrayList;
37
+import java.util.List;
38
+
30 39
 import butterknife.BindView;
31 40
 
32 41
 public class MyLinkManActivity extends PresenterActivity implements View.OnClickListener {
@@ -58,7 +67,7 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
58 67
     @BindView(R.id.back)
59 68
     LinearLayout back;
60 69
     private AlertDialog alertDialog2;
61
-
70
+    private int dayPosition = -1;
62 71
     @Override
63 72
     protected void onCreate(Bundle savedInstanceState) {
64 73
         super.onCreate(savedInstanceState);
@@ -98,12 +107,16 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
98 107
                 startActivityForResult(intent2, 1);
99 108
                 break;
100 109
             case R.id.mytalka:
101
-                showSingleAlertDialog("one");
110
+                chooseTixinData("one");
111
+                //showSingleAlertDialog("one");
102 112
                 break;
103 113
             case R.id.mytalkb:
104
-                showSingleAlertDialog("two");
114
+                chooseTixinData("two");
115
+                //showSingleAlertDialog("two");
105 116
                 break;
106 117
             case R.id.back:
118
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
119
+                imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
107 120
                 finish();
108 121
                 break;
109 122
             case R.id.overget:
@@ -151,8 +164,10 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
151 164
 
152 165
                 if(str.equals("one")){
153 166
                     linktalka.setText("父母");
167
+                    linktalka.setTextColor(Color.parseColor("#333333"));
154 168
                 }else {
155 169
                     linktalkb.setText("父母");
170
+                    linktalkb.setTextColor(Color.parseColor("#333333"));
156 171
                 }
157 172
                 popupWindow.dismiss();
158 173
             }
@@ -162,8 +177,10 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
162 177
             public void onClick(View v) {
163 178
                 if(str.equals("one")){
164 179
                     linktalka.setText("配偶");
180
+                    linktalka.setTextColor(Color.parseColor("#333333"));
165 181
                 }else {
166 182
                     linktalkb.setText("配偶");
183
+                    linktalkb.setTextColor(Color.parseColor("#333333"));
167 184
                 }
168 185
                 popupWindow.dismiss();
169 186
             }
@@ -173,14 +190,56 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
173 190
             public void onClick(View v) {
174 191
                 if(str.equals("one")){
175 192
                     linktalka.setText("朋友");
193
+                    linktalka.setTextColor(Color.parseColor("#333333"));
176 194
                 }else {
177 195
                     linktalkb.setText("朋友");
196
+                    linktalkb.setTextColor(Color.parseColor("#333333"));
178 197
                 }
179 198
                 popupWindow.dismiss();
180 199
             }
181 200
         });
182 201
 
183 202
     }
203
+    private void chooseTixinData(final String str) {
204
+
205
+        final List<String> optionsitem2 = new ArrayList<>();
206
+        optionsitem2.add("父母");
207
+        optionsitem2.add("配偶");
208
+        optionsitem2.add("朋友");
209
+        optionsitem2.add("同事");
210
+        optionsitem2.add("其他");
211
+
212
+        OptionsPickerView optionsPickerView = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
213
+            @Override
214
+            public void onOptionsSelect(int i, int i1, int i2, View view) {
215
+
216
+                //提醒时间
217
+                String tixing_data = optionsitem2.get(i);
218
+                dayPosition = i + 1;
219
+                if(str.equals("one")){
220
+                    linktalka.setText(tixing_data);
221
+                    linktalka.setTextColor(Color.parseColor("#333333"));
222
+                }else {
223
+                    linktalkb.setText(tixing_data);
224
+                    linktalkb.setTextColor(Color.parseColor("#333333"));
225
+                }
226
+
227
+
228
+
229
+            }
230
+        }).setSubmitText("确定")//确定按钮文字
231
+                .setCancelText("取消")//取消按钮文字
232
+                .setTitleText("关系选择")//标题
233
+                .setTitleColor(Color.BLACK)
234
+                .setSubmitColor(Color.parseColor("#FF4F4F4E"))
235
+                .setCancelColor(Color.parseColor("#333333"))
236
+                .setOutSideCancelable(false)//点击外部dismiss default true
237
+                .isRestoreItem(true).build();//切换时是否还原,设置默认选中第一项。
238
+        optionsPickerView.setPicker(optionsitem2);
239
+        optionsPickerView.show();
240
+
241
+
242
+    }
184 243
     public void light(float t) {
185 244
         WindowManager.LayoutParams lp = getWindow().getAttributes();
186 245
         lp.alpha = t;
@@ -244,7 +303,7 @@ public class MyLinkManActivity extends PresenterActivity implements View.OnClick
244 303
             cursor.close();
245 304
         }
246 305
         else
247
-        {
306
+            {
248 307
             return null;
249 308
         }
250 309
         return contact;

+ 9 - 8
app/src/main/res/layout/activity_identity_card.xml

@@ -40,6 +40,7 @@
40 40
             android:text="身份信息"
41 41
             android:textColor="#000000"
42 42
             android:textSize="@dimen/font_16"
43
+            android:textStyle="bold"
43 44
             />
44 45
 
45 46
 
@@ -55,9 +56,9 @@
55 56
         android:gravity="center"
56 57
         >
57 58
         <ImageView
58
-            android:layout_width="15dp"
59
-            android:layout_height="15dp"
60
-            android:src="@mipmap/remindcont"
59
+            android:layout_width="10px"
60
+            android:layout_height="15px"
61
+            android:src="@mipmap/animore"
61 62
             />
62 63
         <TextView
63 64
             android:layout_width="wrap_content"
@@ -65,7 +66,7 @@
65 66
             android:text="请输入您本人的身份证信息,提交后将不能更改"
66 67
             android:textSize="12px"
67 68
             android:textColor="#F65353"
68
-            android:layout_marginLeft="10px"
69
+            android:layout_marginLeft="7px"
69 70
             />
70 71
     </LinearLayout>
71 72
 
@@ -74,7 +75,7 @@
74 75
         android:layout_height="wrap_content"
75 76
         android:text="基本资料"
76 77
         android:textSize="16px"
77
-        android:textColor="#FF5F00"
78
+        android:textColor="#000000"
78 79
         android:layout_marginLeft="16px"
79 80
         android:layout_marginTop="12px"
80 81
         />
@@ -116,14 +117,14 @@
116 117
                     android:id="@+id/idcard_front"
117 118
                     android:layout_width="64px"
118 119
                     android:layout_height="46px"
119
-                    android:src="@mipmap/ic_flowpig"
120
+                    android:src="@mipmap/icon_zheng"
120 121
                     android:scaleType="fitXY"
121 122
                     />
122 123
                 <ImageView
123 124
                     android:id="@+id/idcard_reverse"
124 125
                     android:layout_width="64px"
125 126
                     android:layout_height="46px"
126
-                    android:src="@mipmap/ic_flowpig"
127
+                    android:src="@mipmap/icon_fan"
127 128
                     android:scaleType="fitXY"
128 129
                     android:layout_marginLeft="24px"
129 130
                     />
@@ -166,7 +167,7 @@
166 167
             android:gravity="center_vertical|right"
167 168
             android:background="@null"
168 169
             android:singleLine="true"
169
-            android:imeOptions="actionNext"
170
+            android:imeOptions="actionDone"
170 171
             />
171 172
 
172 173
 

+ 76 - 32
app/src/main/res/layout/activity_my_bank_conver.xml

@@ -37,8 +37,9 @@
37 37
             android:layout_height="wrap_content"
38 38
             android:layout_centerInParent="true"
39 39
             android:layout_gravity="center"
40
-            android:text="银行卡信息"
40
+            android:text="添加借记卡"
41 41
             android:textColor="#000000"
42
+            android:textStyle="bold"
42 43
             android:textSize="@dimen/font_16"
43 44
             />
44 45
 
@@ -55,26 +56,35 @@
55 56
         android:gravity="center"
56 57
         >
57 58
         <ImageView
58
-            android:layout_width="15dp"
59
-            android:layout_height="15dp"
60
-            android:src="@mipmap/remindcont"
59
+            android:layout_width="10px"
60
+            android:layout_height="15px"
61
+            android:src="@mipmap/animore"
61 62
             />
62 63
         <TextView
63 64
             android:layout_width="wrap_content"
64 65
             android:layout_height="wrap_content"
65
-            android:text="请输入您本人的银行卡信息,提交后将不能更改"
66
+            android:text="添加一张收钱的借记卡,至关重要"
66 67
             android:textSize="12px"
67 68
             android:textColor="#F65353"
68
-            android:layout_marginLeft="10px"
69
+            android:layout_marginLeft="7px"
69 70
             />
70 71
     </LinearLayout>
71 72
 
73
+    <TextView
74
+        android:layout_width="355px"
75
+        android:layout_height="wrap_content"
76
+        android:text="借记卡"
77
+        android:textSize="16px"
78
+        android:textColor="#FF5F00"
79
+        android:layout_marginLeft="16px"
80
+        android:layout_marginTop="12px"
81
+        />
72 82
     <LinearLayout
73 83
         android:layout_width="355px"
74 84
         android:layout_height="wrap_content"
75 85
         android:orientation="vertical"
76 86
         android:gravity="center_horizontal"
77
-        android:layout_marginTop="20px"
87
+        android:layout_marginTop="10px"
78 88
         >
79 89
 
80 90
         <RelativeLayout
@@ -88,7 +98,57 @@
88 98
             <TextView
89 99
                 android:layout_width="wrap_content"
90 100
                 android:layout_height="match_parent"
91
-                android:text="所属银行  "
101
+                android:text="卡号  "
102
+                android:textColor="#444444"
103
+                android:gravity="center"
104
+                android:textSize="15px"
105
+                />
106
+            <EditText
107
+                android:id="@+id/cord_edit"
108
+                android:layout_width="wrap_content"
109
+                android:layout_height="match_parent"
110
+                android:textSize="15px"
111
+                android:textColor="#444444"
112
+                android:textColorHint="#cccccc"
113
+                android:hint="扫描卡或直接输入"
114
+                android:layout_alignParentRight="true"
115
+                android:gravity="center_vertical|right"
116
+                android:background="@null"
117
+                android:inputType="number"
118
+                android:maxLength="16"
119
+                android:singleLine="true"
120
+                android:imeOptions="actionDone"
121
+                android:layout_marginRight="25px"
122
+                />
123
+            <ImageView
124
+                android:id="@+id/scan"
125
+                android:layout_width="20px"
126
+                android:layout_height="20px"
127
+                android:layout_alignParentRight="true"
128
+                android:layout_centerVertical="true"
129
+                android:src="@mipmap/scan_icon"
130
+                />
131
+
132
+        </RelativeLayout>
133
+        <View
134
+            android:layout_width="match_parent"
135
+            android:layout_height="1px"
136
+            android:layout_marginLeft="16px"
137
+            android:layout_marginRight="15px"
138
+            android:background="#E9E9E9"
139
+            />
140
+        <RelativeLayout
141
+            android:layout_width="match_parent"
142
+            android:layout_height="63px"
143
+            android:layout_marginLeft="16px"
144
+            android:layout_marginRight="15px"
145
+            android:focusable="true"
146
+            android:focusableInTouchMode="true"
147
+            >
148
+            <TextView
149
+                android:layout_width="wrap_content"
150
+                android:layout_height="match_parent"
151
+                android:text="发卡银行  "
92 152
                 android:textColor="#444444"
93 153
                 android:gravity="center"
94 154
                 android:textSize="15px"
@@ -100,12 +160,12 @@
100 160
                 android:textSize="15px"
101 161
                 android:textColor="#444444"
102 162
                 android:textColorHint="#cccccc"
103
-                android:hint="未添加"
163
+                android:hint="所属银行"
104 164
                 android:layout_alignParentRight="true"
105 165
                 android:gravity="center_vertical|right"
106 166
                 android:background="@null"
107 167
                 android:singleLine="true"
108
-                android:imeOptions="actionNext"
168
+                android:imeOptions="actionDone"
109 169
                 />
110 170
 
111 171
 
@@ -128,24 +188,24 @@
128 188
             <TextView
129 189
                 android:layout_width="wrap_content"
130 190
                 android:layout_height="match_parent"
131
-                android:text="银行卡号  "
191
+                android:text="预留手机  "
132 192
                 android:textColor="#444444"
133 193
                 android:gravity="center"
134 194
                 android:textSize="15px"
135 195
                 />
136 196
             <EditText
137
-                android:id="@+id/cord_edit"
197
+                android:id="@+id/bank_phone"
138 198
                 android:layout_width="wrap_content"
139 199
                 android:layout_height="match_parent"
140 200
                 android:textSize="15px"
141 201
                 android:textColor="#444444"
142 202
                 android:textColorHint="#cccccc"
143
-                android:hint="未添加"
203
+                android:hint="请输入手机号"
144 204
                 android:layout_alignParentRight="true"
145 205
                 android:gravity="center_vertical|right"
146 206
                 android:background="@null"
147 207
                 android:inputType="number"
148
-                android:maxLength="16"
208
+                android:maxLength="11"
149 209
                 />
150 210
 
151 211
         </RelativeLayout>
@@ -156,26 +216,10 @@
156 216
             android:layout_marginRight="15px"
157 217
             android:background="#E9E9E9"
158 218
             />
219
+
159 220
     </LinearLayout>
160 221
 
161
-    <RelativeLayout
162
-        android:layout_width="355px"
163
-        android:layout_height="wrap_content"
164
-        android:layout_marginTop="5px"
165
-        >
166
-        <TextView
167
-            android:id="@+id/getshort"
168
-            android:layout_width="wrap_content"
169
-            android:layout_height="wrap_content"
170
-            android:text="扫描银行卡"
171
-            android:textColor="#ff3300"
172
-            android:textSize="15px"
173
-            android:layout_alignParentRight="true"
174
-            android:layout_marginLeft="16px"
175
-            android:layout_marginRight="15px"
176
-            android:layout_centerVertical="true"
177
-            />
178
-    </RelativeLayout>
222
+
179 223
     <TextView
180 224
         android:id="@+id/overget"
181 225
         android:layout_width="249px"

+ 10 - 11
app/src/main/res/layout/activity_my_datum.xml

@@ -40,6 +40,7 @@
40 40
             android:text="我的资料"
41 41
             android:textColor="#000000"
42 42
             android:textSize="@dimen/font_16"
43
+            android:textStyle="bold"
43 44
             />
44 45
 
45 46
 
@@ -77,12 +78,11 @@
77 78
                         android:orientation="vertical"
78 79
                         >
79 80
                         <ImageView
80
-                            android:layout_width="20px"
81
-                            android:layout_height="15px"
82
-                            android:src="@mipmap/ic_flowpig"
81
+                            android:layout_width="18px"
82
+                            android:layout_height="16px"
83
+                            android:src="@mipmap/idmycord"
83 84
                             android:layout_centerVertical="true"
84 85
                             android:scaleType="fitXY"
85
-
86 86
                             />
87 87
                     </LinearLayout>
88 88
 
@@ -143,10 +143,9 @@
143 143
                         >
144 144
                         <ImageView
145 145
                             android:layout_width="20px"
146
-                            android:layout_height="15px"
147
-                            android:src="@mipmap/ic_flowpig"
146
+                            android:layout_height="20px"
147
+                            android:src="@mipmap/sos_man"
148 148
                             android:layout_centerVertical="true"
149
-                            android:scaleType="fitXY"
150 149
                             />
151 150
                     </LinearLayout>
152 151
                     <TextView
@@ -254,8 +253,8 @@
254 253
                         >
255 254
                         <ImageView
256 255
                             android:layout_width="20px"
257
-                            android:layout_height="15px"
258
-                            android:src="@mipmap/ic_flowpig"
256
+                            android:layout_height="16px"
257
+                            android:src="@mipmap/mybankicon"
259 258
                             android:layout_centerVertical="true"
260 259
                             android:scaleType="fitXY"
261 260
                             />
@@ -311,8 +310,8 @@
311 310
                         >
312 311
                         <ImageView
313 312
                             android:layout_width="20px"
314
-                            android:layout_height="15px"
315
-                            android:src="@mipmap/ic_flowpig"
313
+                            android:layout_height="20px"
314
+                            android:src="@mipmap/pay_zhiicon"
316 315
                             android:layout_centerVertical="true"
317 316
                             android:scaleType="fitXY"
318 317
                             />

+ 9 - 8
app/src/main/res/layout/activity_my_link_man.xml

@@ -41,6 +41,7 @@
41 41
             android:text="紧急联系人"
42 42
             android:textColor="#000000"
43 43
             android:textSize="@dimen/font_16"
44
+            android:textStyle="bold"
44 45
             />
45 46
 
46 47
 
@@ -56,9 +57,9 @@
56 57
         android:gravity="center"
57 58
         >
58 59
         <ImageView
59
-            android:layout_width="15dp"
60
-            android:layout_height="15dp"
61
-            android:src="@mipmap/remindcont"
60
+            android:layout_width="10px"
61
+            android:layout_height="15px"
62
+            android:src="@mipmap/animore"
62 63
             />
63 64
         <TextView
64 65
             android:layout_width="wrap_content"
@@ -66,7 +67,7 @@
66 67
             android:text="请确保有一个联系人是父母或配偶"
67 68
             android:textSize="12px"
68 69
             android:textColor="#F65353"
69
-            android:layout_marginLeft="10px"
70
+            android:layout_marginLeft="7px"
70 71
             />
71 72
     </LinearLayout>
72 73
 
@@ -142,7 +143,7 @@
142 143
                             android:id="@+id/link_a"
143 144
                             android:layout_width="16px"
144 145
                             android:layout_height="18px"
145
-                            android:src="@mipmap/ic_pig"
146
+                            android:src="@mipmap/address_man"
146 147
                             android:layout_marginTop="10px"
147 148
                             android:layout_marginLeft="10px"
148 149
                             />
@@ -222,7 +223,7 @@
222 223
                         android:layout_width="wrap_content"
223 224
                         android:layout_height="match_parent"
224 225
                         android:text="去添加>"
225
-                        android:textColor="#333333"
226
+                        android:textColor="#999999"
226 227
                         android:gravity="center"
227 228
                         android:textSize="15px"
228 229
                         android:layout_marginBottom="10px"
@@ -294,7 +295,7 @@
294 295
                             android:id="@+id/link_b"
295 296
                             android:layout_width="16px"
296 297
                             android:layout_height="18px"
297
-                            android:src="@mipmap/ic_pig"
298
+                            android:src="@mipmap/address_man"
298 299
                             android:layout_marginTop="10px"
299 300
                             android:layout_marginLeft="10px"
300 301
                             />
@@ -375,7 +376,7 @@
375 376
                         android:layout_width="wrap_content"
376 377
                         android:layout_height="match_parent"
377 378
                         android:text="去添加>"
378
-                        android:textColor="#333333"
379
+                        android:textColor="#999999"
379 380
                         android:gravity="center"
380 381
                         android:textSize="15px"
381 382
                         android:layout_marginBottom="10px"

+ 1 - 1
app/src/main/res/layout/activity_pay_edit.xml

@@ -39,7 +39,7 @@
39 39
             android:layout_gravity="center"
40 40
             android:text="支付宝绑定"
41 41
             android:textColor="#000000"
42
-            android:textSize="@dimen/font_18"
42
+            android:textSize="@dimen/font_16"
43 43
             android:textStyle="bold"
44 44
             />
45 45
     </android.support.v7.widget.Toolbar>

BIN
app/src/main/res/mipmap-xhdpi/address_man.png


BIN
app/src/main/res/mipmap-xhdpi/animore.png


BIN
app/src/main/res/mipmap-xhdpi/icon_fan.png


BIN
app/src/main/res/mipmap-xhdpi/icon_zheng.png


BIN
app/src/main/res/mipmap-xhdpi/idmycord.png


BIN
app/src/main/res/mipmap-xhdpi/mybankicon.png


BIN
app/src/main/res/mipmap-xhdpi/pay_zhiicon.png


BIN
app/src/main/res/mipmap-xhdpi/scan_icon.png


BIN
app/src/main/res/mipmap-xhdpi/sos_man.png


BIN
app/src/main/res/mipmap-xxhdpi/address_man.png


BIN
app/src/main/res/mipmap-xxhdpi/animore.png


BIN
app/src/main/res/mipmap-xxhdpi/icon_fan.png


BIN
app/src/main/res/mipmap-xxhdpi/icon_zheng.png


BIN
app/src/main/res/mipmap-xxhdpi/idmycord.png


BIN
app/src/main/res/mipmap-xxhdpi/mybankicon.png


BIN
app/src/main/res/mipmap-xxhdpi/pay_zhiicon.png


BIN
app/src/main/res/mipmap-xxhdpi/scan_icon.png


BIN
app/src/main/res/mipmap-xxhdpi/sos_man.png


BIN
app/src/main/res/mipmap-xxxhdpi/address_man.png


BIN
app/src/main/res/mipmap-xxxhdpi/animore.png


BIN
app/src/main/res/mipmap-xxxhdpi/icon_fan.png


BIN
app/src/main/res/mipmap-xxxhdpi/icon_zheng.png


BIN
app/src/main/res/mipmap-xxxhdpi/idmycord.png


BIN
app/src/main/res/mipmap-xxxhdpi/mybankicon.png


BIN
app/src/main/res/mipmap-xxxhdpi/pay_zhiicon.png


BIN
app/src/main/res/mipmap-xxxhdpi/scan_icon.png


BIN
app/src/main/res/mipmap-xxxhdpi/sos_man.png