Browse Source

需求完善

huyuguo 4 years ago
parent
commit
1922051b91

+ 1 - 1
app/build.gradle

81
            zipAlignEnabled true
81
            zipAlignEnabled true
82
            // 移除无用的resource文件
82
            // 移除无用的resource文件
83
            //启用代码混淆
83
            //启用代码混淆
84
            minifyEnabled true
84
            minifyEnabled false
85
//            shrinkResources true
85
//            shrinkResources true
86
            //混淆规则配置文件
86
            //混淆规则配置文件
87
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
87
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

+ 8 - 6
app/src/main/java/com/electric/chargingpile/activity/CarBrandActivity.java

6
6
7
import android.content.Intent;
7
import android.content.Intent;
8
import android.os.Bundle;
8
import android.os.Bundle;
9
import android.util.Log;
9
import android.view.View;
10
import android.view.View;
10
import android.widget.TextView;
11
import android.widget.TextView;
11
12
48
        CarBrandEvent event = EventBus.getDefault().removeStickyEvent(CarBrandEvent.class);
49
        CarBrandEvent event = EventBus.getDefault().removeStickyEvent(CarBrandEvent.class);
49
        if (event != null) {
50
        if (event != null) {
50
            groups = event.getGroups();
51
            groups = event.getGroups();
52
            Log.e("abs======================",   groups.size() + "");
53
            String[] letters = new String[groups.size()];
54
            for (int i = 0; i < groups.size(); i++) {
55
                letters[i] = groups.get(i).getInitial();
56
                Log.e("abs======================",   letters[i] + "+" + groups.get(i).getInitial());
57
            }
58
//            LetterSideView.letters = letters;
51
        }
59
        }
52
53
        findViewById(R.id.iv_back).setOnClickListener(this::onClick);
60
        findViewById(R.id.iv_back).setOnClickListener(this::onClick);
54
        letter_side_view = findViewById(R.id.letter_side_view);
61
        letter_side_view = findViewById(R.id.letter_side_view);
55
        text_view_dialog = findViewById(R.id.text_view_dialog);
62
        text_view_dialog = findViewById(R.id.text_view_dialog);
75
            }
82
            }
76
        });
83
        });
77
84
78
        String[] letters = new String[groups.size()];
79
        for (int i = 0; i < groups.size(); i++) {
80
            letters[i] = groups.get(i).getInitial();
81
        }
82
        LetterSideView.letters = letters;
83
        letter_side_view.setVisibility(View.VISIBLE);
85
        letter_side_view.setVisibility(View.VISIBLE);
84
86
85
        recycler_view = (RecyclerView) findViewById(R.id.recycler_view);
87
        recycler_view = (RecyclerView) findViewById(R.id.recycler_view);

+ 2 - 0
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateActivity.java

16
import android.os.Bundle;
16
import android.os.Bundle;
17
import android.text.TextUtils;
17
import android.text.TextUtils;
18
import android.util.Base64;
18
import android.util.Base64;
19
import android.util.Log;
19
import android.view.View;
20
import android.view.View;
20
import android.view.WindowManager;
21
import android.view.WindowManager;
21
import android.widget.Button;
22
import android.widget.Button;
573
        long updatetime1 = appTime11 - MainMapActivity.cha - 5;
574
        long updatetime1 = appTime11 - MainMapActivity.cha - 5;
574
        String token1 = String.valueOf(updatetime1);
575
        String token1 = String.valueOf(updatetime1);
575
        String encode_token = null;
576
        String encode_token = null;
577
576
        try {
578
        try {
577
            encode_token = DES3.encode(token1);
579
            encode_token = DES3.encode(token1);
578
        } catch (Exception e) {
580
        } catch (Exception e) {

+ 34 - 3
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateListActivity.java

17
import com.electric.chargingpile.application.MainApplication;
17
import com.electric.chargingpile.application.MainApplication;
18
import com.electric.chargingpile.data.CarOwnerCertificateBean;
18
import com.electric.chargingpile.data.CarOwnerCertificateBean;
19
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
19
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
20
import com.electric.chargingpile.util.DES3;
20
import com.electric.chargingpile.util.JsonUtils;
21
import com.electric.chargingpile.util.JsonUtils;
21
import com.electric.chargingpile.util.LoadingDialog;
22
import com.electric.chargingpile.util.LoadingDialog;
22
import com.google.gson.Gson;
23
import com.google.gson.Gson;
23
import com.zhy.http.okhttp.OkHttpUtils;
24
import com.zhy.http.okhttp.OkHttpUtils;
24
import com.zhy.http.okhttp.callback.StringCallback;
25
import com.zhy.http.okhttp.callback.StringCallback;
25
26
27
import java.net.URLEncoder;
26
import java.util.List;
28
import java.util.List;
27
29
28
import okhttp3.Call;
30
import okhttp3.Call;
107
109
108
    private void deleteCarOwnerCertificate(int id) {
110
    private void deleteCarOwnerCertificate(int id) {
109
        loadDialog.show();
111
        loadDialog.show();
110
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/del?userid=" + MainApplication.userId + "&id=" + id;
112
113
        long appTime = System.currentTimeMillis() / 1000;
114
        long updateTime = appTime - MainMapActivity.cha - 1;
115
        String token = null;
116
        try {
117
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
118
        } catch (Exception e) {
119
            e.printStackTrace();
120
        }
121
122
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/del?userid=" + MainApplication.userId + "&id=" + id + "&token=" + token;
111
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
123
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
112
            @Override
124
            @Override
113
            public void onError(Call call, Exception e) {
125
            public void onError(Call call, Exception e) {
132
        });
144
        });
133
    }
145
    }
134
146
147
135
    private void setCarOwnerCertificateMain(int id) {
148
    private void setCarOwnerCertificateMain(int id) {
136
        loadDialog.show();
149
        loadDialog.show();
137
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/setmain?userid=" + MainApplication.userId + "&id=" + id;
150
151
        long appTime = System.currentTimeMillis() / 1000;
152
        long updateTime = appTime - MainMapActivity.cha - 1;
153
        String token = null;
154
        try {
155
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
156
        } catch (Exception e) {
157
            e.printStackTrace();
158
        }
159
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/setmain?userid=" + MainApplication.userId + "&id=" + id + "&token=" + token;
138
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
160
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
139
            @Override
161
            @Override
140
            public void onError(Call call, Exception e) {
162
            public void onError(Call call, Exception e) {
159
    }
181
    }
160
182
161
    private void getCarOwnerCertificateList() {
183
    private void getCarOwnerCertificateList() {
162
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId;
184
        long appTime = System.currentTimeMillis() / 1000;
185
        long updateTime = appTime - MainMapActivity.cha - 1;
186
        String token = null;
187
        try {
188
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
189
        } catch (Exception e) {
190
            e.printStackTrace();
191
        }
192
193
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId + "&token=" + token;
163
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
194
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
164
            @Override
195
            @Override
165
            public void onError(Call call, Exception e) {
196
            public void onError(Call call, Exception e) {

+ 6 - 6
app/src/main/java/com/electric/chargingpile/activity/ChargingQianDaoActivity.java

440
                    iv_success.setOnClickListener(new View.OnClickListener() {
440
                    iv_success.setOnClickListener(new View.OnClickListener() {
441
                        @Override
441
                        @Override
442
                        public void onClick(View view) {
442
                        public void onClick(View view) {
443
                            if (!MainApplication.userCar.equals("") && !MainApplication.userCar.equals("nullnull")
444
                                    && !MainApplication.userCar.equals("null$$null") && !MainApplication.userCar.equals("$$")
445
                                    && MainApplication.userCar.length() > 0 && !MainApplication.userCar.equals("待购")) {
443
//                            if (!MainApplication.userCar.equals("") && !MainApplication.userCar.equals("nullnull")
444
//                                    && !MainApplication.userCar.equals("null$$null") && !MainApplication.userCar.equals("$$")
445
//                                    && MainApplication.userCar.length() > 0 && !MainApplication.userCar.equals("待购")) {
446
                                qiandao(1 + "");
446
                                qiandao(1 + "");
447
                            } else {
448
                                ToastUtil.showToast(getApplicationContext(), "请您绑定车型继续提交", Toast.LENGTH_SHORT);
449
                            }
447
//                            } else {
448
//                                ToastUtil.showToast(getApplicationContext(), "请您绑定车型继续提交", Toast.LENGTH_SHORT);
449
//                            }
450
450
451
451
452
                        }
452
                        }

+ 0 - 2
app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java

619

619

620
                @Override
620
                @Override
621
                public void onResponse(String response) {
621
                public void onResponse(String response) {
622
//                    Log.e(TAG, "onResponse: "+response );
623
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
622
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
624
                    if ("01".equals(rtnCode)) {
623
                    if ("01".equals(rtnCode)) {
625
                        String data = JsonUtils.getKeyResult(response, "data");
624
                        String data = JsonUtils.getKeyResult(response, "data");
647
    }
646
    }
648

647

649
    private void saveUserInfo(String info) {
648
    private void saveUserInfo(String info) {
650
//        Log.e(TAG, "saveUserInfo: "+info );
651
        String userid = JsonUtils.getKeyResult(info, "userid");
649
        String userid = JsonUtils.getKeyResult(info, "userid");
652
        String nickname = JsonUtils.getKeyResult(info, "nickname");
650
        String nickname = JsonUtils.getKeyResult(info, "nickname");
653
        String tel = JsonUtils.getKeyResult(info, "tel");
651
        String tel = JsonUtils.getKeyResult(info, "tel");

+ 2 - 103
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

107
    String chexing;
107
    String chexing;
108
    public static final int REQUSET = 11;
108
    public static final int REQUSET = 11;
109
    String select_pinpai = "", select_chexing = "";
109
    String select_pinpai = "", select_chexing = "";
110
    private TextView tv_point, tv_buy;
111
    private RelativeLayout rl_point, rl_isBuy;
110
    private TextView tv_point;
111
    private RelativeLayout rl_point;
112
    private Bitmap download_bmp;
112
    private Bitmap download_bmp;
113
    private File fileUri = new File(Environment.getExternalStorageDirectory().getPath() + "/photo.jpg");
113
    private File fileUri = new File(Environment.getExternalStorageDirectory().getPath() + "/photo.jpg");
114
    private File fileCropUri = new File(Environment.getExternalStorageDirectory().getPath() + "/crop_photo.jpg");
114
    private File fileCropUri = new File(Environment.getExternalStorageDirectory().getPath() + "/crop_photo.jpg");
130
    }
130
    }
131
131
132
    private void initView() {
132
    private void initView() {
133
        rl_isBuy = (RelativeLayout) findViewById(R.id.rl_isBuy);
134
        rl_isBuy.setOnClickListener(this);
135
        rl_point = (RelativeLayout) findViewById(R.id.rl_point);
133
        rl_point = (RelativeLayout) findViewById(R.id.rl_point);
136
        tv_buy = (TextView) findViewById(R.id.tv_buy);
137
        tv_point = (TextView) findViewById(R.id.tv_point);
134
        tv_point = (TextView) findViewById(R.id.tv_point);
138
135
139
        et_car = (TextView) findViewById(R.id.et_che);
136
        et_car = (TextView) findViewById(R.id.et_che);
181
        });
178
        });
182
179
183
        iconPic = (RoundImageView) findViewById(R.id.iv_user_icon);
180
        iconPic = (RoundImageView) findViewById(R.id.iv_user_icon);
184
//        setIcon();
185
186
        tv_save = (TextView) findViewById(R.id.tv_make_sure);
181
        tv_save = (TextView) findViewById(R.id.tv_make_sure);
187
        tv_save.setOnClickListener(this);
182
        tv_save.setOnClickListener(this);
188
183
407
            spinnerCity.setSelection(default_type);
402
            spinnerCity.setSelection(default_type);
408
            default_type = -1;
403
            default_type = -1;
409
        }
404
        }
410
//		if (currentProvince.getCities().size() > 0) {
411
//			cityAdapter.notifyDataSetChanged();
412
//			spinnerCity.setSelection(0);
413
//		}
414
    }
405
    }
415
406
416
407
417
    @Override
408
    @Override
418
    public void onClick(View v) {
409
    public void onClick(View v) {
419
        switch (v.getId()) {
410
        switch (v.getId()) {
420
            case R.id.rl_isBuy:
421
                LayoutInflater inflater1 = (LayoutInflater) getSystemService(mContext.LAYOUT_INFLATER_SERVICE);
422
                View popupWindowView = inflater1.inflate(R.layout.layout_isbuy, null);
423
                final PopupWindow popupWindow1 = new PopupWindow(popupWindowView,
424
                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
425
                        true);
426
                popupWindow1.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_yinying531));
427
                popupWindow1.setOutsideTouchable(true);
428
                popupWindowView.setOnKeyListener(new View.OnKeyListener() {
429
                    @Override
430
                    public boolean onKey(View v, int keyCode, KeyEvent event) {
431
                        if ((keyCode == KeyEvent.KEYCODE_MENU) && (popupWindow1.isShowing())) {
432
                            popupWindow1.dismiss();
433
                            return true;
434
                        }
435
                        return false;
436
                    }
437
                });
438
                popupWindowView.setOnTouchListener(new View.OnTouchListener() {
439
440
                    @Override
441
                    public boolean onTouch(View v, MotionEvent event) {
442
                        if (popupWindow1.isShowing()) {
443
                            popupWindow1.dismiss();
444
                        }
445
                        return false;
446
                    }
447
                });
448
                // 设置PopupWindow的弹出和消失效果
449
                popupWindow1.setAnimationStyle(R.style.popupAnimation);
450
                Button cancleButton = (Button) popupWindowView
451
                        .findViewById(R.id.cancleButton);
452
                cancleButton.setOnClickListener(new View.OnClickListener() {
453
                    @Override
454
                    public void onClick(View view) {
455
                        popupWindow1.dismiss();
456
                    }
457
                });
458
                Button btn_one = (Button) popupWindowView.findViewById(R.id.tvTwo);
459
                btn_one.setOnClickListener(new View.OnClickListener() {
460
                    @Override
461
                    public void onClick(View view) {
462
                        tv_buy.setText("已购买");
463
                        rl_select_car.setVisibility(View.VISIBLE);
464
465
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
466
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
467
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
468
//                        ((Activity) mContext).startActivityForResult(intent, 2);
469
                        popupWindow1.dismiss();
470
                    }
471
                });
472
                Button btn_two = (Button) popupWindowView.findViewById(R.id.tvThree);
473
                btn_two.setOnClickListener(new View.OnClickListener() {
474
                    @Override
475
                    public void onClick(View view) {
476
                        tv_buy.setText("未购买");
477
                        rl_select_car.setVisibility(View.GONE);
478
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
479
//                        intent.setDataAndType(
480
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
481
//                                "image/*");
482
//                        startActivityForResult(intent, 1);
483
                        popupWindow1.dismiss();
484
                    }
485
                });
486
487
                popupWindow1.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
488
                break;
489
            case R.id.rl_select_car:
411
            case R.id.rl_select_car:
490
                startActivityForResult(new Intent(SkipUserInfoActivity.this, SelectCarActivity.class), REQUSET);
412
                startActivityForResult(new Intent(SkipUserInfoActivity.this, SelectCarActivity.class), REQUSET);
491
                break;
413
                break;
548
470
549
    private boolean checkText() {
471
    private boolean checkText() {
550
        String nickName = et_nickName.getText().toString().trim();
472
        String nickName = et_nickName.getText().toString().trim();
551
        String isBuy = tv_buy.getText().toString().trim();
552
        String carType = et_car.getText().toString().trim();
473
        String carType = et_car.getText().toString().trim();
553
474
554
        if (TextUtils.isEmpty(nickName)) {
475
        if (TextUtils.isEmpty(nickName)) {
555
            Toast.makeText(this, "请输入您的昵称", Toast.LENGTH_SHORT).show();
476
            Toast.makeText(this, "请输入您的昵称", Toast.LENGTH_SHORT).show();
556
            return false;
477
            return false;
557
        }
478
        }
558
        if (TextUtils.isEmpty(isBuy)) {
559
            Toast.makeText(this, "请选择您是否购买了新能源汽车", Toast.LENGTH_SHORT).show();
560
            return false;
561
        }
562
        if (isBuy.equals("已购买")) {
563
            if (TextUtils.isEmpty(carType)) {
564
                Toast.makeText(this, "请选择您购买的车型", Toast.LENGTH_SHORT).show();
565
                return false;
566
            }
567
        }
568
569
479
570
        return true;
480
        return true;
571
    }
481
    }
600
        Log.i("cha---", MainMapActivity.cha + "");
510
        Log.i("cha---", MainMapActivity.cha + "");
601
        String token = String.valueOf(updatetime);
511
        String token = String.valueOf(updatetime);
602
        Log.i("token---", token);
512
        Log.i("token---", token);
603
604
        if (tv_buy.getText().toString().equals("未购买")) {
605
            havecar = "待购";
606
        } else {
607
            if (null != car_type && null != car_brand) {
608
                havecar = car_brand + "$$" + car_type;
609
            }
610
        }
611
612
        nocar = "";
513
        nocar = "";
613
614
615
        try {
514
        try {
616
            if (photo != null) {
515
            if (photo != null) {
617
516

+ 26 - 1
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

49
import com.electric.chargingpile.application.MainApplication;
49
import com.electric.chargingpile.application.MainApplication;
50
import com.electric.chargingpile.data.Adin;
50
import com.electric.chargingpile.data.Adin;
51
import com.electric.chargingpile.data.CarOwnerCertificateBean;
51
import com.electric.chargingpile.data.CarOwnerCertificateBean;
52
import com.electric.chargingpile.entity.CarSeriesEntity;
52
import com.electric.chargingpile.manager.ProfileManager;
53
import com.electric.chargingpile.manager.ProfileManager;
53
import com.electric.chargingpile.util.DES3;
54
import com.electric.chargingpile.util.DES3;
54
import com.electric.chargingpile.util.JsonUtils;
55
import com.electric.chargingpile.util.JsonUtils;
65
import com.google.android.gms.appindexing.Action;
66
import com.google.android.gms.appindexing.Action;
66
import com.google.android.gms.appindexing.AppIndex;
67
import com.google.android.gms.appindexing.AppIndex;
67
import com.google.android.gms.common.api.GoogleApiClient;
68
import com.google.android.gms.common.api.GoogleApiClient;
69
import com.google.gson.Gson;
68
import com.squareup.okhttp.Request;
70
import com.squareup.okhttp.Request;
69
import com.squareup.okhttp.Response;
71
import com.squareup.okhttp.Response;
70
import com.squareup.picasso.Picasso;
72
import com.squareup.picasso.Picasso;
172
     */
174
     */
173
    private GoogleApiClient client;
175
    private GoogleApiClient client;
174
    private ImageView chat_share_bar;
176
    private ImageView chat_share_bar;
177
    private TextView car_owner_certificate_label;
175
178
176
    //把一个url的网络图片变成一个本地的BitMap
179
    //把一个url的网络图片变成一个本地的BitMap
177
    public Bitmap returnBitMap(final String url) {
180
    public Bitmap returnBitMap(final String url) {
365
        llPerson = (RelativeLayout) findViewById(R.id.ll_person);
368
        llPerson = (RelativeLayout) findViewById(R.id.ll_person);
366
        llPerson.setOnClickListener(this);
369
        llPerson.setOnClickListener(this);
367
370
371
        car_owner_certificate_label = findViewById(R.id.car_owner_certificate_label);
372
368
        //登陆按钮
373
        //登陆按钮
369
        userLogin = (TextView) findViewById(R.id.userLogin);
374
        userLogin = (TextView) findViewById(R.id.userLogin);
370
        userLogin.setOnClickListener(this);
375
        userLogin.setOnClickListener(this);
431
436
432
        set_loginShow();
437
        set_loginShow();
433
438
439
        getCarOwnerCertificateList("init");
440
434
    }
441
    }
435
442
436
    private void getSharePrompt(String user_id) {
443
    private void getSharePrompt(String user_id) {
1097
                            intent.putExtra("url", "https://www.d1ev.com/special/models/wap/webView/index.html");
1104
                            intent.putExtra("url", "https://www.d1ev.com/special/models/wap/webView/index.html");
1098
                            startActivity(intent);
1105
                            startActivity(intent);
1099
                        }
1106
                        }
1100
                    } else {
1107
                    } else if ("certificate".equals(from)) {
1101
                        if (list.size() == 0) {
1108
                        if (list.size() == 0) {
1102
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1109
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1103
                        } else {
1110
                        } else {
1105
                            intent.putExtra("data", data);
1112
                            intent.putExtra("data", data);
1106
                            startActivity(intent);
1113
                            startActivity(intent);
1107
                        }
1114
                        }
1115
                    } else if ("init".equals(from)) {
1116
                        boolean certificated = false;
1117
                        String chexing = "";
1118
                        for (CarOwnerCertificateBean bean : list) {
1119
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
1120
                                certificated = true;
1121
                                chexing = bean.getChexing();
1122
                                break;
1123
                            }
1124
                        }
1125
                        if (certificated) {
1126
                            Gson gson = new Gson();
1127
                            CarSeriesEntity carSeriesEntity = gson.fromJson(chexing, CarSeriesEntity.class);
1128
                            car_owner_certificate_label.setText(carSeriesEntity.getSeriesName());
1129
                        } else {
1130
                            car_owner_certificate_label.setText("认证车主得充电红包");
1131
                        }
1132
1108
                    }
1133
                    }
1109
                } else {
1134
                } else {
1110
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
1135
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");

+ 0 - 49
app/src/main/res/layout/activity_skip_user_info.xml

158
            <View
158
            <View
159
                android:layout_width="match_parent"
159
                android:layout_width="match_parent"
160
                android:layout_height="0.5dp"
160
                android:layout_height="0.5dp"
161
                android:background="@color/in_line"
162
                android:layout_marginLeft="16dp" />
163
164
            <RelativeLayout
165
                android:id="@+id/rl_isBuy"
166
                android:layout_width="fill_parent"
167
                android:background="@color/white"
168
                android:layout_height="45dp"
169
                android:visibility="visible">
170
                <TextView
171
                    android:layout_width="wrap_content"
172
                    android:layout_height="match_parent"
173
                    android:text="是否购买新能源汽车"
174
                    android:textColor="@color/title_row"
175
                    android:textSize="15sp"
176
                    android:paddingLeft="16dp"
177
                    android:gravity="center"/>
178
179
                <TextView
180
                    android:id="@+id/tv_buy"
181
                    android:layout_width="wrap_content"
182
                    android:layout_height="45dp"
183
                    android:background="@color/white"
184
                    android:hint="请选择"
185
                    android:textColorHint="@color/hintColor"
186
                    android:gravity="center|right"
187
                    android:singleLine="true"
188
                    android:textColor="@color/ui_62"
189
                    android:textSize="15sp"
190
                    android:layout_alignParentTop="true"
191
                    android:layout_marginRight="8dp"
192
                    android:layout_toLeftOf="@+id/imageView14"
193
                    android:layout_toStartOf="@+id/imageView14" />
194
195
                <ImageView
196
                    android:layout_width="wrap_content"
197
                    android:layout_height="match_parent"
198
                    android:src="@drawable/icon_more2_0"
199
                    android:layout_centerVertical="true"
200
                    android:layout_alignParentRight="true"
201
                    android:layout_alignParentEnd="true"
202
                    android:layout_marginRight="16dp"
203
                    android:id="@+id/imageView14" />
204
205
            </RelativeLayout>
206
207
            <View
208
                android:layout_width="match_parent"
209
                android:layout_height="0.5dp"
210
                android:background="@color/ui_line"
161
                android:background="@color/ui_line"
211
                android:layout_marginLeft="16dp"
162
                android:layout_marginLeft="16dp"
212
                android:visibility="visible"/>
163
                android:visibility="visible"/>

+ 22 - 0
app/src/main/res/layout/activity_user_center.xml

501
                            android:textSize="15sp" />
501
                            android:textSize="15sp" />
502
502
503
                        <TextView
503
                        <TextView
504
                            android:id="@+id/car_owner_certificate_label"
505
                            android:layout_width="wrap_content"
506
                            android:layout_height="match_parent"
507
                            android:layout_toLeftOf="@+id/iv_certificate_cursor"
508
                            android:text=""
509
                            android:textSize="14sp"
510
                            android:gravity="center_vertical"
511
                            android:layout_marginRight="12dp"
512
                            android:textColor="@color/lvse"/>
513
                        <TextView
514
                            android:id="@+id/iv_certificate_cursor"
504
                            android:layout_width="wrap_content"
515
                            android:layout_width="wrap_content"
505
                            android:layout_height="wrap_content"
516
                            android:layout_height="wrap_content"
506
                            android:layout_alignParentTop="true"
517
                            android:layout_alignParentTop="true"
543
554
544
                        <TextView
555
                        <TextView
545
                            android:layout_width="wrap_content"
556
                            android:layout_width="wrap_content"
557
                            android:layout_height="match_parent"
558
                            android:layout_toLeftOf="@+id/iv_price_cursor"
559
                            android:text="发表成交价得充电红包"
560
                            android:textSize="14sp"
561
                            android:gravity="center_vertical"
562
                            android:layout_marginRight="12dp"
563
                            android:textColor="@color/lvse"/>
564
565
                        <TextView
566
                            android:id="@+id/iv_price_cursor"
567
                            android:layout_width="wrap_content"
546
                            android:layout_height="wrap_content"
568
                            android:layout_height="wrap_content"
547
                            android:layout_alignParentTop="true"
569
                            android:layout_alignParentTop="true"
548
                            android:layout_alignParentRight="true"
570
                            android:layout_alignParentRight="true"