代码提交

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

@@ -30,7 +30,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
@@ -62,10 +61,16 @@ public class AboutActivity extends Activity implements OnClickListener, EasyPerm
        getVersion();
    }
    public void onAgreementView(View view) {
        Intent xieyiintent = new Intent(getApplication(), MyWebViewActivity.class);
        xieyiintent.putExtra("url", "http://evcharge.cc/activity/user-proto.html");
        startActivity(xieyiintent);
    }
    public void onPrivacyView(View view) {
        Intent intent = new Intent(getApplication(), IntegralDescriptionActivity.class);
        intent.putExtra("url", "http://evcharge.cc/pc/agreement.html");
        startActivity(intent);
        Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
        yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
        startActivity(yinsintent);
    }
    public void getVersion() {

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

@@ -378,7 +378,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    public static boolean isStatusBack = false;
    private static final int RC_CAMERA_PERM = 123;
    private static final int RC_Location_PERM = 124;
    private static final int RC_Location_FIRST_PERM = 124;
    private static final int RC_Location_PERM = 125;
    private String adfloatUrl = "";
@@ -726,6 +727,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        MainApplication.getInstance().initJPush();
        AutoLayout.getInstance().auto(this);
        setContentView(R.layout.activity_main_map);
        BarColorUtil.initStatusBarColor(MainMapActivity.this);
@@ -1385,6 +1387,10 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        detailsBack = false;
        changeButton();
        if (hasLocationPermission() && center == null) {
            mlocationClient.startLocation();
        }
    }
    private void searchAll() {
@@ -1446,7 +1452,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    }
    /**
     * 方法必须重写
     */
@@ -1510,10 +1515,17 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            //设置是否强制刷新WIFI，默认为强制刷新
            //mLocationOption.setWifiActiveScan(false);
            mLocationOption.setWifiScan(true);
            if (!ProfileManager.getInstance().getRequestLocationPermission(MainMapActivity.this)) {
                requestLocationPermission();
            if (ProfileManager.getInstance().getRequestLocationPermission(MainMapActivity.this)) {
                if (hasLocationPermission()) {
                    requestLocationPermission();
                }
            } else { // 首次启动
                ProfileManager.getInstance().setRequestLocationPermission(MainMapActivity.this, true);
                EasyPermissions.requestPermissions(
                        this,
                        "为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?",
                        RC_Location_FIRST_PERM,
                        Manifest.permission.ACCESS_FINE_LOCATION);
            }
        }
    }
@@ -2778,6 +2790,9 @@ 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("扫码充电需要开启位置权限，是否前往开启?")
@@ -2805,7 +2820,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                }
            }).show();
        }
    }
    @Override
@@ -2819,6 +2833,14 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                Manifest.permission.ACCESS_FINE_LOCATION
        );
    }
    @AfterPermissionGranted(RC_Location_FIRST_PERM)
    public void requestLocationFirstPermission() {
        if (hasLocationPermission()) {
            mlocationClient.startLocation();
        }
    }
    @AfterPermissionGranted(RC_Location_PERM)
    public void requestLocationPermission() {
        if (hasLocationPermission()) {
@@ -4928,6 +4950,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
     * add by hyg
     */
    private void infoViewNavigate() {
        if (!hasLocationPermission()) {
            requestLocationPermission();
            return;
        }
        if (zhanInfo == null) {
            return;
        }

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

@@ -155,10 +155,6 @@ public class MainApplication extends MultiDexApplication {
        Utils.init(this);
        LogUtils.getConfig().setLogSwitch(true);
        //极光
        JPushInterface.setDebugMode(false);
        JPushInterface.init(this);
        CrashReport.initCrashReport(getApplicationContext(), "900010422", BuildConfig.DEBUG);
        initImageLoader(getApplicationContext());
@@ -192,6 +188,12 @@ public class MainApplication extends MultiDexApplication {
        setFestival();
    }
    public void initJPush() {
        //极光
        JPushInterface.setDebugMode(false);
        JPushInterface.init(this);
    }
    public static MainApplication getInstance() {
        if (null == instances) {
            instances = new MainApplication();

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

@@ -7,6 +7,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.Window;
@@ -14,9 +15,11 @@ import android.view.WindowManager;
import com.electric.chargingpile.BuildConfig;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.sql.Date;
@@ -29,53 +32,121 @@ import java.util.Properties;
 * 如：判断手机类型、跳转到权限管理页面、设置状态栏中图文的颜色模式(深色或亮色)
 */
public class SystemTypeUtil {
    private static final String TAG = SystemTypeUtil.class.getSimpleName();
    private static final String KEY_EMUI_VERSION_CODE = "ro.build.version.emui";
    private static final String KEY_MIUI_VERSION_CODE = "ro.miui.ui.version.code";
    private static final String KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
    private static final String KEY_MIUI_INTERNAL_STORAGE = "ro.miui.internal.storage";
    private static final String TAG = "SystemTypeUtil";
    public static final String ROM_MIUI = "MIUI";
    public static final String ROM_EMUI = "EMUI";
    public static final String ROM_FLYME = "FLYME";
    public static final String ROM_OPPO = "OPPO";
    public static final String ROM_SMARTISAN = "SMARTISAN";
    public static final String ROM_VIVO = "VIVO";
    public static final String ROM_QIKU = "QIKU";
    /**
     * 是否为华为手机
     *
     * @return
     */
    public static boolean isEMUI() {
        try {
            return getProperty(KEY_EMUI_VERSION_CODE, null) != null;
        } catch (final IOException e) {
            return false;
    private static final String KEY_VERSION_MIUI = "ro.miui.ui.version.name";
    private static final String KEY_VERSION_EMUI = "ro.build.version.emui";
    private static final String KEY_VERSION_OPPO = "ro.build.version.opporom";
    private static final String KEY_VERSION_SMARTISAN = "ro.smartisan.version";
    private static final String KEY_VERSION_VIVO = "ro.vivo.os.version";
    private static String sName;
    private static String sVersion;
    // 华为
    public static boolean isEmui() {
        return check(ROM_EMUI);
    }
    // 小米
    public static boolean isMiui() {
        return check(ROM_MIUI);
    }
    // VIVO
    public static boolean isVivo() {
        return check(ROM_VIVO);
    }
    // OPPO
    public static boolean isOppo() {
        return check(ROM_OPPO);
    }
    // 魅族
    public static boolean isFlyme() {
        return check(ROM_FLYME);
    }
    // 360
    public static boolean is360() {
        return check(ROM_QIKU) || check("360");
    }
    // 锤子
    public static boolean isSmartisan() {
        return check(ROM_SMARTISAN);
    }
    public static String getName() {
        if (sName == null) {
            check("");
        }
        return sName;
    }
    /**
     * 是否为小米手机
     *
     * @return
     */
    public static boolean isMIUI() {
        try {
            return getProperty(KEY_MIUI_VERSION_CODE, null) != null
                    || getProperty(KEY_MIUI_VERSION_NAME, null) != null
                    || getProperty(KEY_MIUI_INTERNAL_STORAGE, null) != null;
        } catch (final IOException e) {
            return false;
    public static String getVersion() {
        if (sVersion == null) {
            check("");
        }
        return sVersion;
    }
    /**
     * 是否为魅族手机
     *
     * @return
     */
    public static boolean isFlyme() {
    public static boolean check(String rom) {
        if (sName != null) {
            return sName.equals(rom);
        }
        if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_MIUI))) {
            sName = ROM_MIUI;
        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_EMUI))) {
            sName = ROM_EMUI;
        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_OPPO))) {
            sName = ROM_OPPO;
        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_VIVO))) {
            sName = ROM_VIVO;
        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_SMARTISAN))) {
            sName = ROM_SMARTISAN;
        } else {
            sVersion = Build.DISPLAY;
            if (sVersion.toUpperCase().contains(ROM_FLYME)) {
                sName = ROM_FLYME;
            } else {
                sVersion = Build.UNKNOWN;
                sName = Build.MANUFACTURER.toUpperCase();
            }
        }
        return sName.equals(rom);
    }
    public static String getProp(String name) {
        String line = null;
        BufferedReader input = null;
        try {
            final Method method = Build.class.getMethod("hasSmartBar");
            return method != null;
        } catch (final Exception e) {
            return false;
            Process p = Runtime.getRuntime().exec("getprop " + name);
            input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
            line = input.readLine();
            input.close();
        } catch (IOException ex) {
            Log.e(TAG, "Unable to read prop " + name, ex);
            return null;
        } finally {
            if (input != null) {
                try {
                    input.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return line;
    }
@@ -99,7 +170,7 @@ public class SystemTypeUtil {
                e.printStackTrace();
                context.startActivity(getAppDetailSettingIntent(context));
            }
        } else if (isMIUI()) {
        } else if (isMiui()) {
//            ToastUtil.show("我是小米");
            Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
            ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
@@ -111,7 +182,7 @@ public class SystemTypeUtil {
                e.printStackTrace();
                context.startActivity(getAppDetailSettingIntent(context));
            }
        } else if (isEMUI()) {
        } else if (isEmui()) {
//            ToastUtil.show("我是华为");
            try {
                Intent intent = new Intent();

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

@@ -86,7 +86,7 @@
            android:background="@drawable/textviewhuiline_style"
            android:gravity="center"
            android:layout_below="@+id/tv_2"
            android:layout_marginTop="252px"
            android:layout_marginTop="40dp"
            android:layout_centerHorizontal="true"/>
        <TextView
@@ -101,7 +101,20 @@
        <TextView
            android:text="《用户协议和隐私政策》"
            android:text="《充电桩APP用户使用协议》"
            android:layout_width="wrap_content"
            android:layout_above="@+id/privacy"
            android:textSize="15sp"
            android:textColor="#1e90ff"
            android:layout_centerHorizontal="true"
            android:onClick="onAgreementView"
            android:clickable="true"
            android:layout_marginBottom="8dp"
            android:layout_height="wrap_content"/>
        <TextView
            android:id="@+id/privacy"
            android:text="《充电桩隐私政策》"
            android:layout_width="wrap_content"
            android:layout_above="@+id/android"
            android:textSize="15sp"