3.5.16 版本

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="100"
    android:versionName="3.5.14">
    android:versionCode="102"
    android:versionName="3.5.16">
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

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

@@ -213,7 +213,6 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
            case R.id.tv_gocomment:
                if (TextUtils.isEmpty(mRedEnvelopeId)){
                    pollingChargingStats();
                }else{
                    requestComment();
                }

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

@@ -2816,12 +2816,13 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        if (SystemTypeUtil.isEmui()) {
            return;
        }
        if (requestCode == RC_CAMERA_PERM) {
            new AlertDialogCommon(MainMapActivity.this).builder()
                    .setMsg("扫码充电需要开启位置权限，是否前往开启?")
//        if (SystemTypeUtil.isEmui()) {
//            return;
//        }
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
            if (requestCode == RC_CAMERA_PERM) {
                new AlertDialogCommon(MainMapActivity.this).builder()
                    .setMsg("扫码充电需要相机权限，请在点击去开启，选择权限->相机开启相机权限。")
                    .setPositiveButton("去开启", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
@@ -2831,21 +2832,23 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                @Override
                public void onClick(View v) {
                }
            }).show();
        } else if (requestCode == RC_Location_PERM) {
            new AlertDialogCommon(MainMapActivity.this).builder()
                    .setMsg("为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?")
                    .setPositiveButton("去开启", new View.OnClickListener() {
                }).show();
            } else if (requestCode == RC_Location_PERM) {
                    new AlertDialogCommon(MainMapActivity.this).builder()
                            .setMsg("为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?")
                            .setPositiveButton("去开启", new View.OnClickListener() {
                                @Override
                                public void onClick(View v) {
                                    SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
                                }
                            }).setNegativeButton("取消", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
                        }
                    }).setNegativeButton("取消", new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                }
            }).show();
                    }).show();
            }
        }
    }
    @Override
@@ -2887,7 +2890,10 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    @AfterPermissionGranted(RC_CAMERA_PERM)
    public void requestCameraPermission() {
        Log.e(TAG, "requestCameraPermission: 调用了1" );
        if (hasCameraPermission()) {
            Log.e(TAG, "requestCameraPermission: 调用了2" );
            Intent intent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
            intent.putExtra("url", MainApplication.url);
            intent.putExtra("user_id", MainApplication.userId);
@@ -2902,6 +2908,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                count = 2;
            }
        } else {
            Log.e(TAG, "requestCameraPermission: 调用了3" );
            EasyPermissions.requestPermissions(
                    this,
                    "扫码充电需要开启相机权限，是否前往开启?",

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

@@ -19,10 +19,13 @@ import android.widget.TextView;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.view.AlertDialogCommon;
import com.google.gson.internal.GsonBuildConfig;
import com.mob.MobSDK;
import com.mob.OperationCallback;
public class PrivacyAgreementActivity extends Activity {
@@ -34,6 +37,7 @@ public class PrivacyAgreementActivity extends Activity {
        setContentView(R.layout.activity_privacy_agreement);
        BarColorUtil.initStatusBarColor(PrivacyAgreementActivity.this);
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
            initMobSDK();
            Log.e("TAG_HYC", "onCreate:  getPrivacyAgreement" );
            startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
            finish();
@@ -42,7 +46,6 @@ public class PrivacyAgreementActivity extends Activity {
            startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
            finish();
        } */else {
            Log.e("TAG_HYC", "onCreate:  initView" );
            initView();
        }
    }
@@ -73,7 +76,7 @@ public class PrivacyAgreementActivity extends Activity {
            @Override
            public void updateDrawState(TextPaint ds) {
                ds.setColor(Color.parseColor("#39C663"));
                ds.setUnderlineText(false);
                ds.setUnderlineText(true);
                ds.setFakeBoldText(true);
                ds.setTextSize(40);
            }
@@ -102,6 +105,7 @@ public class PrivacyAgreementActivity extends Activity {
        agreement_btn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                initMobSDK();
                startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
                finish();
            }
@@ -129,4 +133,8 @@ public class PrivacyAgreementActivity extends Activity {
            }
        });
    }
    private void initMobSDK() {
        MobSDK.init(MainApplication.context);
    }
}

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

@@ -1176,9 +1176,19 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                        if (list.size() == 0) {
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                        } else {
                            Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
                            intent.putExtra("data", data);
                            startActivity(intent);
                            boolean isType=false ;
                            for (int i = 0; i < list.size(); i++) {
                                if (list.get(i).getStatus()!= 2){ //不等于2 则表示为认证车型
                                    isType=true;
                                }
                            }
                            if (isType){
                                Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
                                intent.putExtra("data", data);
                                startActivity(intent);
                            }else{
                                startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
                            }
                        }
                    } else if ("init".equals(from)) {
                        boolean certificated = false;

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

@@ -162,7 +162,7 @@ public class MainApplication extends MultiDexApplication {
            builder.detectFileUriExposure();
        }
        MobSDK.init(this);
//        MobSDK.init(this);
        instances = this;
        setDatabase();

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

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

app/src/main/java/com/electric/chargingpile/util/Util.java

@@ -620,7 +620,7 @@ public class Util {
        }else if (bean.getType().equals("8")){
            String format = getDisCount(bean);
            if (maxMoney.equals("0") || maxMoney.equals("")){
                str="服务费"+format+"折";
                str="订单费"+format+"折";
            }else{
                str="订单费"+format+"折,满"+maxMoney+"元可用";
            }

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

@@ -354,7 +354,7 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="10dp"
                android:layout_marginBottom="30dp"
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.认证成功的首个车型可获得50元充电优惠券。"
                android:text="认证说明\n\n1.车型信息和行驶证主页为必填项;\n2.最多可认证三款车型;\n3.默认首款认证车型为主车型;\n4.上传行驶证详细页面，并保证所有信息清晰;\n5.首次车主认证审核通过有充电满减和折扣红包\n6.红包自发放日起有效期为一个月"
                android:textColor="#0D1120"
                android:textSize="14sp"
                app:layout_constraintBottom_toBottomOf="parent"

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

@@ -243,7 +243,7 @@
                    android:layout_marginEnd="15dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:text="首次选择意向车型（得充电余额）"
                    android:text="首次选择意向车型（得充电优惠）"
                    android:textColor="#ff0e0e0e"
                    android:textSize="14sp"
                    android:layout_alignParentRight="true"

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

@@ -246,7 +246,7 @@
                    android:gravity="center"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:text="首次选择意向车型（得充电余额）"
                    android:text="首次选择意向车型（得充电优惠）"
                    android:textColor="#ff0e0e0e"
                    android:textSize="14sp"
                    />