Browse Source

3.5.16 版本

hy 3 years ago
parent
commit
74f12ef278

+ 2 - 2
app/src/main/AndroidManifest.xml

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="100"
6
    android:versionName="3.5.14">
5
    android:versionCode="102"
6
    android:versionName="3.5.16">
7
7
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

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

213
            case R.id.tv_gocomment:
213
            case R.id.tv_gocomment:
214
                if (TextUtils.isEmpty(mRedEnvelopeId)){
214
                if (TextUtils.isEmpty(mRedEnvelopeId)){
215
                    pollingChargingStats();
215
                    pollingChargingStats();
216
217
                }else{
216
                }else{
218
                    requestComment();
217
                    requestComment();
219
                }
218
                }

+ 25 - 17
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

2816
2816
2817
    @Override
2817
    @Override
2818
    public void onPermissionsDenied(int requestCode, List<String> perms) {
2818
    public void onPermissionsDenied(int requestCode, List<String> perms) {
2819
        if (SystemTypeUtil.isEmui()) {
2820
            return;
2821
        }
2822
        if (requestCode == RC_CAMERA_PERM) {
2823
            new AlertDialogCommon(MainMapActivity.this).builder()
2824
                    .setMsg("扫码充电需要开启位置权限,是否前往开启?")
2819
//        if (SystemTypeUtil.isEmui()) {
2820
//            return;
2821
//        }
2822
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
2823
            if (requestCode == RC_CAMERA_PERM) {
2824
                new AlertDialogCommon(MainMapActivity.this).builder()
2825
                    .setMsg("扫码充电需要相机权限,请在点击去开启,选择权限->相机开启相机权限。")
2825
                    .setPositiveButton("去开启", new View.OnClickListener() {
2826
                    .setPositiveButton("去开启", new View.OnClickListener() {
2826
                        @Override
2827
                        @Override
2827
                        public void onClick(View v) {
2828
                        public void onClick(View v) {
2831
                @Override
2832
                @Override
2832
                public void onClick(View v) {
2833
                public void onClick(View v) {
2833
                }
2834
                }
2834
            }).show();
2835
        } else if (requestCode == RC_Location_PERM) {
2836
            new AlertDialogCommon(MainMapActivity.this).builder()
2837
                    .setMsg("为了定位您的位置,推荐充电桩,充电桩位置路线导航需要开启位置权限,是否前往开启?")
2838
                    .setPositiveButton("去开启", new View.OnClickListener() {
2835
                }).show();
2836
            } else if (requestCode == RC_Location_PERM) {
2837
                    new AlertDialogCommon(MainMapActivity.this).builder()
2838
                            .setMsg("为了定位您的位置,推荐充电桩,充电桩位置路线导航需要开启位置权限,是否前往开启?")
2839
                            .setPositiveButton("去开启", new View.OnClickListener() {
2840
                                @Override
2841
                                public void onClick(View v) {
2842
                                    SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
2843
                                }
2844
                            }).setNegativeButton("取消", new View.OnClickListener() {
2839
                        @Override
2845
                        @Override
2840
                        public void onClick(View v) {
2846
                        public void onClick(View v) {
2841
                            SystemTypeUtil.goToPermissionManager(MainMapActivity.this);
2842
                        }
2847
                        }
2843
                    }).setNegativeButton("取消", new View.OnClickListener() {
2844
                @Override
2845
                public void onClick(View v) {
2846
                }
2847
            }).show();
2848
                    }).show();
2849
            }
2848
        }
2850
        }
2851
2849
    }
2852
    }
2850
2853
2851
    @Override
2854
    @Override
2887
2890
2888
    @AfterPermissionGranted(RC_CAMERA_PERM)
2891
    @AfterPermissionGranted(RC_CAMERA_PERM)
2889
    public void requestCameraPermission() {
2892
    public void requestCameraPermission() {
2893
        Log.e(TAG, "requestCameraPermission: 调用了1" );
2890
        if (hasCameraPermission()) {
2894
        if (hasCameraPermission()) {
2895
            Log.e(TAG, "requestCameraPermission: 调用了2" );
2896
2891
            Intent intent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
2897
            Intent intent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
2892
            intent.putExtra("url", MainApplication.url);
2898
            intent.putExtra("url", MainApplication.url);
2893
            intent.putExtra("user_id", MainApplication.userId);
2899
            intent.putExtra("user_id", MainApplication.userId);
2902
                count = 2;
2908
                count = 2;
2903
            }
2909
            }
2904
        } else {
2910
        } else {
2911
            Log.e(TAG, "requestCameraPermission: 调用了3" );
2912
2905
            EasyPermissions.requestPermissions(
2913
            EasyPermissions.requestPermissions(
2906
                    this,
2914
                    this,
2907
                    "扫码充电需要开启相机权限,是否前往开启?",
2915
                    "扫码充电需要开启相机权限,是否前往开启?",

+ 10 - 2
app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java

19
19
20
import com.electric.chargingpile.BuildConfig;
20
import com.electric.chargingpile.BuildConfig;
21
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.R;
22
import com.electric.chargingpile.application.MainApplication;
22
import com.electric.chargingpile.manager.ProfileManager;
23
import com.electric.chargingpile.manager.ProfileManager;
23
import com.electric.chargingpile.util.BarColorUtil;
24
import com.electric.chargingpile.util.BarColorUtil;
24
import com.electric.chargingpile.view.AlertDialogCommon;
25
import com.electric.chargingpile.view.AlertDialogCommon;
25
import com.google.gson.internal.GsonBuildConfig;
26
import com.google.gson.internal.GsonBuildConfig;
27
import com.mob.MobSDK;
28
import com.mob.OperationCallback;
26
29
27
public class PrivacyAgreementActivity extends Activity {
30
public class PrivacyAgreementActivity extends Activity {
28
31
34
        setContentView(R.layout.activity_privacy_agreement);
37
        setContentView(R.layout.activity_privacy_agreement);
35
        BarColorUtil.initStatusBarColor(PrivacyAgreementActivity.this);
38
        BarColorUtil.initStatusBarColor(PrivacyAgreementActivity.this);
36
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
39
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
40
            initMobSDK();
37
            Log.e("TAG_HYC", "onCreate:  getPrivacyAgreement" );
41
            Log.e("TAG_HYC", "onCreate:  getPrivacyAgreement" );
38
            startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
42
            startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
39
            finish();
43
            finish();
42
            startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
46
            startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
43
            finish();
47
            finish();
44
        } */else {
48
        } */else {
45
            Log.e("TAG_HYC", "onCreate:  initView" );
46
            initView();
49
            initView();
47
        }
50
        }
48
    }
51
    }
73
            @Override
76
            @Override
74
            public void updateDrawState(TextPaint ds) {
77
            public void updateDrawState(TextPaint ds) {
75
                ds.setColor(Color.parseColor("#39C663"));
78
                ds.setColor(Color.parseColor("#39C663"));
76
                ds.setUnderlineText(false);
79
                ds.setUnderlineText(true);
77
                ds.setFakeBoldText(true);
80
                ds.setFakeBoldText(true);
78
                ds.setTextSize(40);
81
                ds.setTextSize(40);
79
            }
82
            }
102
        agreement_btn.setOnClickListener(new View.OnClickListener() {
105
        agreement_btn.setOnClickListener(new View.OnClickListener() {
103
            @Override
106
            @Override
104
            public void onClick(View v) {
107
            public void onClick(View v) {
108
                initMobSDK();
105
                startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
109
                startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
106
                finish();
110
                finish();
107
            }
111
            }
129
            }
133
            }
130
        });
134
        });
131
    }
135
    }
136
137
    private void initMobSDK() {
138
        MobSDK.init(MainApplication.context);
139
    }
132
}
140
}

+ 13 - 3
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

1176
                        if (list.size() == 0) {
1176
                        if (list.size() == 0) {
1177
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1177
                            startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1178
                        } else {
1178
                        } else {
1179
                            Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
1180
                            intent.putExtra("data", data);
1181
                            startActivity(intent);
1179
                            boolean isType=false ;
1180
                            for (int i = 0; i < list.size(); i++) {
1181
                                if (list.get(i).getStatus()!= 2){ //不等于2 则表示为认证车型
1182
                                    isType=true;
1183
                                }
1184
                            }
1185
                            if (isType){
1186
                                Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
1187
                                intent.putExtra("data", data);
1188
                                startActivity(intent);
1189
                            }else{
1190
                                startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1191
                            }
1182
                        }
1192
                        }
1183
                    } else if ("init".equals(from)) {
1193
                    } else if ("init".equals(from)) {
1184
                        boolean certificated = false;
1194
                        boolean certificated = false;

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

162
            builder.detectFileUriExposure();
162
            builder.detectFileUriExposure();
163
        }
163
        }
164

164

165
        MobSDK.init(this);
165
//        MobSDK.init(this);
166

166

167
        instances = this;
167
        instances = this;
168
        setDatabase();
168
        setDatabase();

+ 1 - 1
app/src/main/java/com/electric/chargingpile/data/CarOwnerCertificateBean.java

11
    private String regdate;
11
    private String regdate;
12
    private String cartype;
12
    private String cartype;
13
    private int status; //-1 -> 认证失败,0 -> 审核中,1 -> 表示通过审核,2 -> 表示意向车型。
13
    private int status; //-1 -> 认证失败,0 -> 审核中,1 -> 表示通过审核,2 -> 表示意向车型。
14
    private int main;
14
    private int main;  //是否为主车型 1为主车型
15
    private String addTime;
15
    private String addTime;
16
    private String errmsg;
16
    private String errmsg;
17
17

+ 1 - 1
app/src/main/java/com/electric/chargingpile/util/Util.java

620
        }else if (bean.getType().equals("8")){
620
        }else if (bean.getType().equals("8")){
621
            String format = getDisCount(bean);
621
            String format = getDisCount(bean);
622
            if (maxMoney.equals("0") || maxMoney.equals("")){
622
            if (maxMoney.equals("0") || maxMoney.equals("")){
623
                str="服务费"+format+"折";
623
                str="订单费"+format+"折";
624
            }else{
624
            }else{
625
                str="订单费"+format+"折,满"+maxMoney+"元可用";
625
                str="订单费"+format+"折,满"+maxMoney+"元可用";
626
            }
626
            }

+ 1 - 1
app/src/main/res/layout/activity_car_owner_certificate.xml

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

+ 1 - 1
app/src/main/res/layout/activity_skip_user_info.xml

243
                    android:layout_marginEnd="15dp"
243
                    android:layout_marginEnd="15dp"
244
                    android:layout_width="wrap_content"
244
                    android:layout_width="wrap_content"
245
                    android:layout_height="match_parent"
245
                    android:layout_height="match_parent"
246
                    android:text="首次选择意向车型(得充电余额)"
246
                    android:text="首次选择意向车型(得充电优惠)"
247
                    android:textColor="#ff0e0e0e"
247
                    android:textColor="#ff0e0e0e"
248
                    android:textSize="14sp"
248
                    android:textSize="14sp"
249
                    android:layout_alignParentRight="true"
249
                    android:layout_alignParentRight="true"

+ 1 - 1
app/src/main/res/layout/activity_user_info.xml

246
                    android:gravity="center"
246
                    android:gravity="center"
247
                    android:layout_width="wrap_content"
247
                    android:layout_width="wrap_content"
248
                    android:layout_height="match_parent"
248
                    android:layout_height="match_parent"
249
                    android:text="首次选择意向车型(得充电余额)"
249
                    android:text="首次选择意向车型(得充电优惠)"
250
                    android:textColor="#ff0e0e0e"
250
                    android:textColor="#ff0e0e0e"
251
                    android:textSize="14sp"
251
                    android:textSize="14sp"
252
                    />
252
                    />