需求完善

app/build.gradle

@@ -81,7 +81,7 @@ android {
            zipAlignEnabled true
            // 移除无用的resource文件
            //启用代码混淆
            minifyEnabled true
            minifyEnabled false
//            shrinkResources true
            //混淆规则配置文件
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

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

@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -48,8 +49,14 @@ public class CarBrandActivity extends AppCompatActivity implements View.OnClickL
        CarBrandEvent event = EventBus.getDefault().removeStickyEvent(CarBrandEvent.class);
        if (event != null) {
            groups = event.getGroups();
            Log.e("abs======================",   groups.size() + "");
            String[] letters = new String[groups.size()];
            for (int i = 0; i < groups.size(); i++) {
                letters[i] = groups.get(i).getInitial();
                Log.e("abs======================",   letters[i] + "+" + groups.get(i).getInitial());
            }
//            LetterSideView.letters = letters;
        }
        findViewById(R.id.iv_back).setOnClickListener(this::onClick);
        letter_side_view = findViewById(R.id.letter_side_view);
        text_view_dialog = findViewById(R.id.text_view_dialog);
@@ -75,11 +82,6 @@ public class CarBrandActivity extends AppCompatActivity implements View.OnClickL
            }
        });
        String[] letters = new String[groups.size()];
        for (int i = 0; i < groups.size(); i++) {
            letters[i] = groups.get(i).getInitial();
        }
        LetterSideView.letters = letters;
        letter_side_view.setVisibility(View.VISIBLE);
        recycler_view = (RecyclerView) findViewById(R.id.recycler_view);

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

@@ -16,6 +16,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
@@ -573,6 +574,7 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
        long updatetime1 = appTime11 - MainMapActivity.cha - 5;
        String token1 = String.valueOf(updatetime1);
        String encode_token = null;
        try {
            encode_token = DES3.encode(token1);
        } catch (Exception e) {

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

@@ -17,12 +17,14 @@ import com.electric.chargingpile.adapter.CarOwnerCertificateListAdapter;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.CarOwnerCertificateBean;
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.google.gson.Gson;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.net.URLEncoder;
import java.util.List;
import okhttp3.Call;
@@ -107,7 +109,17 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
    private void deleteCarOwnerCertificate(int id) {
        loadDialog.show();
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/del?userid=" + MainApplication.userId + "&id=" + id;
        long appTime = System.currentTimeMillis() / 1000;
        long updateTime = appTime - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
        } catch (Exception e) {
            e.printStackTrace();
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/del?userid=" + MainApplication.userId + "&id=" + id + "&token=" + token;
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -132,9 +144,19 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
        });
    }
    private void setCarOwnerCertificateMain(int id) {
        loadDialog.show();
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/setmain?userid=" + MainApplication.userId + "&id=" + id;
        long appTime = System.currentTimeMillis() / 1000;
        long updateTime = appTime - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
        } catch (Exception e) {
            e.printStackTrace();
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/setmain?userid=" + MainApplication.userId + "&id=" + id + "&token=" + token;
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -159,7 +181,16 @@ public class CarOwnerCertificateListActivity extends AppCompatActivity {
    }
    private void getCarOwnerCertificateList() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId;
        long appTime = System.currentTimeMillis() / 1000;
        long updateTime = appTime - MainMapActivity.cha - 1;
        String token = null;
        try {
            token = URLEncoder.encode(DES3.encode(String.valueOf(updateTime)));
        } catch (Exception e) {
            e.printStackTrace();
        }
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId + "&token=" + token;
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {

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

@@ -440,13 +440,13 @@ public class ChargingQianDaoActivity extends Activity implements View.OnClickLis
                    iv_success.setOnClickListener(new View.OnClickListener() {
                        @Override
                        public void onClick(View view) {
                            if (!MainApplication.userCar.equals("") && !MainApplication.userCar.equals("nullnull")
                                    && !MainApplication.userCar.equals("null$$null") && !MainApplication.userCar.equals("$$")
                                    && MainApplication.userCar.length() > 0 && !MainApplication.userCar.equals("待购")) {
//                            if (!MainApplication.userCar.equals("") && !MainApplication.userCar.equals("nullnull")
//                                    && !MainApplication.userCar.equals("null$$null") && !MainApplication.userCar.equals("$$")
//                                    && MainApplication.userCar.length() > 0 && !MainApplication.userCar.equals("待购")) {
                                qiandao(1 + "");
                            } else {
                                ToastUtil.showToast(getApplicationContext(), "请您绑定车型继续提交", Toast.LENGTH_SHORT);
                            }
//                            } else {
//                                ToastUtil.showToast(getApplicationContext(), "请您绑定车型继续提交", Toast.LENGTH_SHORT);
//                            }
                        }

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

@@ -619,7 +619,6 @@ public class RegisterActivity extends Activity implements OnClickListener {
                @Override
                public void onResponse(String response) {
//                    Log.e(TAG, "onResponse: "+response );
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                    if ("01".equals(rtnCode)) {
                        String data = JsonUtils.getKeyResult(response, "data");
@@ -647,7 +646,6 @@ public class RegisterActivity extends Activity implements OnClickListener {
    }
    private void saveUserInfo(String info) {
//        Log.e(TAG, "saveUserInfo: "+info );
        String userid = JsonUtils.getKeyResult(info, "userid");
        String nickname = JsonUtils.getKeyResult(info, "nickname");
        String tel = JsonUtils.getKeyResult(info, "tel");

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

@@ -107,8 +107,8 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
    String chexing;
    public static final int REQUSET = 11;
    String select_pinpai = "", select_chexing = "";
    private TextView tv_point, tv_buy;
    private RelativeLayout rl_point, rl_isBuy;
    private TextView tv_point;
    private RelativeLayout rl_point;
    private Bitmap download_bmp;
    private File fileUri = new File(Environment.getExternalStorageDirectory().getPath() + "/photo.jpg");
    private File fileCropUri = new File(Environment.getExternalStorageDirectory().getPath() + "/crop_photo.jpg");
@@ -130,10 +130,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
    }
    private void initView() {
        rl_isBuy = (RelativeLayout) findViewById(R.id.rl_isBuy);
        rl_isBuy.setOnClickListener(this);
        rl_point = (RelativeLayout) findViewById(R.id.rl_point);
        tv_buy = (TextView) findViewById(R.id.tv_buy);
        tv_point = (TextView) findViewById(R.id.tv_point);
        et_car = (TextView) findViewById(R.id.et_che);
@@ -181,8 +178,6 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        });
        iconPic = (RoundImageView) findViewById(R.id.iv_user_icon);
//        setIcon();
        tv_save = (TextView) findViewById(R.id.tv_make_sure);
        tv_save.setOnClickListener(this);
@@ -407,85 +402,12 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
            spinnerCity.setSelection(default_type);
            default_type = -1;
        }
//		if (currentProvince.getCities().size() > 0) {
//			cityAdapter.notifyDataSetChanged();
//			spinnerCity.setSelection(0);
//		}
    }
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.rl_isBuy:
                LayoutInflater inflater1 = (LayoutInflater) getSystemService(mContext.LAYOUT_INFLATER_SERVICE);
                View popupWindowView = inflater1.inflate(R.layout.layout_isbuy, null);
                final PopupWindow popupWindow1 = new PopupWindow(popupWindowView,
                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
                        true);
                popupWindow1.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_yinying531));
                popupWindow1.setOutsideTouchable(true);
                popupWindowView.setOnKeyListener(new View.OnKeyListener() {
                    @Override
                    public boolean onKey(View v, int keyCode, KeyEvent event) {
                        if ((keyCode == KeyEvent.KEYCODE_MENU) && (popupWindow1.isShowing())) {
                            popupWindow1.dismiss();
                            return true;
                        }
                        return false;
                    }
                });
                popupWindowView.setOnTouchListener(new View.OnTouchListener() {
                    @Override
                    public boolean onTouch(View v, MotionEvent event) {
                        if (popupWindow1.isShowing()) {
                            popupWindow1.dismiss();
                        }
                        return false;
                    }
                });
                // 设置PopupWindow的弹出和消失效果
                popupWindow1.setAnimationStyle(R.style.popupAnimation);
                Button cancleButton = (Button) popupWindowView
                        .findViewById(R.id.cancleButton);
                cancleButton.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View view) {
                        popupWindow1.dismiss();
                    }
                });
                Button btn_one = (Button) popupWindowView.findViewById(R.id.tvTwo);
                btn_one.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View view) {
                        tv_buy.setText("已购买");
                        rl_select_car.setVisibility(View.VISIBLE);
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
//                        ((Activity) mContext).startActivityForResult(intent, 2);
                        popupWindow1.dismiss();
                    }
                });
                Button btn_two = (Button) popupWindowView.findViewById(R.id.tvThree);
                btn_two.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View view) {
                        tv_buy.setText("未购买");
                        rl_select_car.setVisibility(View.GONE);
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
//                        intent.setDataAndType(
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
//                                "image/*");
//                        startActivityForResult(intent, 1);
                        popupWindow1.dismiss();
                    }
                });
                popupWindow1.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
                break;
            case R.id.rl_select_car:
                startActivityForResult(new Intent(SkipUserInfoActivity.this, SelectCarActivity.class), REQUSET);
                break;
@@ -548,24 +470,12 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
    private boolean checkText() {
        String nickName = et_nickName.getText().toString().trim();
        String isBuy = tv_buy.getText().toString().trim();
        String carType = et_car.getText().toString().trim();
        if (TextUtils.isEmpty(nickName)) {
            Toast.makeText(this, "请输入您的昵称", Toast.LENGTH_SHORT).show();
            return false;
        }
        if (TextUtils.isEmpty(isBuy)) {
            Toast.makeText(this, "请选择您是否购买了新能源汽车", Toast.LENGTH_SHORT).show();
            return false;
        }
        if (isBuy.equals("已购买")) {
            if (TextUtils.isEmpty(carType)) {
                Toast.makeText(this, "请选择您购买的车型", Toast.LENGTH_SHORT).show();
                return false;
            }
        }
        return true;
    }
@@ -600,18 +510,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
        Log.i("cha---", MainMapActivity.cha + "");
        String token = String.valueOf(updatetime);
        Log.i("token---", token);
        if (tv_buy.getText().toString().equals("未购买")) {
            havecar = "待购";
        } else {
            if (null != car_type && null != car_brand) {
                havecar = car_brand + "$$" + car_type;
            }
        }
        nocar = "";
        try {
            if (photo != null) {

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

@@ -49,6 +49,7 @@ import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.Adin;
import com.electric.chargingpile.data.CarOwnerCertificateBean;
import com.electric.chargingpile.entity.CarSeriesEntity;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.JsonUtils;
@@ -65,6 +66,7 @@ import com.electric.chargingpile.view.SignInDialog;
import com.google.android.gms.appindexing.Action;
import com.google.android.gms.appindexing.AppIndex;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.gson.Gson;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
import com.squareup.picasso.Picasso;
@@ -172,6 +174,7 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
     */
    private GoogleApiClient client;
    private ImageView chat_share_bar;
    private TextView car_owner_certificate_label;
    //把一个url的网络图片变成一个本地的BitMap
    public Bitmap returnBitMap(final String url) {
@@ -365,6 +368,8 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
        llPerson = (RelativeLayout) findViewById(R.id.ll_person);
        llPerson.setOnClickListener(this);
        car_owner_certificate_label = findViewById(R.id.car_owner_certificate_label);
        //登陆按钮
        userLogin = (TextView) findViewById(R.id.userLogin);
        userLogin.setOnClickListener(this);
@@ -431,6 +436,8 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
        set_loginShow();
        getCarOwnerCertificateList("init");
    }
    private void getSharePrompt(String user_id) {
@@ -1097,7 +1104,7 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                            intent.putExtra("url", "https://www.d1ev.com/special/models/wap/webView/index.html");
                            startActivity(intent);
                        }
                    } else {
                    } else if ("certificate".equals(from)) {
                        if (list.size() == 0) {
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                        } else {
@@ -1105,6 +1112,24 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                            intent.putExtra("data", data);
                            startActivity(intent);
                        }
                    } else if ("init".equals(from)) {
                        boolean certificated = false;
                        String chexing = "";
                        for (CarOwnerCertificateBean bean : list) {
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
                                certificated = true;
                                chexing = bean.getChexing();
                                break;
                            }
                        }
                        if (certificated) {
                            Gson gson = new Gson();
                            CarSeriesEntity carSeriesEntity = gson.fromJson(chexing, CarSeriesEntity.class);
                            car_owner_certificate_label.setText(carSeriesEntity.getSeriesName());
                        } else {
                            car_owner_certificate_label.setText("认证车主得充电红包");
                        }
                    }
                } else {
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");

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

@@ -158,55 +158,6 @@
            <View
                android:layout_width="match_parent"
                android:layout_height="0.5dp"
                android:background="@color/in_line"
                android:layout_marginLeft="16dp" />
            <RelativeLayout
                android:id="@+id/rl_isBuy"
                android:layout_width="fill_parent"
                android:background="@color/white"
                android:layout_height="45dp"
                android:visibility="visible">
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:text="是否购买新能源汽车"
                    android:textColor="@color/title_row"
                    android:textSize="15sp"
                    android:paddingLeft="16dp"
                    android:gravity="center"/>
                <TextView
                    android:id="@+id/tv_buy"
                    android:layout_width="wrap_content"
                    android:layout_height="45dp"
                    android:background="@color/white"
                    android:hint="请选择"
                    android:textColorHint="@color/hintColor"
                    android:gravity="center|right"
                    android:singleLine="true"
                    android:textColor="@color/ui_62"
                    android:textSize="15sp"
                    android:layout_alignParentTop="true"
                    android:layout_marginRight="8dp"
                    android:layout_toLeftOf="@+id/imageView14"
                    android:layout_toStartOf="@+id/imageView14" />
                <ImageView
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:src="@drawable/icon_more2_0"
                    android:layout_centerVertical="true"
                    android:layout_alignParentRight="true"
                    android:layout_alignParentEnd="true"
                    android:layout_marginRight="16dp"
                    android:id="@+id/imageView14" />
            </RelativeLayout>
            <View
                android:layout_width="match_parent"
                android:layout_height="0.5dp"
                android:background="@color/ui_line"
                android:layout_marginLeft="16dp"
                android:visibility="visible"/>

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

@@ -501,6 +501,17 @@
                            android:textSize="15sp" />
                        <TextView
                            android:id="@+id/car_owner_certificate_label"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_toLeftOf="@+id/iv_certificate_cursor"
                            android:text=""
                            android:textSize="14sp"
                            android:gravity="center_vertical"
                            android:layout_marginRight="12dp"
                            android:textColor="@color/lvse"/>
                        <TextView
                            android:id="@+id/iv_certificate_cursor"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentTop="true"
@@ -543,6 +554,17 @@
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_toLeftOf="@+id/iv_price_cursor"
                            android:text="发表成交价得充电红包"
                            android:textSize="14sp"
                            android:gravity="center_vertical"
                            android:layout_marginRight="12dp"
                            android:textColor="@color/lvse"/>
                        <TextView
                            android:id="@+id/iv_price_cursor"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentTop="true"
                            android:layout_alignParentRight="true"