修复认证车主，意向车型的bug

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

@@ -21,6 +21,7 @@ import com.electric.chargingpile.entity.CarModelChildEntity;
import com.electric.chargingpile.entity.CarModelEntity;
import com.electric.chargingpile.entity.CarModelGroupEntity;
import com.electric.chargingpile.entity.CarSeriesEntity;
import com.electric.chargingpile.event.CarIntentModelEvent;
import com.electric.chargingpile.event.CarModelEvent;
import com.electric.chargingpile.event.CarSeriesEvent;
import com.electric.chargingpile.manager.ProfileManager;
@@ -47,7 +48,7 @@ import static com.electric.chargingpile.activity.CarBrandActivity.sourceType;
/**
 * 车型选择
 * */
 */
public class CarModelActivity extends AppCompatActivity implements View.OnClickListener {
    private RecyclerView recycler_view;
@@ -124,57 +125,17 @@ public class CarModelActivity extends AppCompatActivity implements View.OnClickL
        return carModelEntity;
    }
    private void requestCarIntentModel( CarModelEntity carModelEntity) {
        loadDialog.show();
    private void requestCarIntentModel(CarModelEntity carModelEntity) {
        EventBus.getDefault().postSticky(new CarIntentModelEvent(carModelEntity));
        String sourceType = CarBrandActivity.sourceType;
        CarBrandActivity.sourceType = "";
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/add";
        long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = DES3.encode(String.valueOf(tokenTime));
        } catch (Exception e) {
            e.printStackTrace();
        if (sourceType.equals("1")) {
            startActivity(new Intent(CarModelActivity.this, UserInfoActivity.class));
        } else if (sourceType.equals("2")) {
            startActivity(new Intent(CarModelActivity.this, SkipUserInfoActivity.class));
        }
        Map<String, String> map = new HashMap<>();
        map.put("engine_number", "yixiang");
        map.put("plate_number", "意向");
        map.put("cartype", "自用");
        map.put("userid", MainApplication.userId);
        map.put("token", token);
        Gson gson = new Gson();
        String chexing = gson.toJson(carModelEntity);
        map.put("chexing", chexing);
        OkHttpUtils.post().params(map).url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                loadDialog.dismiss();
            }
            @Override
            public void onResponse(String response) {
                loadDialog.dismiss();
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交成功", Toast.LENGTH_SHORT);
                    finish();
                    MainApplication.userCarIntentMode= carSeriesEntity.getSeriesName();
                    ProfileManager.getInstance().setCarIntentModel(CarModelActivity.this,carSeriesEntity.getSeriesName());
                    if (sourceType.equals("1")){
                        startActivity(new Intent(CarModelActivity.this, UserInfoActivity.class));
                    }else if (sourceType.equals("2")){
                        startActivity(new Intent(CarModelActivity.this, SkipUserInfoActivity.class));
                    }
                } else {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交失败，请重新提交", Toast.LENGTH_SHORT);
                }
            }
        });
    }
    private void getModelList() {

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

@@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSONException;
import com.electric.chargingpile.R;
import com.electric.chargingpile.adapter.CarOwnerCertificateListAdapter;
import com.electric.chargingpile.application.MainApplication;
@@ -231,7 +232,11 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    try {
                        mList = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    }catch (JSONException e){
                    }
                    Log.e("TAG", "onResponse: "+mList.size() );
                    for (int i = mList.size()-1; i >= 0; i--) {
                        CarOwnerCertificateBean bean = mList.get(i);

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

@@ -24,6 +24,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.alibaba.fastjson.JSONException;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.EmptyUtils;
import com.blankj.utilcode.util.LogUtils;
@@ -53,6 +54,7 @@ import com.zhy.http.okhttp.callback.StringCallback;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -823,7 +825,13 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
                if ("01".equals(rtnCode)) {
                    String chexing = "";
                    String data = JsonUtils.getKeyResult(response, "data");
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    List<CarOwnerCertificateBean> list=new ArrayList<>();
                    try {
                        list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    }catch (JSONException e){
                    }
                    boolean certificated = false;
                    for (CarOwnerCertificateBean bean : list) {
                        if (bean.getStatus() != 2) { //排除意向车型，则证明用户已经车主认证过了

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

@@ -47,6 +47,7 @@ import androidx.core.content.FileProvider;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.alibaba.fastjson.JSONException;
import com.blankj.utilcode.util.LogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.CustomTarget;
@@ -1715,7 +1716,12 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    List<CarOwnerCertificateBean> list =new ArrayList<>();
                    try{
                         list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    }catch (JSONException e){
                    }
                    if (list.size() == 0) {
                        startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                    } else {

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

@@ -30,6 +30,7 @@ import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.Spinner;
@@ -44,7 +45,10 @@ import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.CarOwnerCertificateBean;
import com.electric.chargingpile.data.Cars;
import com.electric.chargingpile.data.Province;
import com.electric.chargingpile.entity.CarModelEntity;
import com.electric.chargingpile.entity.CarSeriesEntity;
import com.electric.chargingpile.event.CarIntentModelEvent;
import com.electric.chargingpile.event.CarModelEvent;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.ActivityManagerApplication;
import com.electric.chargingpile.util.BarColorUtil;
@@ -56,6 +60,7 @@ import com.electric.chargingpile.util.LogUtils;
import com.electric.chargingpile.util.OkHttpUtil;
import com.electric.chargingpile.util.PhotoUtils;
import com.electric.chargingpile.util.StatusConstants;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.UploadUtil;
import com.electric.chargingpile.view.CustomProgressDialog;
import com.electric.chargingpile.view.RoundImageView;
@@ -66,6 +71,10 @@ import com.squareup.okhttp.Response;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -128,15 +137,17 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
    private SkipUserInfoActivity activity;
    private LoadingDialog loadDialog;
    // 1.去认证车主（获得充电优惠）      > 2.认证车主             审核中  3.认证车主             宝马
    private int certificateStatus = 0; // 1 去认证  2审核中  3认证车主
    private RelativeLayout go_certificate;
    // -2 -> 去认证, -1 -> 认证失败，0 -> 审核中，1 -> 表示通过审核，2 -> 表示意向车型。
    private int certificateStatus = -2;
    private LinearLayout go_certificate;
    private TextView go_title;
    private TextView go_desc;
    private ImageView go_cursor;
    private RelativeLayout carIntentModel;
    private LinearLayout carIntentModel;
    private TextView carModel;
    private CarModelEntity mCarModelEntity;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -144,6 +155,8 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        mContext = this;
        activity = this;
        BarColorUtil.initStatusBarColor(SkipUserInfoActivity.this);
        EventBus.getDefault().register(this);
        initView();
        getFromServer();
        spinner();
@@ -172,7 +185,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        rl_icon = (RelativeLayout) findViewById(R.id.rl_icon);
        rl_icon.setOnClickListener(this);
        carIntentModel = (RelativeLayout) findViewById(R.id.carIntentModel);
        carIntentModel = findViewById(R.id.carIntentModel);
        carIntentModel.setOnClickListener(this);
        btn_sex = (ToggleButton) findViewById(R.id.sex_button);
@@ -472,19 +485,19 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                            shite("");
                        }
                    }).start();
                    if (mCarModelEntity!=null){
                        requestCarIntentModel();
                    }
                    createDialog();
                }
                break;
            case R.id.go_certificate:
                // 1 去认证  2审核中  3认证车主
                if (certificateStatus == 0) {
                if (certificateStatus == -2) {
                    getCarOwnerCertificateList(true);
                } else if (certificateStatus == 1) {
                    startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                }
                break;
            case  R.id.carIntentModel:
                 CarBrandActivity.actionStart(this,"2");
            case R.id.carIntentModel:
                CarBrandActivity.actionStart(this, "2");
                break;
        }
@@ -627,14 +640,11 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        return result;
    }
    @Override
    protected void onResume() {
        super.onResume();
        String carIntentModel = ProfileManager.getInstance().getCarIntentModel(this);
        if (!TextUtils.isEmpty(carIntentModel)){
            carModel.setText(carIntentModel);
        }
    @Override
    protected void onDestroy() {
        super.onDestroy();
        EventBus.getDefault().unregister(this);
    }
    @Override
@@ -925,6 +935,12 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
    }
    @Override
    protected void onResume() {
        super.onResume();
        getCarOwnerCertificateList(false);
    }
    private void getCarOwnerCertificateList(Boolean showLoading) {
        if (showLoading) {
            loadDialog.show();
@@ -958,48 +974,54 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    List<CarOwnerCertificateBean> list = new ArrayList<>();
                    try {
                        list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    } catch (com.alibaba.fastjson.JSONException e) {
                    }
                    CarSeriesEntity carSeriesEntity = null;
                    // 1 去认证  2审核中  3认证车主
                    if (list.size() == 0) {
                        certificateStatus = 1;
                    } else {
                        certificateStatus = 2;
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
                        boolean isVerified=true;//是否是已认证车主
                        boolean isCarIntendedModel=true;//是否是意向车型
                    if (list.size() != 0) {
                        boolean isCertifiedOwner = true;//是否是已通过认证车主
                        boolean isVerified = true;//是否是已认证车主
                        boolean isCarIntendedModel = true;//是否是意向车型
                        Gson gson = new Gson();
                        for (CarOwnerCertificateBean bean : list) {
                            //获取已通过车主认证车型
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
                                certificateStatus = 3;
                                certificateStatus = 1;
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                isCertifiedOwner=false;
                                isCertifiedOwner = false;
                            }
                            //获取意向车型
                            if (bean.getStatus() == 2|| isCarIntendedModel){
                            if (bean.getStatus() == 2 && isCarIntendedModel) {
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                carModel.setText(entity.getSeriesName());
                                isCarIntendedModel=false;
                                if (mCarModelEntity == null){
                                    carModel.setText(entity.getSeriesName());
                                }
                                isCarIntendedModel = false;
                            }
                            //已完成车主认证功能
                            if (bean.getStatus() != 2|| isVerified){
                            if (bean.getStatus() != 2 && isVerified) {
                                certificateStatus = bean.getStatus();
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
                                isVerified=false;
                                MainApplication.userCertifiedModel = (entity.getSeriesName());
                                isVerified = false;
                            }
                        }
                    }
                    if (certificateStatus == 2) {
                    if (certificateStatus == 0) {
                        go_title.setText("认证车主");
                        go_desc.setText("审核中");
                        go_desc.setTextColor(Color.RED);
                        go_cursor.setVisibility(View.GONE);
                    } else if (certificateStatus == 3) {
                    } else if (certificateStatus == 1) {
                        go_title.setText("认证车主");
                        if (carSeriesEntity != null) {
                            go_desc.setText(carSeriesEntity.getSeriesName());
@@ -1013,7 +1035,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                        go_cursor.setVisibility(View.VISIBLE);
                    }
                    if (certificateStatus == 1 && showLoading) {
                    if (certificateStatus == -2 && showLoading) {
                        startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                    }
@@ -1030,4 +1052,65 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        });
    }
    /**
     * 意向车型Event
     */
    @Subscribe(threadMode = ThreadMode.MAIN,sticky = true)
    public void onCarModelEvent(CarIntentModelEvent event) {
        if (event != null) {
            mCarModelEntity = event.getCarModelEntity();
            carModel.setText(mCarModelEntity.getSeriesName());
            EventBus.getDefault().removeStickyEvent(event);
        }
    }
    private void requestCarIntentModel() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/add";
        long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = DES3.encode(String.valueOf(tokenTime));
        } catch (Exception e) {
            e.printStackTrace();
        }
        Map<String, String> map = new HashMap<>();
        map.put("engine_number", "yixiang");
        map.put("plate_number", "意向");
        map.put("cartype", "自用");
        map.put("userid", MainApplication.userId);
        map.put("token", token);
        Gson gson = new Gson();
        if (mCarModelEntity == null){
            return;
        }
        String chexing = gson.toJson(mCarModelEntity);
        map.put("chexing", chexing);
        OkHttpUtils.post().params(map).url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                loadDialog.dismiss();
            }
            @Override
            public void onResponse(String response) {
                loadDialog.dismiss();
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交成功", Toast.LENGTH_SHORT);
                    MainApplication.userCarIntentMode = mCarModelEntity.getSeriesName();
                    carModel.setText(mCarModelEntity.getSeriesName());
                    ProfileManager.getInstance().setCarIntentModel(SkipUserInfoActivity.this, mCarModelEntity.getSeriesName());
                } else {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交失败，请重新提交", Toast.LENGTH_SHORT);
                }
            }
        });
    }
}

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

@@ -88,6 +88,7 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import okhttp3.Call;
@@ -1138,7 +1139,13 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    List<CarOwnerCertificateBean> list =new ArrayList<>();
                    try{
                        list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    }catch (com.alibaba.fastjson.JSONException e){
                    }
                    if ("price".equals(from)) {
                        if (list.size() == 0) {
                            new AlertDialogTwo(UserCenterActivity.this).builder()

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

@@ -55,7 +55,10 @@ import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.CarOwnerCertificateBean;
import com.electric.chargingpile.data.Cars;
import com.electric.chargingpile.data.Province;
import com.electric.chargingpile.entity.CarModelEntity;
import com.electric.chargingpile.entity.CarSeriesEntity;
import com.electric.chargingpile.event.CarIntentModelEvent;
import com.electric.chargingpile.event.CarModelEvent;
import com.electric.chargingpile.manager.PreferenceManager;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
@@ -81,6 +84,9 @@ import com.umeng.analytics.MobclickAgent;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -145,8 +151,8 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
    private Uri cropImageUri;
    private static final int RC_CAMERA_PERM = 123;
    private LoadingDialog loadDialog;
    // 1.去认证车主（获得充电优惠）      > 2.认证车主             审核中  3.认证车主             宝马
    private int certificateStatus = 0; // 1 去认证  2审核中  3认证车主
    // -2 -> 去认证, -1 -> 认证失败，0 -> 审核中，1 -> 表示通过审核，2 -> 表示意向车型。
    private int certificateStatus = -2;
    private LinearLayout go_certificate;
    private TextView go_title;
    private TextView go_desc;
@@ -154,11 +160,14 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
    private LinearLayout carIntentModel;
    private TextView carModel;
    private CarModelEntity mCarModelEntity;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        BarColorUtil.initStatusBarColor(UserInfoActivity.this);
        setContentView(R.layout.activity_user_info);
        EventBus.getDefault().register(this);
        dialog = new LoadingDialog(this);
        dialog.setCanceledOnTouchOutside(false);
        mContext = this;
@@ -261,6 +270,13 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
        if (userPhone.length() == 11) {
            phone.setText(userPhone.substring(0, 3) + "****" + userPhone.substring(7, userPhone.length()));
        }
//        String carIntentModel = ProfileManager.getInstance().getCarIntentModel(this);
//
//        if (!TextUtils.isEmpty(carIntentModel)){
//            carModel.setText(carIntentModel);
//        }
    }
    private void setIcon() {
@@ -405,17 +421,20 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
                            shite("");
                        }
                    }).start();
                    if (mCarModelEntity!=null){
                        requestCarIntentModel();
                    }
                    dialog.show();
                }
                break;
            case R.id.go_certificate:
                // 1 去认证  2审核中  3认证车主
                if (certificateStatus == 0) {
                if (certificateStatus == -2) {
                    getCarOwnerCertificateList(true);
                } else if (certificateStatus == 1) {
                    startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                }
                break;
            case R.id.carIntentModel:
                CarBrandActivity.actionStart(this,"1");
@@ -1068,6 +1087,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
    @Override
    protected void onDestroy() {
        super.onDestroy();
        EventBus.getDefault().unregister(this);
    }
    private void getCarOwnerCertificateList(Boolean showLoading) {
@@ -1085,6 +1105,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId + "&order=1" + "&token=" + token;
      //  Log.e(TAG, "getCarOwnerCertificateList:  "+url );
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -1101,52 +1122,56 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
            public void onResponse(String response) {
                loadDialog.dismiss();
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                Log.e(TAG, "onResponse: "+response );
                if ("01".equals(rtnCode)) {
                    String data = JsonUtils.getKeyResult(response, "data");
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    List<CarOwnerCertificateBean> list = new ArrayList<>();
                    try {
                        list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                    } catch (com.alibaba.fastjson.JSONException e) {
                    }
                    CarSeriesEntity carSeriesEntity = null;
                    // 1 去认证  2审核中  3认证车主
                    if (list.size() == 0) {
                        certificateStatus = 1;
                    } else {
                        certificateStatus = 2;
                        boolean isCertifiedOwner=true;//是否是已通过认证车主
                        boolean isVerified=true;//是否是已认证车主
                        boolean isCarIntendedModel=true;//是否是意向车型
                    if (list.size() != 0) {
                        boolean isCertifiedOwner = true;//是否是已通过认证车主
                        boolean isVerified = true;//是否是已认证车主
                        boolean isCarIntendedModel = true;//是否是意向车型
                        Gson gson = new Gson();
                        for (CarOwnerCertificateBean bean : list) {
                            //获取已通过车主认证车型
                            if (bean.getStatus() == 1 && bean.getMain() == 1 && isCertifiedOwner) {
                                certificateStatus = 3;
                                certificateStatus = 1;
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                isCertifiedOwner=false;
                                isCertifiedOwner = false;
                            }
                            //获取意向车型
                            if (bean.getStatus() == 2|| isCarIntendedModel){
                            if (bean.getStatus() == 2 && isCarIntendedModel) {
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                carModel.setText(entity.getSeriesName());
                                isCarIntendedModel=false;
                                if (mCarModelEntity == null){
                                    carModel.setText(entity.getSeriesName());
                                }
                                isCarIntendedModel = false;
                            }
                            //已完成车主认证功能
                            if (bean.getStatus() != 2|| isVerified){
                            if (bean.getStatus() != 2 && isVerified) {
                                certificateStatus = bean.getStatus();
                                CarSeriesEntity entity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
                                MainApplication.userCertifiedModel=(entity.getSeriesName());
                                isVerified=false;
                            }
                                MainApplication.userCertifiedModel = (entity.getSeriesName());
                                isVerified = false;
                            }
                        }
                    }
                    if (certificateStatus == 2) {
                    if (certificateStatus == 0) {
                        go_title.setText("认证车主");
                        go_desc.setText("审核中");
                        go_desc.setTextColor(Color.RED);
                        go_cursor.setVisibility(View.INVISIBLE);
                    } else if (certificateStatus == 3) {
                    } else if (certificateStatus == 1) {
                        go_title.setText("认证车主");
                        if (carSeriesEntity != null) {
                            go_desc.setText(carSeriesEntity.getSeriesName());
@@ -1160,7 +1185,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
                        go_cursor.setVisibility(View.VISIBLE);
                    }
                    if (certificateStatus == 1 && showLoading) {
                    if (certificateStatus == -2 && showLoading) {
                        startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                    }
@@ -1176,4 +1201,64 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
            }
        });
    }
    /**
     * 意向车型Event
     */
    @Subscribe(threadMode = ThreadMode.MAIN,sticky = true)
    public void onCarModelEvent(CarIntentModelEvent event) {
        if (event != null) {
            mCarModelEntity = event.getCarModelEntity();
            carModel.setText(mCarModelEntity.getSeriesName());
            EventBus.getDefault().removeStickyEvent(event);
        }
    }
    private void requestCarIntentModel() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/add";
        long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = DES3.encode(String.valueOf(tokenTime));
        } catch (Exception e) {
            e.printStackTrace();
        }
        Map<String, String> map = new HashMap<>();
        map.put("engine_number", "yixiang");
        map.put("plate_number", "意向");
        map.put("cartype", "自用");
        map.put("userid", MainApplication.userId);
        map.put("token", token);
        Gson gson = new Gson();
        if (mCarModelEntity == null){
            return;
        }
        String chexing = gson.toJson(mCarModelEntity);
        map.put("chexing", chexing);
        OkHttpUtils.post().params(map).url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                loadDialog.dismiss();
            }
            @Override
            public void onResponse(String response) {
                loadDialog.dismiss();
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交成功", Toast.LENGTH_SHORT);
                    MainApplication.userCarIntentMode = mCarModelEntity.getSeriesName();
                    carModel.setText(mCarModelEntity.getSeriesName());
                    ProfileManager.getInstance().setCarIntentModel(UserInfoActivity.this, mCarModelEntity.getSeriesName());
                } else {
                    ToastUtil.showToast(getApplicationContext(), "意向车型提交失败，请重新提交", Toast.LENGTH_SHORT);
                }
            }
        });
    }
}

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

@@ -12,6 +12,7 @@ import android.util.Log;
import androidx.multidex.MultiDexApplication;
import com.alibaba.fastjson.JSONException;
import com.amap.api.maps.model.LatLng;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.Utils;
@@ -90,13 +91,13 @@ public class MainApplication extends MultiDexApplication {
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//        public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
        public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
    //	public static String url = "https://cdz.d1ev.com";
@@ -301,10 +302,17 @@ public class MainApplication extends MultiDexApplication {
                        @Override
                        public void onResponse(String response) {
                            String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                            Log.e("TAG_hyc", "onResponse: "+response );
                            if ("01".equals(rtnCode)) {
                                String chexing = "";
                                String data = JsonUtils.getKeyResult(response, "data");
                                List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                                List<CarOwnerCertificateBean> list=new ArrayList<>();
                                try {
                                    list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
                                }catch (JSONException e){
                                }
                                boolean certificated = false;
                                for (CarOwnerCertificateBean bean : list) {
                                    if (bean.getStatus()!=2){ //排除意向车型，则证明用户已经车主认证过了

app/src/main/java/com/electric/chargingpile/data/CarOwnerCertificateBean.java

@@ -10,7 +10,7 @@ public class CarOwnerCertificateBean implements Serializable {
    private String chexing;
    private String regdate;
    private String cartype;
    private int status; //状态为1 表示通过审核，状态为2表示意向车型。
    private int status; //-1 -> 认证失败，0 -> 审核中，1 -> 表示通过审核，2 -> 表示意向车型。
    private int main;
    private String addTime;
    private String errmsg;

app/src/main/java/com/electric/chargingpile/event/CarIntentModelEvent.java

@@ -0,0 +1,20 @@
package com.electric.chargingpile.event;
import com.electric.chargingpile.entity.CarModelEntity;
import com.electric.chargingpile.entity.CarSeriesEntity;
public class CarIntentModelEvent {
    private CarModelEntity carModelEntity;
    public CarIntentModelEvent(CarModelEntity carModelEntity) {
        this.carModelEntity = carModelEntity;
    }
    public CarModelEntity getCarModelEntity() {
        return carModelEntity;
    }
    public void setCarModelEntity(CarModelEntity carModelEntity) {
        this.carModelEntity = carModelEntity;
    }
}

app/src/main/res/layout/activity_skip_user_info.xml

@@ -172,7 +172,7 @@
                android:background="@color/ui_line"
                android:visibility="gone" />
            <RelativeLayout
            <LinearLayout
                android:id="@+id/go_certificate"
                android:layout_width="fill_parent"
                android:layout_height="45dp"
@@ -184,10 +184,13 @@
                    android:layout_height="match_parent"
                    android:gravity="center"
                    android:paddingLeft="15dp"
                    android:text="去认证车主（获得充电优惠）"
                    android:text="去认证车主"
                    android:textColor="@color/color_f9f9f9"
                    android:textSize="14dp" />
                <View
                    android:layout_weight="1"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"/>
                <TextView
                    android:id="@+id/go_desc"
                    android:layout_width="wrap_content"
@@ -215,8 +218,8 @@
                    android:layout_marginRight="15dp"
                    android:src="@drawable/icon_more2_0" />
            </RelativeLayout>
            <RelativeLayout
            </LinearLayout>
            <LinearLayout
                android:id="@+id/carIntentModel"
                android:layout_width="fill_parent"
                android:layout_height="45dp"
@@ -231,21 +234,10 @@
                    android:textColor="@color/color_f9f9f9"
                    android:textSize="14sp"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="45dp"
                    android:layout_alignParentTop="true"
                    android:layout_alignParentEnd="true"
                    android:layout_alignParentRight="true"
                    android:layout_marginRight="15dp"
                    android:background="@color/white"
                    android:gravity="center|right"
                    android:singleLine="true"
                    android:textColor="@color/ui_62"
                    android:textColorHint="@color/ui_68"
                    android:textSize="15sp"
                    tools:text="审核中" />
                <View
                    android:layout_weight="1"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"/>
                <TextView
                    android:id="@+id/carModel"
                    android:layout_marginEnd="15dp"
@@ -271,7 +263,7 @@
                    android:layout_marginRight="15dp"
                    android:src="@drawable/icon_more2_0" />
            </RelativeLayout>
            </LinearLayout>
            <RelativeLayout
                android:id="@+id/rl_select_car"

app/src/main/res/layout/activity_user_info.xml

@@ -252,7 +252,7 @@
                    />
                <ImageView
                    android:paddingEnd="14dp"
                   android:paddingStart="9dp"
                    android:paddingStart="9dp"
                    android:src="@drawable/icon_more2_0"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"/>

zxing/src/main/java/com/google/zxing/client/android/constant/UrlConstants.java

@@ -1,8 +1,8 @@
package com.google.zxing.client.android.constant;
public interface UrlConstants {
    String HOST_URL = "http://cdz.evcharge.cc/zhannew/basic/web/index.php/";
//    String HOST_URL = "http://59.110.68.162/zhannew/basic/web/index.php/";
//    String HOST_URL = "http://cdz.evcharge.cc/zhannew/basic/web/index.php/";
    String HOST_URL = "http://59.110.68.162/zhannew/basic/web/index.php/"; //测试链接
    String USER_CHARGING_CHECK_URL = HOST_URL + "api/charge/check-user";
    String START_CHARGING_URL = HOST_URL + "api/charge/start";