代码修改

1.取消代码混淆
2.bug修复

app/build.gradle

@@ -82,7 +82,7 @@ android {
            zipAlignEnabled true
            // 移除无用的resource文件
            //启用代码混淆
            minifyEnabled true
            minifyEnabled false
//            shrinkResources true
            //混淆规则配置文件
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -116,7 +116,6 @@ android {
        oppo {}
        cdz {}
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {}
        productFlavors.all { flavor ->
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]

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="97"
    android:versionName="3.5.11">
    android:versionCode="98"
    android:versionName="3.5.12">
    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

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

@@ -2,19 +2,16 @@ package com.electric.chargingpile.application;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.StrictMode;
import androidx.multidex.MultiDexApplication;
import android.text.TextUtils;
import android.util.Log;
import androidx.multidex.MultiDexApplication;
import com.amap.api.maps.model.LatLng;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.Utils;
@@ -23,7 +20,6 @@ import com.electric.chargingpile.data.AdDetail;
import com.electric.chargingpile.data.Zhan;
import com.electric.chargingpile.gen.DaoMaster;
import com.electric.chargingpile.gen.DaoSession;
import com.electric.chargingpile.manager.PreferenceManager;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.SharedPreferencesHelper;
import com.mob.MobSDK;
@@ -35,9 +31,6 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.tencent.bugly.crashreport.CrashReport;
import com.zhy.http.okhttp.OkHttpUtils;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -77,7 +70,7 @@ 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 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/";
@@ -156,6 +149,7 @@ public class MainApplication extends MultiDexApplication {
        LogUtils.getConfig().setLogSwitch(true);
        CrashReport.initCrashReport(getApplicationContext(), "900010422", BuildConfig.DEBUG);
        CrashReport.setAppChannel(getApplicationContext(), BuildConfig.FLAVOR);
        initImageLoader(getApplicationContext());
        try {

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

@@ -8,22 +8,30 @@ public class CarTypeUtil {
    public static String getCarType(String s) {
        String car = "";
        String name0 = "", name1 = "";
        String chexing = s;
        String[] strarray = chexing.split("\\$\\$");
        if (strarray.length > 1) {
            name0 = strarray[0];//江淮
            name1 = strarray[1];//iEV3
        } else {
            name0 = strarray[0];
        }
        if (chexing.equals("$$") || chexing == null || chexing.equals("") || chexing.equals("null") || chexing.equals("品牌$$车型") || chexing.equals("null$$null")) {
            car = "";
        } else if (chexing.equals("待购")) {
            car = "待购";
        } else {
            car = name0 + name1;
        try {
            String name0 = "", name1 = "";
            String chexing = s;
            if (chexing.equals("$$") || chexing == null || chexing.equals("") || chexing.equals("null") || chexing.equals("品牌$$车型") || chexing.equals("null$$null")) {
                car = "";
            } else if (chexing.equals("待购")) {
                car = "待购";
            } else {
                if (chexing.contains("$$")) {
                    String[] strarray = chexing.split("\\$\\$");
                    if (strarray.length > 1) {
                        name0 = strarray[0];//江淮
                        name1 = strarray[1];//iEV3
                    } else {
                        name0 = strarray[0];
                    }
                    car = name0 + name1;
                }
            }
        }catch (Exception e) {
            e.printStackTrace();
        }
        return car;
    }
}

app/src/main/java/com/electric/chargingpile/view/LetterSideView.java

@@ -62,6 +62,8 @@ public class LetterSideView extends View {
    @Override
    protected void onDraw(Canvas canvas) {
        super.onDraw(canvas);
        if (paint == null)
            return;
        // 循环绘制字母
        for (int i = 0; i < letters.length; i++) {
            //paint.setTypeface(Typeface.DEFAULT_BOLD); // 设置默认字体加粗