1 修复BUG

杨帅
1 parent 801f67e2
Showing 22 changed files with 455 additions and 148 deletions
config.gradle
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/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/receivers/ServiceReceiver.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/db/DbCore.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/drawable/shape_load.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.7.8",
+            version: "0.7.10",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -43,10 +43,13 @@ import io.reactivex.disposables.Disposable;
 public class CollRunningFinishFragmetPresenter extends MvpBasePresenter<CollRunningFinishFragmentView> {
     public void uploadTraceDateToServer(Activity context, CollUserStepEntity userStepEntity, String roadmap) {
+        if (null == getView()) {
+            return;
+        }
         if (null != getView()) {
             getView().limitUploadBtnTouch();
         }
-        QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+        getView().showLoading("正在上传数据");
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
         if (!TextUtils.isEmpty(userStepEntity.getStreetId())) {
@@ -120,6 +123,7 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
                         if (getView() == null) {
                             return;
                         }
+                        getView().hideLoading();
                         if (null != getView()) {
                             getView().allowUploadBtnTouch();
                         }
@@ -132,7 +136,7 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
                         }, "重试", new SelectDialog.DialogInterface() {
                             @Override
                             public void onClick(SelectDialog dialog) {
-                                dialog.dismiss();
+                                getView().hideLoading();
                                 uploadTraceDateToServer(context, userStepEntity, roadmap);
                             }
                         });
@@ -149,7 +153,7 @@ public class CollRunningFinishFragmetPresenter extends MvpBasePresenter&lt;CollRunn
                     return;
                 }
                 EventBus.getDefault().post(new MessageEvent(Constant.UPDATA_COLL_TRACE_LIST, ""));
-                QMUITipDialogUtil.dismessDialog();
+                getView().hideLoading();
                 QMUITipDialogUtil.successDialog(context, "数据上传成功", 1);
                 //清空数据
                 CollStepUtil.clearRunData(context, CollCommonInfo.getUserId(context));
@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.TextView;
 import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.MapView;
@@ -122,7 +123,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         String faceUrl = CommonInfo.getUserIcon(getContext());
         if (!TextUtils.isEmpty(faceUrl)) {
             GlideApp.with(getContext()).load(faceUrl).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
-        }else {
+        } else {
             GlideApp.with(getContext()).load(getContext().getResources().getString(R.string.default_face_url)).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
         }
         //设置标题
@@ -207,7 +208,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                                     }
                                 }
                                 dialog.dismiss();
-                                QMUITipDialogUtil.loadingDialog(getContext(), "正在截取赛事图片,请稍后", false);
+                                showLoading("正在截取赛事图片,请稍后");
                                 //延迟一秒进行截图,以免把打的点都截取到
                                 new Handler().postDelayed(new Runnable() {
                                     @Override
@@ -358,8 +359,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
             @Override
             public void onSnapshotReady(Bitmap bitmap) {
-                QMUITipDialogUtil.dismessDialog();
                 if (null == bitmap) {
+                    hideLoading();
                     QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
                     return;
                 }
@@ -376,7 +377,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                     //开始上传
                     uploadRoadMapPic(roadMapPath);
                 } catch (Exception e) {
-                    QMUITipDialogUtil.dismessDialog();
+                    hideLoading();
                     QMUITipDialogUtil.failedDialog(getContext(), "赛事图片截取失败,请重试", 2);
                     //允许点击
                     allowUploadBtnTouch();
@@ -395,14 +396,14 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         //禁止点击
         limitUploadBtnTouch();
         if (!TextUtils.isEmpty(roadMapPath)) {
-            QMUITipDialogUtil.loadingDialog(getContext(), "正在上传赛事图片,请稍后", false);
+            showLoading("正在上传赛事图片,请稍后");
             List<String> imagePaths = new ArrayList<>();
             imagePaths.add(roadMapPath);
             UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
                     .setFailureCallback(new FailureCallback() {
                         @Override
                         public void onFailure(int i, String s) {
-                            QMUITipDialogUtil.dismessDialog();
+                            hideLoading();
                             SelectDialog selectDialog = new SelectDialog(getContext(), "赛事图片上传失败,是否重试?", "取消", new SelectDialog.DialogInterface() {
                                 @Override
                                 public void onClick(SelectDialog dialog) {
@@ -428,7 +429,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                     .setSuccessCallback(new SuccessCallback<String>() {
                         @Override
                         public void onSuccess(String data) {
-                            QMUITipDialogUtil.dismessDialog();
+                            hideLoading();
                             //开始把数据传到服务端
                             collUserStepEntity = CollStepUtil.getCollUserStepData(getContext(), CollCommonInfo.getUserId(getContext()));
                             if (null != fragment.getPresenter() || null == fragment.getActivity() || null == collUserStepEntity || TextUtils.isEmpty(data)) {
@@ -441,6 +442,26 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         }
     }
+    public void showLoading(String tip) {
+        if (null == getContext() || null == fragment.binding.llLoading || null == fragment.binding.tvLoadingTip) {
+            return;
+        }
+        if (fragment.binding.llLoading.getVisibility() == View.GONE) {
+            fragment.binding.llLoading.setVisibility(View.VISIBLE);
+        }
+        if (!TextUtils.isEmpty(tip)) {
+            fragment.binding.tvLoadingTip.setText(tip);
+        }
+
+    }
+    public void hideLoading() {
+        if (null == getContext() || null == fragment.binding.llLoading || null == fragment.binding.tvLoadingTip) {
+            return;
+        }
+        if (fragment.binding.llLoading.getVisibility() == View.VISIBLE) {
+            fragment.binding.llLoading.setVisibility(View.GONE);
+        }
+    }
     public void initMap() {
         this.mMapView = fragment.binding.mapView;
@@ -36,6 +36,7 @@ import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
+import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.service.CollStepService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningMapFragment;
@@ -303,7 +304,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             public void onClick(View view) {
                 //先获取打点数量
                 int canTakePointCount = CollStepUtil.getCollImportPointSize(getContext(), CollCommonInfo.getUserId(getContext()));
-                if (canTakePointCount<2) {
+                if (canTakePointCount < 2) {
                     AlertUtil.showDeftToast(getContext(), "请至少打两个点后结束");
                 } else {
                     if (null != followMyLocation) {
@@ -444,12 +445,15 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
     private void stopStepService() {
         CollCommonInfo.setTsRunBaiduTraceService(getContext(), false);
         CollCommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CollCommonInfo.setIsRunStepService(getContext(), false);
         CollCommonInfo.setIsWriteUserStep(getContext(), false);
         CollCommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
         if (CollStepService.mClient != null) {
             CollStepService.mClient.stopGather(StepService.traceListener);
         }
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollKeepLiveService.class));
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollStepService.class));
+
     }
     private void initChrom() {
@@ -133,6 +133,9 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                     MyMapUtil.getGeoCoderResult(new LatLng(followMyLocation.latitude, followMyLocation.longitude), new MyMapUtil.GeoCodeResult() {
                         @Override
                         public void success(String address) {
+                            if (null==getContext()){
+                                return;
+                            }
                             QMUITipDialogUtil.dismessDialog();
                             if (null != address && !TextUtils.isEmpty(address)) {
                                 currentAddress = address;
@@ -301,9 +304,8 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         if (CollStepService.mClient != null) {
             CollStepService.mClient.stopGather(CollStepService.traceListener);
         }
-        fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollStepService.class));
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollKeepLiveService.class));
-
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), CollStepService.class));
     }
     /**
@@ -44,7 +44,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     private NotificationManager mNM;
     private Notification notification = null;
     //是否在后台运行
-    public static boolean isKeepService = true;
+    public static boolean isKeepService = false;
     public static CollKeepLiveService instance;
     private final String TAG = "CollKeepLiveService";
     private Handler handler;
@@ -152,8 +152,20 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
         if (isRun) {
             showHideForegroundNotification();
             startPlaySong();
-            if (runnable != null) {
-                handler.postDelayed(runnable, 5000);
+//            if (runnable != null) {
+//                handler.postDelayed(runnable, 5000);
+//            }
+        } else {
+            try {
+                if (myReceiver != null && isRegisterReceiver) {
+                    unregisterReceiver(myReceiver);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "run: ");
+            }
+            stopPlaySong();
+            if (isStartForegroundService) {
+                stopForeground(true);
             }
         }
         return START_STICKY;
@@ -58,10 +58,10 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         String employTime = runningFinishBean.getEmployTime();
         //路线全程里数
         String mileage = "";
-        if ("--".equals(runningFinishBean.getRunDistance())) {
+        if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
             mileage = "0";
         } else {
-            mileage = runningFinishBean.getRunDistance();
+            mileage = StepUtil.getWalkDistanceKM(Long.parseLong(userStepEntity.getStepCount())) + "";
         }
         //配速
         String pace = "";
@@ -352,7 +352,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
                     StepUtil.clearRunData(context, CommonInfo.getUserId(context));
                     CommonInfo.reset(context);
                     //用户跑完了,更新一下按钮
-                    EventBus.getDefault().post(new MessageEvent(Constant.UPDATE_RACE_STATE_BTN,""));
+                    EventBus.getDefault().post(new MessageEvent(Constant.UPDATE_RACE_STATE_BTN, ""));
                     //跳转到上传失败列表
                     LineUpAgainActivity.newInstance(context);
                     //关闭当前窗口
@@ -74,7 +74,7 @@ public class RunMainFragmentView implements MvpView {
     public MyLocationListenner myListener = new MyLocationListenner();
     private String employTime = "";
     private LatLng endLatLng;//终点坐标
-    private TipDialog tipDialog;
+    private TipDialog endTipDialog;
     //创建震动服务对象
     private Vibrator mVibrator;
     private boolean isfirstEndTip = true;
@@ -131,6 +131,10 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+        if (getContext() == null) {
+            return;
+        }
+        initEndTipDialog();
         //获取手机震动服务
         mVibrator = (Vibrator) getContext().getSystemService(Service.VIBRATOR_SERVICE);
         uid = CommonInfo.getUserId(getContext());
@@ -342,6 +346,9 @@ public class RunMainFragmentView implements MvpView {
                 //继续记录轨迹
                 if (StepService.mClient != null && StepService.traceListener != null) {
                     CommonInfo.setTsRunBaiduTraceService(getContext(), true);
+                    CommonInfo.setIsRunKeepAliveService(getContext(), true);
+                    CommonInfo.setIsRunStepService(getContext(), true);
+                    CommonInfo.setIsWriteUserStep(getContext(), true);
                     StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                 }
                 needWriteDataFlag = true;
@@ -405,8 +412,8 @@ public class RunMainFragmentView implements MvpView {
                                                 public void onClick(SelectDialog dialog) {
                                                     //停止计时
                                                     fragment.binding.chronometer.stop();
-                                                    //设置状态标志位
-                                                    setStopStartFlag();
+                                                    //停止服务
+                                                    stopRunService();
                                                     //设置运动结束时间戳
                                                     StepUtil.setUserFinishTimeStamp(getContext(), uid);
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
@@ -576,6 +583,17 @@ public class RunMainFragmentView implements MvpView {
         });
     }
+    private void initEndTipDialog() {
+        endTipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
+            @Override
+            public void onClick(TipDialog dialog) {
+                dialog.dismiss();
+            }
+        });
+        endTipDialog.setCancelable(false);
+        endTipDialog.setCanceledOnTouchOutside(false);
+    }
+
     /**
      * 暂停按钮
      */
@@ -641,18 +659,18 @@ public class RunMainFragmentView implements MvpView {
         Log.e(TAG, "setSQLPauseTime: ");
 //        if (needWriteDataFlag) {
         //将当前计时器时间戳写入数据库
-            UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), id);
-            if (userStepEntity != null) {
-                userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase());
-                //设置当前暂停的时间戳
-                userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
-                //设置当前用户暂停的时间戳
-                userStepEntity.setUserPauseTimeStamp(TimeUtil.getNowTimeStamp());
-                //设置暂停次数
-                userStepEntity.setPauseCount(userStepEntity.getPauseCount() + 1);
-                //更新数据
-                StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
-            }
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), id);
+        if (userStepEntity != null) {
+            userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase());
+            //设置当前暂停的时间戳
+            userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
+            //设置当前用户暂停的时间戳
+            userStepEntity.setUserPauseTimeStamp(TimeUtil.getNowTimeStamp());
+            //设置暂停次数
+            userStepEntity.setPauseCount(userStepEntity.getPauseCount() + 1);
+            //更新数据
+            StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
+        }
 //        }
     }
@@ -785,7 +803,7 @@ public class RunMainFragmentView implements MvpView {
                 LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
                 if (null != current) {
                     //开始比较数据
-                    double distance = DistanceUtil.getDistance(current, endLatLng);
+                    int distance = (int) DistanceUtil.getDistance(current, endLatLng);
                     if (distance < Constant.LOCA_END_POINT_ACCURACY) {
                         //设置数据
                         if (userStepEntity != null) {
@@ -800,25 +818,7 @@ public class RunMainFragmentView implements MvpView {
                             isfirstEndTip = false;
                         }
                         //进行提示
-                        if (null == tipDialog) {
-                            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
-                            if (mVibrator != null) {
-                                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
-                                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
-                            }
-                            tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
-                                @Override
-                                public void onClick(TipDialog dialog) {
-                                    dialog.dismiss();
-                                }
-                            });
-                            tipDialog.setCancelable(false);
-                            tipDialog.setCanceledOnTouchOutside(false);
-                        }
-                        if (!tipDialog.isShowing()) {
-                            tipDialog.show();
-                        }
+                        showEndTipDialog();
                     }
                 }
             }
@@ -826,23 +826,57 @@ public class RunMainFragmentView implements MvpView {
     }
+    public void showEndTipDialog() {
+        if (null == getContext()) {
+            return;
+        }
+        //进行提示
+        if (null != endTipDialog && !endTipDialog.isShowing()) {
+            endTipDialog.show();
+            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
+            }
+        }
+    }
+
     /**
      * 设置停止状态标志位
      */
     private void setStopStartFlag() {
         CommonInfo.setTsRunBaiduTraceService(getContext(), false);
         CommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CommonInfo.setIsRunStepService(getContext(), false);
         CommonInfo.setIsWriteUserStep(getContext(), false);
         if (StepService.mClient != null) {
             StepService.mClient.stopGather(StepService.traceListener);
 //            StepService.CURRENT_STEP = 0;
         }
+//        fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
+    }
+
+    /**
+     * 停止计步服务
+     */
+    private void stopRunService() {
+        CommonInfo.setTsRunBaiduTraceService(getContext(), false);
+        CommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CommonInfo.setIsRunStepService(getContext(), false);
+        CommonInfo.setIsWriteUserStep(getContext(), false);
+        if (StepService.mClient != null) {
+            StepService.mClient.stopGather(StepService.traceListener);
+        }
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), KeepLiveService.class));
+
     }
     public void onDestroy() {
         if (mLocClient != null) {
             mLocClient.stop();
+            mLocClient = null;
         }
     }
@@ -591,8 +591,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                                 CommonInfo.resetRace(getContext());
                                 dialog.dismiss();
                                 //重置按钮
-                                fragment.binding.tvRunNow.setText("立即开始");
-                                fragment.binding.rlScrollViewStartBtn.setTag(BTN_START_RACE);
+                                if (null != runRaceDetailInfo) {
+                                    initStartBtnState(runRaceDetailInfo);
+                                }
                             }
                         }, "是", new SelectDialog.DialogInterface() {
                             @Override
@@ -620,8 +621,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                                 //清除数据
                                 CommonInfo.resetRace(getContext());
                                 //更改当前按钮
-                                fragment.binding.tvRunNow.setText("立即开始");
-                                fragment.binding.rlScrollViewStartBtn.setTag(BTN_START_RACE);
+                                if (null != runRaceDetailInfo) {
+                                    initStartBtnState(runRaceDetailInfo);
+                                }
                             }
                         }, "是", new SelectDialog.DialogInterface() {
@@ -743,11 +745,13 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private void stopStepService() {
         CommonInfo.setTsRunBaiduTraceService(getContext(), false);
         CommonInfo.setIsRunKeepAliveService(getContext(), false);
+        CommonInfo.setIsRunStepService(getContext(), false);
         CommonInfo.setIsWriteUserStep(getContext(), false);
         CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
         if (StepService.mClient != null) {
             StepService.mClient.stopGather(StepService.traceListener);
         }
+        fragment.getActivity().stopService(new Intent(fragment.getActivity(), KeepLiveService.class));
         fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
     }
@@ -1100,6 +1104,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.setBackgroundColor(getContext().getResources().getColor(R.color.green_round));
                 fragment.binding.rlScrollViewStartBtn.setTag(BTN_CONTINUE_RACE);
             } else {
                 Log.e(TAG, "大于9小时");
@@ -89,7 +89,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     private List<LatLng> currentPoints;
     private LatLng endLatLng;//终点坐标
     private UserStepEntity userStepEntity;
-    private TipDialog tipDialog;
+    private TipDialog endTipDialog;
     //创建震动服务对象
     private Vibrator mVibrator;
     private boolean isfirstEndTip = true;//是否是第一次提示到达终点
@@ -106,6 +106,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         if (getContext() == null) {
             return;
         }
+        initEndTipDialog();
         //获取手机震动服务
         mVibrator = (Vibrator) getContext().getSystemService(Service.VIBRATOR_SERVICE);
         userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
@@ -345,7 +346,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
                 if (null != current) {
                     //开始比较数据
-                    double distance = DistanceUtil.getDistance(current, endLatLng);
+                    int distance = (int) DistanceUtil.getDistance(current, endLatLng);
                     if (distance < Constant.LOCA_END_POINT_ACCURACY) {
                         //设置数据
                         if (userStepEntity != null) {
@@ -361,26 +362,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                             isfirstEndTip = false;
                         }
                         //进行提示
-                        if (null == tipDialog) {
-                            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
-                            if (mVibrator != null) {
-                                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
-                                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
-                                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
-                            }
-
-                            tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
-                                @Override
-                                public void onClick(TipDialog dialog) {
-                                    dialog.dismiss();
-                                }
-                            });
-                            tipDialog.setCancelable(false);
-                            tipDialog.setCanceledOnTouchOutside(false);
-                        }
-                        if (!tipDialog.isShowing()) {
-                            tipDialog.show();
-                        }
+                        showEndTipDialog();
                     }
                 }
             }
@@ -430,6 +412,32 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         }
     }
+    private void initEndTipDialog() {
+        endTipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_arrive_end_tip), "好的", R.color.green_round, new TipDialog.DialogInterface() {
+            @Override
+            public void onClick(TipDialog dialog) {
+                dialog.dismiss();
+            }
+        });
+        endTipDialog.setCancelable(false);
+        endTipDialog.setCanceledOnTouchOutside(false);
+    }
+
+    public void showEndTipDialog() {
+        if (null == getContext()) {
+            return;
+        }
+        //进行提示
+        if (null != endTipDialog && !endTipDialog.isShowing()) {
+            endTipDialog.show();
+            ChineseToSpeechUtil.speech(getContext(), "您已到达终点附近,可以结束运动了!");
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
+            }
+        }
+    }
     /**
      * 同步计时器
@@ -24,6 +24,7 @@ public class Constant {
     public static final int COLL_SERVICE_STEP_COUNT_ONRESUME = 15;//运营从后台回到前台,更新步数
     public static final int UPDATA_COLL_TRACE_LIST = 16;//更新轨迹列表
     public static final int UPDATE_RACE_STATE_BTN = 17;//更新赛事详情页按钮数据
+    public static final int ARRIVE_END_POINT = 18;//到达终点附近
     /*************************************用户其他值,非标志位************************************************************/
     public static long SERVICE_ID = 0;//公司账号
     //    public static final long SERVICE_ID = 213553;
@@ -31,7 +32,7 @@ public class Constant {
     public static final int GATHER_INTERVAL = 2;//位置采集周期
     public static final int PACK_INTERVAL = 10;//位置采集周期
     public static final int VIBRATOR_DELAY_TIME = 100;//震动等待时间(ms)
-    public static final int VIBRATOR_RUN_TIME = 1000;//震动执行时间(ms)
+    public static final int VIBRATOR_RUN_TIME = 2000;//震动执行时间(ms)
     public static final int VIBRATOR_REPEAT_TIME = -1;//震动重复次数(-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始)
     /*****************************************运营工具其他值,非标志位****************************************************/
     public static final double PASS_RATE = 0.7;//通过率70%
@@ -23,6 +23,7 @@ public class ServiceReceiver extends BroadcastReceiver {
     //唤醒锁
     private PowerManager.WakeLock wakeLock = null;
     private final String TAG = "ServiceReceiver";
+    private AudioManager audioManager;
     public ServiceReceiver() {
@@ -105,7 +106,9 @@ public class ServiceReceiver extends BroadcastReceiver {
     private void initSound(Context context) {
         try {
-            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            if (null==audioManager){
+                audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            }
             int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
             if (0 == currentVolume) {
                 audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 1, AudioManager.FLAG_PLAY_SOUND);
@@ -43,7 +43,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     private NotificationManager mNM;
     private Notification notification = null;
     //是否在后台运行
-    public static boolean isKeepService = true;
+    public static boolean isKeepService = false;
     public static KeepLiveService instance;
     private int startId;
     private final String TAG = "KeepLiveService";
@@ -52,6 +52,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     private boolean isRegisterReceiver = false;
     private boolean isStartForeground = false;
     private final int NOTIFICATION_ID = 1;
+
     public KeepLiveService() {
     }
@@ -159,13 +160,25 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
         Log.e("isRun onStartCommand", "" + isRun);
         if (isRun) {
-            if (runnable != null) {
-                handler.postDelayed(runnable, 5000);
-            }
+//            if (runnable != null) {
+//                handler.postDelayed(runnable, 5000);
+//            }
             showHideForegroundNotification();
 //            startService(new Intent(getApplicationContext(), HideKeepTipService.class));
 //            Log.e(TAG, "启动HideKeepTipService");
             startPlaySong();
+        } else {
+            try {
+                if (myReceiver != null && isRegisterReceiver) {
+                    unregisterReceiver(myReceiver);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "run: ");
+            }
+            stopPlaySong();
+            if (isStartForeground) {
+                stopForeground(true);
+            }
         }
         return START_STICKY;
     }
@@ -237,7 +250,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                 .build();
         // 0 隐藏前台服务通知
         startForeground(NOTIFICATION_ID, notification);
-        isStartForeground=true;
+        isStartForeground = true;
     }
     @Override
@@ -26,6 +26,15 @@ import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.Toast;
+import com.baidu.location.BDAbstractLocationListener;
+import com.baidu.location.BDLocation;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
+import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdateFactory;
+import com.baidu.mapapi.map.MyLocationData;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
@@ -52,6 +61,7 @@ import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
@@ -59,6 +69,7 @@ import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
+import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
@@ -141,7 +152,8 @@ public class StepService extends Service implements SensorEventListener {
     private static boolean pauseFlag;//是否暂停
     private static int speedCurrentStep;//用于检测速度步数
     private boolean updateSpeedStepFlag;//是否是已经更新速度
-
+    private LatLng endLatLng;//终点坐标
+    private UserStepEntity userStepEntity;
     /****************************************************鹰眼轨迹相关************************************************/
     /**
      * 轨迹服务监听器
@@ -163,6 +175,10 @@ public class StepService extends Service implements SensorEventListener {
      * 轨迹服务
      */
     public static Trace mTrace = null;
+    //定位
+    public MyLocationListenner myListener = new MyLocationListenner();
+    private LocationClient mLocClient;
+    private boolean isHasSendEndTip = true;//是否发送到达终点提示
     public StepService() {
@@ -506,7 +522,7 @@ public class StepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onListMonitoredPersonCallback: ");
             }
         };
-        if (userStepEntity != null &&!TextUtils.isEmpty(userStepEntity.getFenceId())) {
+        if (userStepEntity != null && !TextUtils.isEmpty(userStepEntity.getFenceId())) {
             List<Long> fenids = new ArrayList<>();
             fenids.add(Long.parseLong(userStepEntity.getFenceId()));
             MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
@@ -553,6 +569,7 @@ public class StepService extends Service implements SensorEventListener {
                 }
             }).start();
             startTimeCount();
+            initLocationClient();
         } else {
             EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
         }
@@ -640,6 +657,10 @@ public class StepService extends Service implements SensorEventListener {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        if (null != mLocClient) {
+            mLocClient.stop();
+            mLocClient = null;
+        }
         //取消前台进程
         stopForeground(true);
         if (mBatInfoReceiver != null) {
@@ -1203,5 +1224,97 @@ public class StepService extends Service implements SensorEventListener {
         return String.format("%02d:%02d:%02d", h, m, s);
     }
+    private void initLocationClient() {
+        if (null == mLocClient) {
+            // 定位初始化
+            mLocClient = new LocationClient(getApplicationContext());
+            mLocClient.registerLocationListener(myListener);
+        }
+        LocationClientOption option = new LocationClientOption();
+        option.setOpenGps(true); // 打开gps
+        //可选，设置返回经纬度坐标类型，默认GCJ02
+        //GCJ02：国测局坐标；
+        //BD09ll：百度经纬度坐标；
+        //BD09：百度墨卡托坐标；
+        //海外地区定位，无需设置坐标类型，统一返回WGS84类型坐标
+        option.setCoorType("gcj02"); // 设置坐标类型
+        //可选，默认false，设置是否开启Gps定位
+        option.setOpenGps(true);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
+        option.setOpenAutoNotifyMode();
+        //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        //LocationMode.Hight_Accuracy：高精度；
+        //LocationMode. Battery_Saving：低功耗；
+        //LocationMode. Device_Sensors：仅使用设备；
+        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
+        //可选，设置是否需要地址信息，默认不需要
+        option.setIsNeedAddress(false);
+        //可选，设置是否需要地址描述
+        option.setIsNeedLocationDescribe(false);
+        //可选，设置是否需要设备方向结果
+        option.setNeedDeviceDirect(false);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        //minTimeInterval - 最短定位时间间隔，单位毫秒，最小值0，开发者可以在设置希望的位置回调最短时间间隔
+        //minDistance - 最短定位距离间隔，单位米，最小值0，开发者可以设置希望的位置回调距离间隔
+        //locSensitivity - 定位变化敏感程度,LOC_SENSITIVITY_HIGHT,LOC_SENSITIVITY_MIDDLE,LOC_SENSITIVITY_LOW
+        option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
+        //可选，定位SDK内部是一个service，并放到了独立进程。
+        //设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
+        option.setIgnoreKillProcess(true);
+        mLocClient.setLocOption(option);
+        mLocClient.start();
+    }
+
+    /**
+     * //设置定位监听器，获取到用户当前位置 杨帅
+     * 定位SDK监听函数
+     */
+    public class MyLocationListenner extends BDAbstractLocationListener {
+        @Override
+        public void onReceiveLocation(BDLocation location) {
+            // map view 销毁后不在处理新接收的位置
+            if (location == null || null == getApplicationContext()) {
+                return;
+            }
+            //进行精度过滤
+//            if (location.getRadius() > Constant.LOCA_ACCURACY) {
+//                return;
+//            }
+            //进行数据比较(先看看数据库是否有数据)
+            if (null == endLatLng) {
+                userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+                if (null != userStepEntity) {
+                    if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                        endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+                    }
+                }
+            }
+            //开始比较数据
+            if (null != endLatLng) {
+                LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
+                if (null != current) {
+                    //开始比较数据
+                    int distance = (int) DistanceUtil.getDistance(current, endLatLng);
+                    if (distance < Constant.LOCA_END_POINT_ACCURACY) {
+                        if (isHasSendEndTip) {
+                            isHasSendEndTip = false;
+                            Log.e(TAG, "onReceiveLocation: 到达" );
+                            //发送到达终点通知
+                            EventBus.getDefault().post(new MessageEvent(Constant.ARRIVE_END_POINT, ""));
+                        }
+                        if (null == userStepEntity) {
+                            userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+                        }
+                        //设置数据
+                        if (userStepEntity != null) {
+                            userStepEntity.setIsArriveEndPoint(true);
+                            //更新数据
+                            StepUtil.updateStepData(getApplicationContext(), userStepEntity);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
@@ -62,8 +62,9 @@ public class DbCore {
             if (daoMaster == null) {
                 daoMaster = getDaoMaster();
             }
-            //不使用缓存
-            daoSession = daoMaster.newSession(IdentityScopeType.None);
+//            //不使用缓存
+//            daoSession = daoMaster.newSession(IdentityScopeType.None);
+            daoSession = daoMaster.newSession();
         }
         return daoSession;
     }
@@ -5,7 +5,9 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
+import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
@@ -30,6 +32,7 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RegistrationInfoPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RegistrationInfoView;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.utils.NetUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRegistrationInfoBinding;
@@ -69,7 +72,14 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     public void commitInfo() {
         if (!TextUtils.isEmpty(fenceId)) {
-            addMonitorToFence((int) (Double.parseDouble(fenceId)));
+            if (NetUtil.isNetworkConnected(getActivity())) {
+                addMonitorToFence((int) (Double.parseDouble(fenceId)));
+            } else {
+                if (null != getMvpView()) {
+                    getMvpView().allowClickRegistBtn();
+                }
+                AlertUtil.showDeftToast(getActivity(), "无法连接网络");
+            }
         }
     }
@@ -79,7 +89,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
      * @param fenceId
      */
     public void addMonitorToFence(int fenceId) {
-        if (null!=getMvpView()){
+        if (null != getMvpView()) {
             getMvpView().limitClickRegistBtn();
         }
         if (null == getPresenter()) {
@@ -148,7 +158,7 @@ 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()){
+                    if (null != getMvpView()) {
                         getMvpView().allowClickRegistBtn();
                     }
                     QMUITipDialogUtil.dismessDialog();
@@ -180,6 +190,9 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
             @Override
             public void onFailed(String msg) {
                 QMUITipDialogUtil.dismessDialog();
+                if (null != getMvpView()) {
+                    getMvpView().allowClickRegistBtn();
+                }
                 AlertUtil.showDeftToast(getContext(), msg);
             }
@@ -214,6 +214,13 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
                 tipDialog.show();
             }
         }
+        //到达终点
+        else if (messageEvent.getMessageType() == Constant.ARRIVE_END_POINT) {
+            if (null == getMvpView()) {
+                return;
+            }
+            getMvpView().showEndTipDialog();
+        }
     }
     @Override
@@ -217,6 +217,13 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
                 tipDialog.show();
             }
         }
+        //到达终点
+        else if (messageEvent.getMessageType() == Constant.ARRIVE_END_POINT) {
+            if (null == getMvpView()) {
+                return;
+            }
+            getMvpView().showEndTipDialog();
+        }
     }
     private void initTipDialog() {
@@ -69,75 +69,86 @@ public class MyMapUtil {
      * @param geoCodeResult
      */
     public static void getGeoCoderResult(LatLng latLng, GeoCodeResult geoCodeResult) {
-        if (null == latLng) {
-            return;
-        }
-        if (null == mSearch) {
-            mSearch = GeoCoder.newInstance();
-        }
-        mSearch.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
+        try {
+            if (null == latLng) {
+                return;
+            }
+            if (null == mSearch) {
+                mSearch = GeoCoder.newInstance();
+            }
+            mSearch.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
-            @Override
-            public void onGetGeoCodeResult(com.baidu.mapapi.search.geocode.GeoCodeResult geoCodeResult) {
+                @Override
+                public void onGetGeoCodeResult(com.baidu.mapapi.search.geocode.GeoCodeResult geoCodeResult) {
-            }
+                }
-            @Override
-            public void onGetReverseGeoCodeResult(ReverseGeoCodeResult reverseGeoCodeResult) {
+                @Override
+                public void onGetReverseGeoCodeResult(ReverseGeoCodeResult reverseGeoCodeResult) {
 //                Log.e(TAG, "status:" + reverseGeoCodeResult.status + ",error" + reverseGeoCodeResult.error);
-                //成功
-                if (0 == reverseGeoCodeResult.status) {
-                    queryGeoCount = 0;
-                    if (null != geoCodeResult) {
-                        List<PoiInfo> pois = reverseGeoCodeResult.getPoiList();
-                        if (null != pois && pois.size() > 0) {
-                            if (!TextUtils.isEmpty(pois.get(0).name)) {
-                                geoCodeResult.success(pois.get(0).name);
-                            } else {
-                                geoCodeResult.success(null);
-                            }
-                        } else {
-                            //如果街道号或者街道为空
-                            if ((null == reverseGeoCodeResult.getAddressDetail().street || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().street)) && (null == reverseGeoCodeResult.getAddressDetail().streetNumber || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().streetNumber))) {
-                                if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress()) && !TextUtils.isEmpty(reverseGeoCodeResult.getSematicDescription())) {
-                                    geoCodeResult.success(reverseGeoCodeResult.getAddress() + "," + reverseGeoCodeResult.getSematicDescription());
-                                } else if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress())) {
-                                    geoCodeResult.success(reverseGeoCodeResult.getAddress());
+                    if (null == reverseGeoCodeResult) {
+                        if (null != geoCodeResult) {
+                            geoCodeResult.success(null);
+                        }
+                    }
+                    //成功
+                    if (0 == reverseGeoCodeResult.status) {
+                        queryGeoCount = 0;
+                        if (null != geoCodeResult) {
+                            List<PoiInfo> pois = reverseGeoCodeResult.getPoiList();
+                            if (null != pois && pois.size() > 0) {
+                                if (!TextUtils.isEmpty(pois.get(0).name)) {
+                                    geoCodeResult.success(pois.get(0).name);
                                 } else {
                                     geoCodeResult.success(null);
                                 }
                             } else {
-                                if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress())) {
-                                    geoCodeResult.success(reverseGeoCodeResult.getAddress());
+                                //如果街道号或者街道为空
+                                if ((null == reverseGeoCodeResult.getAddressDetail().street || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().street)) && (null == reverseGeoCodeResult.getAddressDetail().streetNumber || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().streetNumber))) {
+                                    if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress()) && !TextUtils.isEmpty(reverseGeoCodeResult.getSematicDescription())) {
+                                        geoCodeResult.success(reverseGeoCodeResult.getAddress() + "," + reverseGeoCodeResult.getSematicDescription());
+                                    } else if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress())) {
+                                        geoCodeResult.success(reverseGeoCodeResult.getAddress());
+                                    } else {
+                                        geoCodeResult.success(null);
+                                    }
                                 } else {
-                                    geoCodeResult.success(null);
+                                    if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress())) {
+                                        geoCodeResult.success(reverseGeoCodeResult.getAddress());
+                                    } else {
+                                        geoCodeResult.success(null);
+                                    }
                                 }
                             }
                         }
+                    } else if (104 == reverseGeoCodeResult.status) {
+                        if (0 == queryGeoCount) {
+                            queryGeoCount = 1;
+                            new Handler().postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    getGeoCoderResult(latLng, geoCodeResult);
+                                }
+                            }, 1000);
+                        }
                     }
-                } else if (104 == reverseGeoCodeResult.status) {
-                    if (0 == queryGeoCount) {
-                        queryGeoCount = 1;
-                        new Handler().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                getGeoCoderResult(latLng, geoCodeResult);
-                            }
-                        }, 1000);
-                    }
-                }
-                //失败
-                else {
-                    queryGeoCount = 0;
-                    if (null != geoCodeResult) {
-                        geoCodeResult.success(null);
+                    //失败
+                    else {
+                        queryGeoCount = 0;
+                        if (null != geoCodeResult) {
+                            geoCodeResult.success(null);
+                        }
                     }
                 }
+            });
+            mSearch.reverseGeoCode(new ReverseGeoCodeOption()
+                    .location(latLng)
+                    .radius(Constant.COLL_GEORESULT_RADIUS));
+        } catch (Exception e) {
+            if (null != geoCodeResult) {
+                geoCodeResult.success(null);
             }
-        });
-        mSearch.reverseGeoCode(new ReverseGeoCodeOption()
-                .location(latLng)
-                .radius(Constant.COLL_GEORESULT_RADIUS));
+        }
     }
     /**
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp" />
+    <solid android:color="#CC000000" />
+</shape>
 \ No newline at end of file
@@ -127,5 +127,47 @@
                 android:textColor="@color/white"
                 android:textSize="18sp" />
         </LinearLayout>
+        <!--load-->
+        <LinearLayout
+            android:id="@+id/ll_loading"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:clickable="true"
+            android:visibility="gone"
+            android:focusableInTouchMode="true"
+            android:gravity="center">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/shape_load"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ProgressBar
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:indeterminateTint="@color/white"
+                    android:maxWidth="30dp"
+                    android:maxHeight="30dp"
+                    android:minWidth="20dp"
+                    android:minHeight="20dp"
+                    android:padding="10dp" />
+
+                <TextView
+                    android:id="@+id/tv_loading_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:layout_marginBottom="15dp"
+                    android:textSize="13sp"
+                    android:text="正在截取赛事图片,请稍后"
+                    android:textColor="@color/white" />
+            </LinearLayout>
+        </LinearLayout>
     </FrameLayout>
 </layout>
 \ No newline at end of file
@@ -147,5 +147,6 @@
                 android:textColor="@color/white"
                 android:textSize="18sp" />
         </LinearLayout>
+
     </FrameLayout>
 </layout>
 \ No newline at end of file