权限申请更改为使用时申请

app/build.gradle

@@ -111,13 +111,13 @@ android {
    productFlavors {
        yingyongbao {}
        c360 {}
        xiaomi {}
        huawei {}
        oppo {}
        cdz {}
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {}
        vivo {}
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {} c360 {}
        productFlavors.all { flavor ->
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
        }

app/src/main/AndroidManifest.xml

@@ -5,8 +5,8 @@
    android:versionCode="100"
    android:versionName="3.5.14">
    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
    <!--
 If your app targets Android 9 or lower, you can declare
         ACCESS_COARSE_LOCATION instead.

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

@@ -181,6 +181,7 @@ import cn.sharesdk.wechat.friends.Wechat;
import cn.sharesdk.wechat.moments.WechatMoments;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class MainMapActivity extends Activity implements LocationSource, AMapLocationListener,
@@ -285,6 +286,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private float mCurPosX;
    private float mPosY;
    private float mCurPosY;
    private static final int RC_TELL_PERM = 124;
    private TextView tv_msg_num;
    BitmapDescriptor bdyes = BitmapDescriptorFactory.fromResource(R.drawable.icon_sgreen);
@@ -710,6 +712,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private LatLng markerPosition;
    private ImageView second_hand_car;
    private LinearLayout private_telephone;
    private String telephone;
    @Override
@@ -4413,7 +4416,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        final String poi_jing = JsonUtils.getKeyResult(info, "poi_jing");
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
        final String telephone = JsonUtils.getKeyResult(info, "telephone");
        telephone = JsonUtils.getKeyResult(info, "telephone");
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
        fenshi_info_textview.setText("");
@@ -4466,11 +4469,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                            .setPositiveButton("呼叫", new View.OnClickListener() {
                                @Override
                                public void onClick(View v) {
                                    Intent intent = new Intent();
                                    intent.setAction("android.intent.action.CALL");
                                    intent.addCategory("android.intent.category.DEFAULT");
                                    intent.setData(Uri.parse("tel:" + telephone));
                                    startActivity(intent);
                                    tellTask();
                                }
                            }).setNegativeButton("取消", new View.OnClickListener() {
                        @Override
@@ -5829,5 +5828,32 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    }
                });
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {
            // Have permission, do the thing!
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
            Intent intent = new Intent();
            intent.setAction("android.intent.action.CALL");
            intent.addCategory("android.intent.category.DEFAULT");
            intent.setData(Uri.parse("tel:" + telephone));
            MainMapActivity.this.startActivity(intent);
        } else {
            LogUtils.e("@@@@@@@");
            // Ask for one permission
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启拨号权限，是否前往开启？",
                    RC_TELL_PERM,
                    Manifest.permission.CALL_PHONE);
        }
    }
    private boolean hasTellPermission() {
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
    }
}

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

@@ -12,6 +12,7 @@ import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
import android.text.style.StyleSpan;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -31,12 +32,15 @@ public class PrivacyAgreementActivity extends Activity {
        setContentView(R.layout.activity_privacy_agreement);
        BarColorUtil.initStatusBarColor(PrivacyAgreementActivity.this);
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
            Log.e("TAG_HYC", "onCreate:  getPrivacyAgreement" );
            startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
            finish();
        } else if (ProfileManager.getInstance().getPermissionAgreement(PrivacyAgreementActivity.this)) {
        } /*else if (ProfileManager.getInstance().getPermissionAgreement(PrivacyAgreementActivity.this)) {
            Log.e("TAG_HYC", "onCreate:  getPermissionAgreement" );
            startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
            finish();
        } else {
        } */else {
            Log.e("TAG_HYC", "onCreate:  initView" );
            initView();
        }
    }
@@ -80,7 +84,7 @@ public class PrivacyAgreementActivity extends Activity {
        agreement_btn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(PrivacyAgreementActivity.this, PermissionAgreementActivity.class));
                startActivity(new Intent(PrivacyAgreementActivity.this, WelcomeActivity.class));
                finish();
            }
        });

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

@@ -1,5 +1,6 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -11,6 +12,8 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager;
import android.util.Log;
import android.view.Gravity;
@@ -32,6 +35,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.blankj.utilcode.util.LogUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.Pic;
@@ -48,6 +52,7 @@ import com.electric.chargingpile.view.SlideShowView;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -58,9 +63,12 @@ import java.util.ArrayList;
import java.util.List;
import cn.sharesdk.onekeyshare.OnekeyShare;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class ZhanDetailsNew extends Activity implements OnClickListener {
public class ZhanDetailsNew extends Activity implements OnClickListener, EasyPermissions.PermissionCallbacks {
    private ImageView iv_down, phone;
    private LinearLayout ll_menu;
    private ImageView ivBack, ivType, ivZhan, iv_call;
@@ -104,7 +112,8 @@ public class ZhanDetailsNew extends Activity implements OnClickListener {
    private EditText claimer;
    public final static int RESULT_0 = 0;
    public final static int RESULT_1 = 1;
    private static final int RC_TELL_PERM = 124;
    private String telNum;
//    private ViewPager viewPager;
//    private ArrayList<View> pageview;
@@ -791,12 +800,8 @@ public class ZhanDetailsNew extends Activity implements OnClickListener {
                        .setPositiveButton("呼叫", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                String telNum = zhan.getTelephone().toString();
                                Intent intent = new Intent();
                                intent.setAction("android.intent.action.CALL");
                                intent.addCategory("android.intent.category.DEFAULT");
                                intent.setData(Uri.parse("tel:" + telNum));
                                ZhanDetailsNew.this.startActivity(intent);
                                telNum = zhan.getTelephone().toString();
                                tellTask();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
@@ -1091,4 +1096,44 @@ public class ZhanDetailsNew extends Activity implements OnClickListener {
            }
        }).start();
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {
            // Have permission, do the thing!
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
            Intent intent = new Intent();
            intent.setAction("android.intent.action.CALL");
            intent.addCategory("android.intent.category.DEFAULT");
            intent.setData(Uri.parse("tel:" + telNum));
            ZhanDetailsNew.this.startActivity(intent);
        } else {
            LogUtils.e("@@@@@@@");
            // Ask for one permission
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启拨号权限，是否前往开启？",
                    RC_TELL_PERM,
                    Manifest.permission.CALL_PHONE);
        }
    }
    private boolean hasTellPermission() {
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
    }
    @Override
    public void onPermissionsGranted(int requestCode, @NonNull @NotNull List<String> perms) {
    }
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
            // TODO add by hyg20200525
            new AppSettingsDialog.Builder(ZhanDetailsNew.this).build().show();
//            new AppSettingsDialog.Builder(InputCodeActivity.this,
//                    "该功能需要开启拨号权限，是否前往开启？？").build().show();
        }
    }
}

app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@@ -1,6 +1,7 @@
package com.electric.chargingpile.fragment;
import android.Manifest;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
@@ -26,10 +27,12 @@ import android.widget.Space;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.amap.api.maps.AMapUtils;
import com.amap.api.maps.model.LatLng;
import com.blankj.utilcode.util.LogUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.AlterOneActivity;
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
@@ -38,6 +41,7 @@ import com.electric.chargingpile.activity.LoginActivity;
import com.electric.chargingpile.activity.MainMapActivity;
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
import com.electric.chargingpile.activity.PriceDetailsActivity;
import com.electric.chargingpile.activity.ZhanDetailsNew;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.ChartData;
import com.electric.chargingpile.data.MyOtto;
@@ -78,6 +82,7 @@ import com.zhy.view.flowlayout.FlowLayout;
import com.zhy.view.flowlayout.TagAdapter;
import com.zhy.view.flowlayout.TagFlowLayout;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -99,9 +104,13 @@ import java.util.regex.PatternSyntaxException;
import me.codeboy.android.aligntextview.AlignTextView;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class DetailsFragment extends Fragment implements View.OnClickListener, OnChartValueSelectedListener {
public class DetailsFragment extends Fragment implements View.OnClickListener, OnChartValueSelectedListener, EasyPermissions.PermissionCallbacks {
    private static final String TAG = "DetailsFragment";
    private static final int RC_TELL_PERM = 124;
    private Zhan zhan = null;
    private CombinedChart mChart;
    public static ArrayList<JSONObject> datas;
@@ -792,6 +801,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
    private String zongjia;
    private ImageView scan_charge_btn;
    private Space scan_charge_space;
    private String telNum;
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -952,14 +962,11 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                new com.electric.chargingpile.view.AlertDialog(getActivity()).builder()
                        .setMsg(zhan_name + "  " + telephone)
                        .setPositiveButton("呼叫", new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                String telNum = telephone.toString();
                                Intent intent = new Intent();
                                intent.setAction("android.intent.action.CALL");
                                intent.addCategory("android.intent.category.DEFAULT");
                                intent.setData(Uri.parse("tel:" + telNum));
                                getActivity().startActivity(intent);
                                telNum = telephone.toString();
                                tellTask();
                            }
                        }).setNegativeButton("取消", new View.OnClickListener() {
                    @Override
@@ -1528,6 +1535,47 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        super.onDestroyView();
    }
    @AfterPermissionGranted(RC_TELL_PERM)
    public void tellTask() {
        if (hasTellPermission()) {
            // Have permission, do the thing!
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
            Intent intent = new Intent();
            intent.setAction("android.intent.action.CALL");
            intent.addCategory("android.intent.category.DEFAULT");
            intent.setData(Uri.parse("tel:" + telNum));
            DetailsFragment.this.startActivity(intent);
        } else {
            LogUtils.e("@@@@@@@");
            // Ask for one permission
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启拨号权限，是否前往开启？",
                    RC_TELL_PERM,
                    Manifest.permission.CALL_PHONE);
        }
    }
    private boolean hasTellPermission() {
        return EasyPermissions.hasPermissions(getActivity(), Manifest.permission.CALL_PHONE);
    }
    @Override
    public void onPermissionsGranted(int requestCode, @NonNull @NotNull List<String> perms) {
    }
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
            // TODO add by hyg20200525
            new AppSettingsDialog.Builder(DetailsFragment.this).build().show();
//            new AppSettingsDialog.Builder(InputCodeActivity.this,
//                    "该功能需要开启拨号权限，是否前往开启？？").build().show();
        }
    }
    public static String getMD5(String content) {
        try {

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

@@ -402,7 +402,7 @@ public class Util {
    }
    public static String generateDmpUrl(String url) {
        url = url.replace("__OS__", "android");
      /*  url = url.replace("__OS__", "android");
        String mac = getMac(MainApplication.context);
        if (mac != null) {
            mac = mac.replace(":", "");
@@ -419,7 +419,7 @@ public class Util {
        url = url.replace("__DVCBRAND__", Build.BRAND);
        url = url.replace("__DVCMODEL__", Build.MODEL);
*/
        return url;
    }
@@ -436,69 +436,69 @@ public class Util {
        return udid;
    }
    /**
     * 获取wifi的mac地址，适配到android Q
     *
     * @param paramContext
     * @return
     */
    private static String getMac(Context paramContext) {
        try {
            if (Build.VERSION.SDK_INT >= 23) {
                String str = getMacMoreThanM(paramContext);
                if (!TextUtils.isEmpty(str))
                    return str;
            }
            // 6.0以下手机直接获取wifi的mac地址即可
            WifiManager wifiManager = (WifiManager) paramContext.getSystemService("wifi");
            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
            if (wifiInfo != null)
                return wifiInfo.getMacAddress();
        } catch (Throwable throwable) {
            throwable.printStackTrace();
        }
        return null;
    }
    /**
     * android 6.0+获取wifi的mac地址
     *
     * @param paramContext
     * @return
     */
    private static String getMacMoreThanM(Context paramContext) {
        try {
            //获取本机器所有的网络接口
            Enumeration enumeration = NetworkInterface.getNetworkInterfaces();
            while (enumeration.hasMoreElements()) {
                NetworkInterface networkInterface = (NetworkInterface) enumeration.nextElement();
                //获取硬件地址，一般是MAC
                byte[] arrayOfByte = networkInterface.getHardwareAddress();
                if (arrayOfByte == null || arrayOfByte.length == 0) {
                    continue;
                }
                StringBuilder stringBuilder = new StringBuilder();
                for (byte b : arrayOfByte) {
                    //格式化为：两位十六进制加冒号的格式，若是不足两位，补0
                    stringBuilder.append(String.format("%02X:", new Object[]{Byte.valueOf(b)}));
                }
                if (stringBuilder.length() > 0) {
                    //删除后面多余的冒号
                    stringBuilder.deleteCharAt(stringBuilder.length() - 1);
                }
                String str = stringBuilder.toString();
                // wlan0:无线网卡 eth0：以太网卡
                if (networkInterface.getName().equals("wlan0")) {
                    return str;
                }
            }
        } catch (SocketException socketException) {
            return null;
        }
        return null;
    }
//    /**
//     * 获取wifi的mac地址，适配到android Q
//     *
//     * @param paramContext
//     * @return
//     */
//    private static String getMac(Context paramContext) {
//        try {
//            if (Build.VERSION.SDK_INT >= 23) {
//                String str = getMacMoreThanM(paramContext);
//                if (!TextUtils.isEmpty(str))
//                    return str;
//            }
//            // 6.0以下手机直接获取wifi的mac地址即可
//            WifiManager wifiManager = (WifiManager) paramContext.getSystemService("wifi");
//            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
//            if (wifiInfo != null)
//                return wifiInfo.getMacAddress();
//        } catch (Throwable throwable) {
//            throwable.printStackTrace();
//        }
//        return null;
//    }
//
//    /**
//     * android 6.0+获取wifi的mac地址
//     *
//     * @param paramContext
//     * @return
//     */
//    private static String getMacMoreThanM(Context paramContext) {
//        try {
//            //获取本机器所有的网络接口
//            Enumeration enumeration = NetworkInterface.getNetworkInterfaces();
//            while (enumeration.hasMoreElements()) {
//                NetworkInterface networkInterface = (NetworkInterface) enumeration.nextElement();
//                //获取硬件地址，一般是MAC
//                byte[] arrayOfByte = networkInterface.getHardwareAddress();
//                if (arrayOfByte == null || arrayOfByte.length == 0) {
//                    continue;
//                }
//
//                StringBuilder stringBuilder = new StringBuilder();
//                for (byte b : arrayOfByte) {
//                    //格式化为：两位十六进制加冒号的格式，若是不足两位，补0
//                    stringBuilder.append(String.format("%02X:", new Object[]{Byte.valueOf(b)}));
//                }
//                if (stringBuilder.length() > 0) {
//                    //删除后面多余的冒号
//                    stringBuilder.deleteCharAt(stringBuilder.length() - 1);
//                }
//                String str = stringBuilder.toString();
//                // wlan0:无线网卡 eth0：以太网卡
//                if (networkInterface.getName().equals("wlan0")) {
//                    return str;
//                }
//            }
//        } catch (SocketException socketException) {
//            return null;
//        }
//        return null;
//    }
//
    public static PictureParameterStyle getWhiteStyle(Context context) {
        // 相册主题