1 修改BUG

杨帅
1 parent f4c87264
Showing 15 changed files with 213 additions and 153 deletions
.idea/codeStyles/Project.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RegistrationInfoPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RunLineAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/res/layout/item_my_record.xml
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
 \ No newline at end of file
@@ -39,6 +39,9 @@ import io.reactivex.disposables.Disposable;
 public class CollRunningFinishFragmetPresenter extends MvpBasePresenter<CollRunningFinishFragmentView> {
     public void uploadTraceDateToServer(Activity context, CollUserStepEntity userStepEntity, String roadmap) {
+        if (null != getView()) {
+            getView().limitUploadBtnTouch();
+        }
         QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
@@ -84,10 +87,10 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
         if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
             double mileage = CollStepUtil.getWalkDistanceKM(Long.parseLong(userStepEntity.getStepCount()));
             paramsMap.put("mileage", mileage + "");
-            if (0==mileage){
+            if (0 == mileage) {
                 paramsMap.put("mileage", "0");
             }
-        }else {
+        } else {
             paramsMap.put("mileage", "0");
         }
         //开始时间
@@ -113,6 +116,9 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
                         if (getView() == null) {
                             return;
                         }
+                        if (null != getView()) {
+                            getView().allowUploadBtnTouch();
+                        }
                         QMUITipDialogUtil.dismessDialog();
                         SelectDialog selectDialog = new SelectDialog(context, "数据上传失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
                             @Override
@@ -2,27 +2,20 @@ package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.Toast;
-import com.baidu.location.LocationClient;
-import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapView;
-import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
-import com.baidu.trace.api.fence.CreateFenceRequest;
 import com.baidu.trace.api.fence.CreateFenceResponse;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
@@ -33,7 +26,6 @@ import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
 import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
-import com.baidu.trace.model.CoordType;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.logic.Event;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
@@ -44,13 +36,9 @@ import com.cnlive.moudle.collectionTrace.ui.adapter.CollFinishDetaiAdapter;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.model.Constant;
-import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.upload.UploadLogic;
-import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
@@ -59,7 +47,6 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import java.io.File;
@@ -198,10 +185,14 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                             @Override
                             public void onClick(SelectDialog dialog) {
                                 dialog.dismiss();
+                                //允许点击
+                                allowUploadBtnTouch();
                             }
                         }, "是", new SelectDialog.DialogInterface() {
                             @Override
                             public void onClick(SelectDialog dialog) {
+                                //不让点击上传轨迹按钮
+                                limitUploadBtnTouch();
                                 if (null != allMapOverlays) {
                                     for (Overlay overlay : allMapOverlays) {
                                         overlay.remove();
@@ -303,6 +294,24 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
     }
+    /**
+     * 屏蔽上传轨迹按钮
+     */
+    public void limitUploadBtnTouch() {
+        fragment.binding.rlScrollViewStartBtn.setFocusable(false);
+        fragment.binding.rlScrollViewStartBtn.setClickable(false);
+        fragment.binding.rlScrollViewStartBtn.setFocusableInTouchMode(false);
+    }
+
+    /**
+     * 允许上传轨迹按钮
+     */
+    public void allowUploadBtnTouch() {
+        fragment.binding.rlScrollViewStartBtn.setFocusable(true);
+        fragment.binding.rlScrollViewStartBtn.setClickable(true);
+        fragment.binding.rlScrollViewStartBtn.setFocusableInTouchMode(true);
+    }
+
     private void queryWalkTrace(long startTime, long endTime) {
         MyMapUtil.queryHistoryTrace(getContext(), mClient, CommonInfo.getUserId(getContext()), startTime, endTime, new MyMapUtil.CallBack() {
             @Override
@@ -362,6 +371,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                 } catch (Exception e) {
                     QMUITipDialogUtil.dismessDialog();
                     QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
+                    //允许点击
+                    allowUploadBtnTouch();
                     e.printStackTrace();
                 }
             }
@@ -374,6 +385,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
      * @param roadMapPath
      */
     private void uploadRoadMapPic(String roadMapPath) {
+        //禁止点击
+        limitUploadBtnTouch();
         if (!TextUtils.isEmpty(roadMapPath)) {
             QMUITipDialogUtil.loadingDialog(getContext(), "正在上传赛事图片,请稍后", false);
             List<String> imagePaths = new ArrayList<>();
@@ -387,6 +400,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                                 @Override
                                 public void onClick(SelectDialog dialog) {
                                     dialog.dismiss();
+                                    //允许点击
+                                    allowUploadBtnTouch();
                                 }
                             }, "重试", new SelectDialog.DialogInterface() {
                                 @Override
@@ -631,7 +631,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             if (isShowFollowAddress && !TextUtils.isEmpty(currentAddress)) {
                 if (isShowFollowAddress && selectDialog != null && !selectDialog.isShowing()) {
                     if (!TextUtils.isEmpty(currentAddress)) {
-                        selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
+                        selectDialog.setTipMessage("确定在" + "\"" + currentAddress + "\"" + "打点?");
                         if (!selectDialog.isShowing()) {
                             selectDialog.show();
                         }
@@ -197,6 +197,34 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             allCollectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
         }
+        //设置起点终点
+        CollectPoint startLocation = null;
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getStartLocation())) {
+            startLocation = new CollectPoint();
+            startLocation.setPointName(eventShoeLinesBean.getStartLocation());
+            startLocation.setLatitude(0);
+            startLocation.setLongitude(0);
+        }
+        //设置终点
+        CollectPoint endLocation = null;
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getEndLocation())) {
+            endLocation = new CollectPoint();
+            endLocation.setPointName(eventShoeLinesBean.getEndLocation());
+            endLocation.setLatitude(0);
+            endLocation.setLongitude(0);
+        }
+        if (null != startLocation) {
+            if (null == allCollectPoints) {
+                allCollectPoints = new ArrayList<>();
+            }
+            allCollectPoints.add(0, startLocation);
+        }
+        if (null != endLocation) {
+            if (null == allCollectPoints) {
+                allCollectPoints = new ArrayList<>();
+            }
+            allCollectPoints.add(endLocation);
+        }
         //设置打点liebiao
         if (null != allCollectPoints && allCollectPoints.size() > 1) {
             //设置适配器
@@ -251,10 +279,6 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                             //获取打点不为空
                             if (null != finalResultCollectPoints && finalResultCollectPoints.size() > 1) {
-                                //移除起点
-                                finalResultCollectPoints.remove(0);
-                                //移除终点
-                                finalResultCollectPoints.remove(finalResultCollectPoints.size() - 1);
                                 //开始在地图上绘制打点信息
                                 for (int i = 0; i < finalResultCollectPoints.size(); i++) {
                                     LatLng latLng = new LatLng(finalResultCollectPoints.get(i).getLatitude(), finalResultCollectPoints.get(i).getLongitude());
@@ -48,6 +48,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     private Handler handler;
     private Runnable runnable;
     private boolean isRegisterReceiver = false;
+    private boolean isStartForegroundService = false;
     public CollKeepLiveService() {
     }
@@ -69,14 +70,16 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
                     handler.postDelayed(this, 5000);
                 } else {
                     try {
-                        if (myReceiver != null) {
+                        if (myReceiver != null&&isRegisterReceiver) {
                             unregisterReceiver(myReceiver);
                         }
                     } catch (Exception e) {
                         Log.e(TAG, "run: ");
                     }
                     stopPlaySong();
-                    stopForeground(true);
+                    if (isStartForegroundService) {
+                        stopForeground(true);
+                    }
                 }
             }
@@ -210,6 +213,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
                 .build();
         // 0 隐藏前台服务通知
         startForeground(100, notification);
+        isStartForegroundService = true;
 //        stopForeground(true);
     }
@@ -33,6 +33,9 @@ import io.reactivex.disposables.Disposable;
 public class RegistrationInfoPresenter extends MvpBasePresenter<RegistrationInfoView> {
     public void commitInfo(Context context, String eventId, String sid, String mobile, String sex, String birthday) {
+        if (null!=getView()){
+            getView().limitClickRegistBtn();
+        }
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
         map.put("sid", sid);
@@ -55,6 +58,9 @@ public class RegistrationInfoPresenter extends MvpBasePresenter&lt;RegistrationInfo
         }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
+                if (null!=getView()){
+                    getView().allowClickRegistBtn();
+                }
 //                if (408 == code) {
 //                    if (getView() != null) {
 //                        getView().toResult();
@@ -44,17 +44,17 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("填写报名信息");
-        if(CommonInfo.getUserNickName(fragment.getActivity()) != null && CommonInfo.getUserNickName(fragment.getActivity()).trim().length() > 0){
+        if (CommonInfo.getUserNickName(fragment.getActivity()) != null && CommonInfo.getUserNickName(fragment.getActivity()).trim().length() > 0) {
             fragment.binding.userName.setText(CommonInfo.getUserNickName(fragment.getActivity()));
         }
-        if(CommonInfo.getUserPhone(fragment.getActivity()) != null && CommonInfo.getUserPhone(fragment.getActivity()).trim().length() > 0){
+        if (CommonInfo.getUserPhone(fragment.getActivity()) != null && CommonInfo.getUserPhone(fragment.getActivity()).trim().length() > 0) {
             fragment.binding.phoneNum.setText(CommonInfo.getUserPhone(fragment.getActivity()));
         }
-        if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){
+        if (CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0) {
             Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
-                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into( fragment.binding.userIcon);
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(fragment.binding.userIcon);
         }
         fragment.binding.commitInfo.setOnClickListener(v -> fragment.commitInfo());
@@ -111,7 +111,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
     public void toResult() {
         EventBus.getDefault().post(new MessageEvent(Constant.REGISTRATION_SUCCESS, ""));
-        AlertUtil.showLongToast(fragment.getActivity(),"恭喜你报名成功",3000);
+        AlertUtil.showLongToast(fragment.getActivity(), "恭喜你报名成功", 3000);
         fragment.getActivity().finish();
     }
@@ -121,4 +121,22 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
 //        生日（非必填） 未选择
         fragment.binding.birthday.setText(DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
     }
+
+    /**
+     * 不允许点击
+     */
+    public void limitClickRegistBtn() {
+        fragment.binding.commitInfo.setClickable(false);
+        fragment.binding.commitInfo.setFocusableInTouchMode(false);
+        fragment.binding.commitInfo.setFocusable(false);
+    }
+
+    /**
+     * 允许点击
+     */
+    public void allowClickRegistBtn() {
+        fragment.binding.commitInfo.setClickable(true);
+        fragment.binding.commitInfo.setFocusableInTouchMode(true);
+        fragment.binding.commitInfo.setFocusable(true);
+    }
 }
@@ -39,6 +39,7 @@ import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -112,6 +113,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private final float DEFAULT_MAP_AUTO_ZOOM = -0.8f;//根据点位,自动缩放的比例
     private List<LatLng> queryResultPoints;//查询到的历史轨迹
     private List<String> joinFaceIcon;//参与活动人数
+    private final String REGIST_RACE = "0";//立即报名
+    private final String START_RACE = "1";//立即开始
+    private final String CONTINUE_RACE = "2";//继续运动
+    private final String END_RACE = "3";//运动已结束
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -184,7 +189,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.run_main_bg), 0);
                     }
-                } else if (slideOffset!=0){
+                } else if (slideOffset != 0) {
                     if (fragment.binding.flTop.getVisibility() == View.VISIBLE) {
                         QMUIStatusBarHelper.setStatusBarLightMode(fragment.getActivity());
                         StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.white), 0);
@@ -452,12 +457,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //判断用户是否报名
         if (runRaceDetailInfo.isSignResult()) {
-            fragment.binding.rlScrollViewStartBtn.setTag("1");
+            fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
             fragment.binding.tvRunNow.setText("现在开始");
             fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
             checkStartBtnState();
         } else {
-            fragment.binding.rlScrollViewStartBtn.setTag("0");
+            fragment.binding.rlScrollViewStartBtn.setTag(REGIST_RACE);
             fragment.binding.tvRunNow.setText("立即报名");
             fragment.binding.tvGoTip.setVisibility(View.GONE);
         }
@@ -514,13 +519,13 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onClick(View view) {
                 //立即报名
-                if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                if (REGIST_RACE.equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     if (null != runRaceDetailInfo) {
                         RegistrationInfoActivity.newInstance(fragment.getActivity(), runRaceDetailInfo.getFenceId());
                     }
                 }
                 //现在开始
-                else if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                else if (START_RACE.equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     //先判断是否从百度查询到赛事轨迹
                     if (null != endLatLng && null != startLatLng) {
                         //开始比较距离
@@ -549,7 +554,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     }
                 }
                 //继续运动
-                else if ("2".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                else if (CONTINUE_RACE.equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     if (!isDifferentStreet) {
                         SelectDialog continueTipDialog = new SelectDialog(getContext(), "是否继续运动", "否", new SelectDialog.DialogInterface() {
                             @Override
@@ -563,7 +568,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                                 dialog.dismiss();
                                 //重置按钮
                                 fragment.binding.tvRunNow.setText("立即开始");
-                                fragment.binding.rlScrollViewStartBtn.setTag("1");
+                                fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
                             }
                         }, "是", new SelectDialog.DialogInterface() {
                             @Override
@@ -592,7 +597,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                                 CommonInfo.resetRace(getContext());
                                 //更改当前按钮
                                 fragment.binding.tvRunNow.setText("立即开始");
-                                fragment.binding.rlScrollViewStartBtn.setTag("1");
+                                fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
                             }
                         }, "是", new SelectDialog.DialogInterface() {
@@ -606,6 +611,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         selectDialog.setCancelable(false);
                         selectDialog.show();
                     }
+                } else if (END_RACE.equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                    AlertUtil.showDeftToast(getContext(), "赛事已结束");
+                    return;
                 }
             }
         });
@@ -1019,7 +1027,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if ((currnetTime - userPauseTime) <= (9 * 60 * 60 * 1000)) {
                 Log.e(TAG, "小于9小时");
                 fragment.binding.tvRunNow.setText("继续运动");
-                fragment.binding.rlScrollViewStartBtn.setTag("2");
+                fragment.binding.rlScrollViewStartBtn.setTag(CONTINUE_RACE);
             } else {
                 Log.e(TAG, "大于9小时");
                 //重置数据
@@ -1027,7 +1035,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 //清空数据库
                 StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
                 fragment.binding.tvRunNow.setText("立即开始");
-                fragment.binding.rlScrollViewStartBtn.setTag("1");
+                fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
             }
@@ -1045,11 +1053,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 return;
             }
             if (runRaceDetailInfo.isSignResult()) {
-                fragment.binding.rlScrollViewStartBtn.setTag("1");
+                fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
                 fragment.binding.tvRunNow.setText("现在开始");
                 fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
             } else {
-                fragment.binding.rlScrollViewStartBtn.setTag("0");
+                fragment.binding.rlScrollViewStartBtn.setTag(REGIST_RACE);
                 fragment.binding.tvRunNow.setText("立即报名");
                 fragment.binding.tvGoTip.setVisibility(View.GONE);
             }
@@ -1078,7 +1086,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                             //清除数据
                             CommonInfo.resetRace(getContext());
                             //设置按钮状态
-                            fragment.binding.rlScrollViewStartBtn.setTag("3");
+                            fragment.binding.rlScrollViewStartBtn.setTag(END_RACE);
                             fragment.binding.rlScrollViewStartBtn.setBackgroundColor(getContext().getResources().getColor(R.color.red_round));
                             fragment.binding.tvRunNow.setText("赛事已结束");
                             fragment.binding.tvGoTip.setVisibility(View.GONE);
@@ -1091,7 +1099,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if (null != runRaceDetailInfo) {
                 if (runRaceDetailInfo.isEndState()) {
                     //设置按钮状态
-                    fragment.binding.rlScrollViewStartBtn.setTag("3");
+                    fragment.binding.rlScrollViewStartBtn.setTag(END_RACE);
                     fragment.binding.rlScrollViewStartBtn.setBackgroundColor(getContext().getResources().getColor(R.color.red_round));
                     fragment.binding.tvRunNow.setText("赛事已结束");
                     fragment.binding.tvGoTip.setVisibility(View.GONE);
@@ -1306,7 +1314,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         } else {
             fragment.binding.includeStreet.tvSignPerson.setText("1");
         }
-        fragment.binding.rlScrollViewStartBtn.setTag("1");
+        fragment.binding.rlScrollViewStartBtn.setTag(START_RACE);
         fragment.binding.tvRunNow.setText("现在开始");
         fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
         if (null != runRaceDetailInfo) {
@@ -79,7 +79,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                     handler.postDelayed(this, 5000);
                 } else {
                     try {
-                        if (myReceiver != null) {
+                        if (myReceiver != null && isRegisterReceiver) {
                             unregisterReceiver(myReceiver);
                         }
                     } catch (Exception e) {
@@ -116,7 +116,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
         intentFilter.addAction("com.cnlive.strike.receiver.ServiceReceiver");
         intentFilter.addAction("close.KeepService");
         registerReceiver(myReceiver, intentFilter);
-        isRegisterReceiver=true;
+        isRegisterReceiver = true;
     }
     /**
@@ -240,7 +240,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     public void onDestroy() {
         super.onDestroy();
         try {
-            if (myReceiver != null&&isRegisterReceiver) {
+            if (myReceiver != null && isRegisterReceiver) {
                 unregisterReceiver(myReceiver);
             }
         } catch (Exception e) {
@@ -35,9 +35,6 @@ import static android.provider.Settings.EXTRA_APP_PACKAGE;
 @Route(path = "/moudle_pedometer/InterestActivity")
 public class PedometerMainActivity extends QMUIFragmentActivity {
     private static final String TAG = "PedometerMainActivity";
-
-
-    private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
     private RunMainFragment fragment;
     private List<LatLng> importStreetPoints;
     private RunRaceDetailInfo runRaceDetailInfo;
@@ -50,7 +47,14 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
+        if (null != getIntent().getExtras().get("runRaceDetailInfo")) {
+            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
+            if (getCurrentFragment() == null) {
+                if (runRaceDetailInfo != null) {
+                    addFragment(runRaceDetailInfo);
+                }
+            }
+        }
     }
@@ -59,10 +63,6 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         super.onDestroy();
     }
-    private void checkIsOpenNotifiction() {
-        getPermissionsWithTip();
-    }
-
     @Override
     protected void onRestart() {
@@ -73,7 +73,6 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        checkIsOpenNotifiction();
     }
     private void addFragment(RunRaceDetailInfo runRaceDetailInfo) {
@@ -85,72 +84,6 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     }
-    /**
-     * 一次申请一组权限（使用拒绝弹框）点击事件
-     */
-    public void getPermissionsWithTip() {
-        mPermissionsUtils
-                .setPermissionsListener(new PermissionsListener() {
-                    @Override
-                    public void onDenied(String[] deniedPermissions) {
-                        getPermissionsWithTip();
-                        Log.e(TAG, "onDenied: ");
-                    }
-
-                    @Override
-                    public void onGranted() {
-
-                        //判断GPS是否开启
-                        if (!MyMapUtil.isOPenGps(getApplicationContext())) {
-                            //开启GPS
-                            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                            startActivityForResult(intent, 10);
-                            Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
-                        } else {
-                            if (getCurrentFragment() == null) {
-                                if (runRaceDetailInfo != null) {
-                                    addFragment(runRaceDetailInfo);
-                                }
-                            }
-                        }
-                    }
-                })
-                .withActivity(PedometerMainActivity.this)
-                .getPermissions(PedometerMainActivity.this
-                        , 100
-                        , Manifest.permission.INTERNET
-                        , Manifest.permission.READ_EXTERNAL_STORAGE
-                        , Manifest.permission.WRITE_EXTERNAL_STORAGE
-                        , Manifest.permission.ACCESS_FINE_LOCATION
-                        , Manifest.permission.ACCESS_COARSE_LOCATION
-                );
-//                .getPermissionsWithTips(MainActivity.this
-//                        ,100
-//                        , new String[]{"人家要录音","我们需要读取你的信息，磨磨唧唧的","我要上网","我要读内存卡","我要看日历","我要定位"}
-//                        , Manifest.permission.RECORD_AUDIO
-//                        , Manifest.permission.READ_SMS
-//                        , Manifest.permission.INTERNET
-//                        , Manifest.permission.READ_EXTERNAL_STORAGE
-//                        , Manifest.permission.READ_CALENDAR
-//                        , Manifest.permission.ACCESS_FINE_LOCATION);
-    }
-
-
-    /**
-     * 权限回调
-     *
-     * @param requestCode
-     * @param permissions
-     * @param grantResults
-     */
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
-                                           @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
-    }
-
-
     @Override
     public void onBackPressed() {
         return;
@@ -4,11 +4,14 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 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;
@@ -29,6 +32,7 @@ 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;
@@ -50,6 +54,8 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
     private String eventId;//赛道id
+    private int permissionRequestCount = 0;//权限请求次数
+    private SelectDialog selectDialog;
     public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName, String userPhone) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
@@ -77,8 +83,8 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
             CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
             CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
-
         }
+        initPermissionDefineTip();
         //判断用户是否结束运动
 //        boolean isRunStep = CommonInfo.getIsRunStepService(this);
 //        //没有找到相关记录
@@ -92,6 +98,30 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     }
+    private void initPermissionDefineTip() {
+        selectDialog = new SelectDialog(RunRaceDetailActivity.this, "您尚未授予程序运行所需权限\n是否设置?",
+                "返回", new SelectDialog.DialogInterface() {
+            @Override
+            public void onClick(SelectDialog dialog) {
+                dialog.dismiss();
+                finish();
+            }
+        }, "设置", new SelectDialog.DialogInterface() {
+            @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;
+//                    }
+            }
+        });
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -140,6 +170,9 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
      * 一次申请一组权限（使用拒绝弹框）点击事件
      */
     public void getPermissionsWithTip() {
+        if (1 == permissionRequestCount) {
+            return;
+        }
         mPermissionsUtils
                 .setPermissionsListener(new PermissionsListener() {
                     @Override
@@ -187,6 +220,36 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
                                            @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
+        if (1 == permissionRequestCount) {
+            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;
+////                            showToast("点击权限，并打开全部权限");
+//                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//                    Uri uri = Uri.fromParts("package", getPackageName(), null);
+//                    intent.setData(uri);
+//                    startActivityForResult(intent, 0);
+                }
+            }
+        }
+        if (isShowPermissionTip) {
+            mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
+        } else {
+            if (0 == permissionRequestCount) {
+                selectDialog.setCancelable(false);
+                selectDialog.setCanceledOnTouchOutside(false);
+                if (!selectDialog.isShowing()) {
+                    selectDialog.show();
+                    permissionRequestCount = 1;
+                }
+            } else {
+                return;
+            }
+        }
     }
 -}
+}
 \ No newline at end of file
@@ -65,7 +65,12 @@ public class RunLineAdapter extends RecyclerView.Adapter&lt;RunLineAdapter.MyViewHo
             myViewHolder.line_address.setText(list.get(i).getAddress());
         }
         myViewHolder.people_part.setText(list.get(i).getSignupNum() + "");
-        myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
+        if (null != list.get(i).getFaceUrl() && list.get(i).getFaceUrl().size() > 0) {
+            myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
+            myViewHolder.join_person.setVisibility(View.VISIBLE);
+        } else {
+            myViewHolder.join_person.setVisibility(View.GONE);
+        }
     }
@@ -79,6 +79,9 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
      * @param fenceId
      */
     public void addMonitorToFence(int fenceId) {
+        if (null!=getMvpView()){
+            getMvpView().limitClickRegistBtn();
+        }
         if (null == getPresenter()) {
             return;
         }
@@ -145,6 +148,9 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                             binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
                             binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
                 } else {
+                    if (null!=getMvpView()){
+                        getMvpView().allowClickRegistBtn();
+                    }
                     QMUITipDialogUtil.dismessDialog();
                     QMUITipDialogUtil.messageDialog(getContext(), addMonitoredPersonResponse.getMessage(), 2);
                 }
@@ -80,7 +80,7 @@
             <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
                 android:id="@+id/join_person"
-                android:layout_width="wrap_content"
+                android:layout_width="150dp"
                 android:layout_height="40dp"
                 android:layout_marginRight="10dp"
                 FivePersonIconView:showRightFlag="false" />