浏览代码

优化车主认证以及意向车型的展示逻辑

hy 3 年之前
父节点
当前提交
f37e052d4b

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

139
        }
139
        }
140
        Map<String, String> map = new HashMap<>();
140
        Map<String, String> map = new HashMap<>();
141
        map.put("engine_number", "yixiang");
141
        map.put("engine_number", "yixiang");
142
        map.put("plate_number", "yixiang");
142
        map.put("plate_number", "意向");
143
        map.put("cartype", "自用");
143
        map.put("cartype", "自用");
144
        map.put("userid", MainApplication.userId);
144
        map.put("userid", MainApplication.userId);
145
        map.put("token", token);
145
        map.put("token", token);

+ 16 - 0
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateListActivity.java

3
import android.content.Intent;
3
import android.content.Intent;
4
import android.graphics.Color;
4
import android.graphics.Color;
5
import android.os.Bundle;
5
import android.os.Bundle;
6
import android.util.Log;
6
import android.view.View;
7
import android.view.View;
7
import android.widget.LinearLayout;
8
import android.widget.LinearLayout;
8
import android.widget.TextView;
9
import android.widget.TextView;
76
            getCarOwnerCertificateList();
77
            getCarOwnerCertificateList();
77
        } else {
78
        } else {
78
            mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
79
            mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
80
            for (int i = mList.size()-1; i >= 0; i--) {
81
                CarOwnerCertificateBean bean = mList.get(i);
82
                if (bean.getStatus() == 2){
83
                    mList.remove(i);
84
                }
85
            }
79
        }
86
        }
80
        if (mList.size() >= 3) {
87
        if (mList.size() >= 3) {
81
            canAdd = false;
88
            canAdd = false;
225
                if ("01".equals(rtnCode)) {
232
                if ("01".equals(rtnCode)) {
226
                    String data = JsonUtils.getKeyResult(response, "data");
233
                    String data = JsonUtils.getKeyResult(response, "data");
227
                    mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
234
                    mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
235
                    Log.e("TAG", "onResponse: "+mList.size() );
236
                    for (int i = mList.size()-1; i >= 0; i--) {
237
                        CarOwnerCertificateBean bean = mList.get(i);
238
                        if (bean.getStatus() == 2){
239
                            Log.e("TAG", "onResponse: ----" );
240
                            mList.remove(i);
241
                        }
242
                    }
243
                    Log.e("TAG", "onResponse: =="+mList.size()  );
228
                    adapter.setData(mList);
244
                    adapter.setData(mList);
229
                    no_data.setVisibility(mList.size() == 0 ? View.VISIBLE : View.GONE);
245
                    no_data.setVisibility(mList.size() == 0 ? View.VISIBLE : View.GONE);
230
246

+ 22 - 3
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

965
                        certificateStatus = 1;
965
                        certificateStatus = 1;
966
                    } else {
966
                    } else {
967
                        certificateStatus = 2;
967
                        certificateStatus = 2;
968
969
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
970
                        boolean isVerified=true;//是否是已认证车主
971
                        boolean isCarIntendedModel=true;//是否是意向车型
972
973
                        Gson gson = new Gson();
968
                        for (CarOwnerCertificateBean bean : list) {
974
                        for (CarOwnerCertificateBean bean : list) {
969
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
975
                            //获取已通过车主认证车型
976
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
970
                                certificateStatus = 3;
977
                                certificateStatus = 3;
971
                                Gson gson = new Gson();
972
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
978
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
973
                                break;
979
                                isCertifiedOwner=false;
980
                            }
981
                            //获取意向车型
982
                            if (bean.getStatus() == 2|| isCarIntendedModel){
983
984
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
985
                                carModel.setText(entity.getSeriesName());
986
                                isCarIntendedModel=false;
987
                            }
988
                            //已完成车主认证功能
989
                            if (bean.getStatus() != 2|| isVerified){
990
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
991
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
992
                                isVerified=false;
974
                            }
993
                            }
975
                        }
994
                        }
976
                    }
995
                    }

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

1171
                        }
1171
                        }
1172
                    } else if ("init".equals(from)) {
1172
                    } else if ("init".equals(from)) {
1173
                        boolean certificated = false;
1173
                        boolean certificated = false;
1174
1175
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
1176
                        boolean isVerified=true;//是否是已认证车主
1177
1174
                        String chexing = "";
1178
                        String chexing = "";
1175
                        if (list.size()>0){
1176
                            MainApplication.userCertifiedModel="已认证";
1177
                        }
1179
                        Gson gson = new Gson();
1180
1178
                        for (CarOwnerCertificateBean bean : list) {
1181
                        for (CarOwnerCertificateBean bean : list) {
1179
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
1182
                            if (bean.getStatus() == 1 && bean.getMain() == 1 &&isCertifiedOwner) {
1180
                                certificated = true;
1183
                                certificated = true;
1181
                                chexing = bean.getChexing();
1184
                                chexing = bean.getChexing();
1182
                                break;
1185
                                isCertifiedOwner=false;
1186
                            }
1187
                            if (bean.getStatus() != 2 && isVerified){
1188
                                MainApplication.userCertifiedModel=bean.getChexing();
1189
                                isVerified=false;
1183
                            }
1190
                            }
1184
                        }
1191
                        }
1185
                        if (certificated) {
1192
                        if (certificated) {
1186
                            Gson gson = new Gson();
1187
                            CarSeriesEntity carSeriesEntity = gson.fromJson(chexing, CarSeriesEntity.class);
1193
                            CarSeriesEntity carSeriesEntity = gson.fromJson(chexing, CarSeriesEntity.class);
1188
                            car_owner_certificate_label.setText(carSeriesEntity.getSeriesName());
1194
                            car_owner_certificate_label.setText(carSeriesEntity.getSeriesName());
1189
                            MainApplication.userCertifiedModel=carSeriesEntity.getSeriesName();
1195
                            MainApplication.userCertifiedModel=carSeriesEntity.getSeriesName();

+ 23 - 3
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

1115
                        certificateStatus = 1;
1115
                        certificateStatus = 1;
1116
                    } else {
1116
                    } else {
1117
                        certificateStatus = 2;
1117
                        certificateStatus = 2;
1118
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
1119
                        boolean isVerified=true;//是否是已认证车主
1120
                        boolean isCarIntendedModel=true;//是否是意向车型
1121
                        Gson gson = new Gson();
1118
                        for (CarOwnerCertificateBean bean : list) {
1122
                        for (CarOwnerCertificateBean bean : list) {
1119
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
1123
                            //获取已通过车主认证车型
1124
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
1120
                                certificateStatus = 3;
1125
                                certificateStatus = 3;
1121
                                Gson gson = new Gson();
1122
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
1126
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
1123
                                break;
1127
                                isCertifiedOwner=false;
1124
                            }
1128
                            }
1129
                            //获取意向车型
1130
                            if (bean.getStatus() == 2|| isCarIntendedModel){
1131
1132
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
1133
                                carModel.setText(entity.getSeriesName());
1134
                                isCarIntendedModel=false;
1135
                            }
1136
1137
                            //已完成车主认证功能
1138
                            if (bean.getStatus() != 2|| isVerified){
1139
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
1140
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
1141
                                isVerified=false;
1142
                            }
1143
1125
                        }
1144
                        }
1145
1126
                    }
1146
                    }
1127
1147
1128
                    if (certificateStatus == 2) {
1148
                    if (certificateStatus == 2) {

+ 5 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

305
                                List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
305
                                List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
306
                                boolean certificated = false;
306
                                boolean certificated = false;
307
                                for (CarOwnerCertificateBean bean : list) {
307
                                for (CarOwnerCertificateBean bean : list) {
308
                                    chexing = bean.getChexing();
309
                                    certificated = true;
308
                                    if (bean.getStatus()!=2){ //排除意向车型,则证明用户已经车主认证过了
309
                                        chexing = bean.getChexing();
310
                                        certificated = true;
311
                                        break;
312
                                    }
310
                                }
313
                                }
311
                                if (certificated) {
314
                                if (certificated) {
312
                                    Gson gson = new Gson();
315
                                    Gson gson = new Gson();