优化因为权限问题导致华为无法上架

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

@@ -1530,25 +1530,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                        requestLocationPermission();
                    }
                } else { // 首次启动
                    ProfileManager.getInstance().setStartedRequestLocationPermission(MainMapActivity.this, true);
                    new LocationPermissionsDialog(context)
                            .builder()
                            .setMsg("需要确定您所在的城市，首页才能显示您所在的城市的站点信息，请您授权定位")
                            .setLeftButton("取消",v -> {
                            })
                            .setRightButton("确定",v->{
                                EasyPermissions.requestPermissions(
                                        this,
                                        "为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?",
                                        RC_Location_FIRST_PERM,
                                        Manifest.permission.ACCESS_FINE_LOCATION,
                                        Manifest.permission.ACCESS_COARSE_LOCATION
                                );
                            }).show();
                }
                if (hasLocationPermission()) {
@@ -4412,73 +4394,80 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    @Override
    public void onClick(Marker marker, List<ClusterItem> clusterItems) {
        LatLngBounds.Builder builder = new LatLngBounds.Builder();
        for (ClusterItem clusterItem : clusterItems) {
            builder.include(clusterItem.getPosition());
        }
        //这里处理一下Marker的点击事件
        if (clusterItems.size() == 1) {
            MobclickAgent.onEvent(context, "0102");
            Log.e(TAG, "onClick: !!" + "!!");
            rl_control.setVisibility(View.GONE);
            moveRefresh = false;
            ClusterItem clusterItem = clusterItems.get(0);
            markerPosition = clusterItem.getPosition();
            RegionItem regionItem = (RegionItem) clusterItems.get(0);
            zhan_list chargePoint = regionItem.getChargePoint();
            String own_pay = chargePoint.getOwn_pay();
            String supplier = chargePoint.getSupplier();
            String suit_car = chargePoint.getSuit_car();
            if (null != own_pay && own_pay.equals("1")) {
                marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig1));
            } else {
                if (null != suit_car && suit_car.equals("特斯拉")) {
                    marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig3));
        if (!hasLocationPermission()) {
            requestLocationPermission();
        }else{
             LatLngBounds.Builder builder = new LatLngBounds.Builder();
            for (ClusterItem clusterItem : clusterItems) {
                builder.include(clusterItem.getPosition());
            }
            //这里处理一下Marker的点击事件
            if (clusterItems.size() == 1) {
                MobclickAgent.onEvent(context, "0102");
                Log.e(TAG, "onClick: !!" + "!!");
                rl_control.setVisibility(View.GONE);
                moveRefresh = false;
                ClusterItem clusterItem = clusterItems.get(0);
                markerPosition = clusterItem.getPosition();
                RegionItem regionItem = (RegionItem) clusterItems.get(0);
                zhan_list chargePoint = regionItem.getChargePoint();
                String own_pay = chargePoint.getOwn_pay();
                String supplier = chargePoint.getSupplier();
                String suit_car = chargePoint.getSuit_car();
                if (null != own_pay && own_pay.equals("1")) {
                    marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig1));
                } else {
                    if (null != supplier && WelcomeActivity.canCost.contains(supplier)) {
                        marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig2));
                    } else {
                    if (null != suit_car && suit_car.equals("特斯拉")) {
                        marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig3));
                    } else {
                        if (null != supplier && WelcomeActivity.canCost.contains(supplier)) {
                            marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig2));
                        } else {
                            marker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newbig3));
                        }
                    }
                }
            }
//            Log.e(TAG, "onClick: " + own_pay + "=====" + supplier);
            if (nMarker != null && current_chargePoint.getId() != chargePoint.getId()) {
                MarkerOptions markerOptionss = new MarkerOptions();
                if (null != current_chargePoint.getOwn_pay() && current_chargePoint.getOwn_pay().equals("1")) {
                    nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker1));
                } else {
                    if (null != current_chargePoint.getSuit_car() && current_chargePoint.getSuit_car().equals("特斯拉")) {
                        nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker3));
    //            Log.e(TAG, "onClick: " + own_pay + "=====" + supplier);
                if (nMarker != null && current_chargePoint.getId() != chargePoint.getId()) {
                    MarkerOptions markerOptionss = new MarkerOptions();
                    if (null != current_chargePoint.getOwn_pay() && current_chargePoint.getOwn_pay().equals("1")) {
                        nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker1));
                    } else {
                        if (null != current_chargePoint.getSupplier() && WelcomeActivity.canCost.contains(current_chargePoint.getSupplier())) {
                            nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker2));
                        } else {
                        if (null != current_chargePoint.getSuit_car() && current_chargePoint.getSuit_car().equals("特斯拉")) {
                            nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker3));
                        } else {
                            if (null != current_chargePoint.getSupplier() && WelcomeActivity.canCost.contains(current_chargePoint.getSupplier())) {
                                nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker2));
                            } else {
                                nMarker.setIcon(BitmapDescriptorFactory.fromResource(R.drawable.icon_newmarker3));
                            }
                        }
                    }
                    nMarker = aMap.addMarker(markerOptionss);
                }
                nMarker = aMap.addMarker(markerOptionss);
            }
//            Log.d(TAG, "onClick: latitude=" + position.latitude + "   long=" + position.longitude + "\n" + ((RegionItem) clusterItem).getChargePoint().toString());
            Long zhan_id = ((RegionItem) clusterItem).getChargePoint().getId();
            nMarker = marker;
            zhanInfo = null;
            // add by hyg 显示气泡
            nMarker.showInfoWindow();
            current_chargePoint = chargePoint;
            dialog.show();
            if (null != marker.getPosition()) {
                getSingleZhanInfo(String.valueOf(zhan_id), marker.getPosition());
    //            Log.d(TAG, "onClick: latitude=" + position.latitude + "   long=" + position.longitude + "\n" + ((RegionItem) clusterItem).getChargePoint().toString());
                Long zhan_id = ((RegionItem) clusterItem).getChargePoint().getId();
                nMarker = marker;
                zhanInfo = null;
                // add by hyg 显示气泡
                nMarker.showInfoWindow();
                current_chargePoint = chargePoint;
                dialog.show();
                if (null != marker.getPosition()) {
                    getSingleZhanInfo(String.valueOf(zhan_id), marker.getPosition());
                }
            } else {
                LatLngBounds latLngBounds = builder.build();
                aMap.animateCamera(CameraUpdateFactory.newLatLngBounds(latLngBounds, 0));
            }
        } else {
            LatLngBounds latLngBounds = builder.build();
            aMap.animateCamera(CameraUpdateFactory.newLatLngBounds(latLngBounds, 0));
        }
    }
    private void clickMarkAndMove(int adHeight) {