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

app/src/main/java/com/electric/chargingpile/activity/CarModelActivity.java

@@ -139,7 +139,7 @@ public class CarModelActivity extends AppCompatActivity implements View.OnClickL
        }
        Map<String, String> map = new HashMap<>();
        map.put("engine_number", "yixiang");
        map.put("plate_number", "yixiang");
        map.put("plate_number", "意向");
        map.put("cartype", "自用");
        map.put("userid", MainApplication.userId);
        map.put("token", token);

app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateListActivity.java

@@ -3,6 +3,7 @@ package com.electric.chargingpile.activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -76,6 +77,12 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
            getCarOwnerCertificateList();
        } else {
            mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
            for (int i = mList.size()-1; i >= 0; i--) {
                CarOwnerCertificateBean bean = mList.get(i);
                if (bean.getStatus() == 2){
                    mList.remove(i);
                }
            }
        }
        if (mList.size() >= 3) {
            canAdd = false;
@@ -225,6 +232,15 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    Log.e("TAG", "onResponse: "+mList.size() );
                    for (int i = mList.size()-1; i >= 0; i--) {
                        CarOwnerCertificateBean bean = mList.get(i);
                        if (bean.getStatus() == 2){
                            Log.e("TAG", "onResponse: ----" );
                            mList.remove(i);
                        }
                    }
                    Log.e("TAG", "onResponse: =="+mList.size()  );
                    adapter.setData(mList);
                    no_data.setVisibility(mList.size() == 0 ? View.VISIBLE : View.GONE);

app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

@@ -965,12 +965,31 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                        certificateStatus = 1;
                    } else {
                        certificateStatus = 2;
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
                        boolean isVerified=true;//是否是已认证车主
                        boolean isCarIntendedModel=true;//是否是意向车型
                        Gson gson = new Gson();
                        for (CarOwnerCertificateBean bean : list) {
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
                            //获取已通过车主认证车型
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
                                certificateStatus = 3;
                                Gson gson = new Gson();
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                break;
                                isCertifiedOwner=false;
                            }
                            //获取意向车型
                            if (bean.getStatus() == 2|| isCarIntendedModel){
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                carModel.setText(entity.getSeriesName());
                                isCarIntendedModel=false;
                            }
                            //已完成车主认证功能
                            if (bean.getStatus() != 2|| isVerified){
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
                                isVerified=false;
                            }
                        }
                    }

app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

@@ -1171,19 +1171,25 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                        }
                    } else if ("init".equals(from)) {
                        boolean certificated = false;
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
                        boolean isVerified=true;//是否是已认证车主
                        String chexing = "";
                        if (list.size()>0){
                            MainApplication.userCertifiedModel="已认证";
                        }
                        Gson gson = new Gson();
                        for (CarOwnerCertificateBean bean : list) {
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
                            if (bean.getStatus() == 1 && bean.getMain() == 1 &&isCertifiedOwner) {
                                certificated = true;
                                chexing = bean.getChexing();
                                break;
                                isCertifiedOwner=false;
                            }
                            if (bean.getStatus() != 2 && isVerified){
                                MainApplication.userCertifiedModel=bean.getChexing();
                                isVerified=false;
                            }
                        }
                        if (certificated) {
                            Gson gson = new Gson();
                            CarSeriesEntity carSeriesEntity = gson.fromJson(chexing, CarSeriesEntity.class);
                            car_owner_certificate_label.setText(carSeriesEntity.getSeriesName());
                            MainApplication.userCertifiedModel=carSeriesEntity.getSeriesName();

app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

@@ -1115,14 +1115,34 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
                        certificateStatus = 1;
                    } else {
                        certificateStatus = 2;
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
                        boolean isVerified=true;//是否是已认证车主
                        boolean isCarIntendedModel=true;//是否是意向车型
                        Gson gson = new Gson();
                        for (CarOwnerCertificateBean bean : list) {
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
                            //获取已通过车主认证车型
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
                                certificateStatus = 3;
                                Gson gson = new Gson();
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                break;
                                isCertifiedOwner=false;
                            }
                            //获取意向车型
                            if (bean.getStatus() == 2|| isCarIntendedModel){
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                carModel.setText(entity.getSeriesName());
                                isCarIntendedModel=false;
                            }
                            //已完成车主认证功能
                            if (bean.getStatus() != 2|| isVerified){
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
                                isVerified=false;
                            }
                        }
                    }
                    if (certificateStatus == 2) {

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -305,8 +305,11 @@ public class MainApplication extends MultiDexApplication {
                                List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                                boolean certificated = false;
                                for (CarOwnerCertificateBean bean : list) {
                                    chexing = bean.getChexing();
                                    certificated = true;
                                    if (bean.getStatus()!=2){ //排除意向车型，则证明用户已经车主认证过了
                                        chexing = bean.getChexing();
                                        certificated = true;
                                        break;
                                    }
                                }
                                if (certificated) {
                                    Gson gson = new Gson();