Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

Conflicts: config.gradle

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer
Conflicts: config.gradle
hanyayun
2 parents dbc32f3f b9045528
Showing 3 changed files with 41 additions and 33 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/PermissionResultUtil.java
@@ -351,10 +351,6 @@ public class OnGoingFragmentView implements MvpView {
             if (runRaceDetailInfo.isIndividualAchievement()) {
                 //显示
                 fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
-                //设置完成人数
-                if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
-                    fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
-                }
                 //设置个人行走距离
                 if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
                     fragment.binding.includePersonScore.tvUserDistance.setText(runRaceDetailInfo.getUserMileage());
@@ -378,6 +374,10 @@ public class OnGoingFragmentView implements MvpView {
             //设置是否显示排行榜
             if (runRaceDetailInfo.isRanking()) {
                 fragment.binding.includeRank.llRankRoot.setVisibility(View.VISIBLE);
+                //设置完成人数
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
+                    fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
+                }
                 //设置第一名头像
                 GlideApp.with(getContext()).load(runRaceDetailInfo.getFirstFaceUrl()).into(fragment.binding.includeRank.ivFirstPersonUrl);
                 //设置排行榜头像
@@ -2,7 +2,6 @@ package com.cnlive.moudle.pedometer.ui.activity;
  
 import android.Manifest;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -10,41 +9,26 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialog;
 import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.Toast;
  
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.baidu.mapapi.CoordType;
-import com.baidu.mapapi.SDKInitializer;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
-import com.cnlive.libs.base.util.StatusBarUtil;
-import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.model.RunningMapBean;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
-import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
-import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NotificationUtil;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.PermissionResultUtil;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
  
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 活动赛事详情页
  *
@@ -116,16 +100,15 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             @Override
             public void onClick(SelectDialog dialog) {
                 dialog.dismiss();
-//                    if (!ActivityCompat.shouldShowRequestPermissionRationale(this, permissions[i])) {
-//                            showToast("点击权限，并打开全部权限");
                 Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
                 Uri uri = Uri.fromParts("package", getPackageName(), null);
                 intent.setData(uri);
                 startActivityForResult(intent, 0);
                 permissionRequestCount = 0;
-//                    }
             }
         });
+        selectDialog.setCancelable(false);
+        selectDialog.setCanceledOnTouchOutside(false);
     }
  
     @Override
@@ -305,20 +288,14 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             return;
         }
         boolean isShowPermissionTip = true;
-        for (int i = 0; i < grantResults.length; i++) {//判断权限的结果，如果有被拒绝，就return
-            if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
-                if (!ActivityCompat.shouldShowRequestPermissionRationale(this, permissions[i])) {
-                    isShowPermissionTip = false;
-                    break;
-                }
-            }
+        boolean isAllow = PermissionResultUtil.checkPermissions(this, permissions);
+        if (!isAllow) {
+            isShowPermissionTip = false;
         }
         if (isShowPermissionTip) {
             mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
         } else {
             if (0 == permissionRequestCount) {
-                selectDialog.setCancelable(false);
-                selectDialog.setCanceledOnTouchOutside(false);
                 if (!selectDialog.isShowing()) {
                     selectDialog.show();
                     permissionRequestCount = 1;
+package com.cnlive.moudle.pedometer.utils;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+
+public class PermissionResultUtil {
+
+    /**
+     * 检测所有的权限是否都已授权
+     *
+     * @param permissions
+     * @return
+     */
+    public static boolean checkPermissions(Context context, String[] permissions) {
+        boolean isAllow = true;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            isAllow = true;
+        } else {
+            for (String permission : permissions) {
+                if (ContextCompat.checkSelfPermission(context, permission) !=
+                        PackageManager.PERMISSION_GRANTED) {
+                    isAllow = false;
+                    break;
+                }
+            }
+        }
+        return isAllow;
+    }
+}