1.赛事详情

杨帅
1 parent 63fcc83f
Showing 74 changed files with 328 additions and 197 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.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/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/drawable-hdpi/button_fab_white.png
moudle_pedometer/src/main/res/drawable-hdpi/button_fab_white.webp
moudle_pedometer/src/main/res/drawable-hdpi/default_bg.png
moudle_pedometer/src/main/res/drawable-hdpi/default_bg.webp
moudle_pedometer/src/main/res/drawable-hdpi/default_register.png
moudle_pedometer/src/main/res/drawable-hdpi/default_register.webp
moudle_pedometer/src/main/res/drawable-hdpi/defaults.png
moudle_pedometer/src/main/res/drawable-hdpi/defaults.webp
moudle_pedometer/src/main/res/drawable-hdpi/erwe.png
moudle_pedometer/src/main/res/drawable-hdpi/erwe.webp
moudle_pedometer/src/main/res/drawable-hdpi/ic_icon.png
moudle_pedometer/src/main/res/drawable-hdpi/ic_icon.webp
moudle_pedometer/src/main/res/drawable-hdpi/ic_portrait_training_left_on.png
moudle_pedometer/src/main/res/drawable-hdpi/ic_portrait_training_left_on.webp
@@ -309,8 +309,8 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
     //创建地理围栏
     public void createFence(Context context, List<com.baidu.trace.model.LatLng> latLngs) {
         CreateFenceRequest createFenceRequest = null;
-        int offset = 1;// 偏离距离
-        int denoise = 5; //围栏去噪精度
+        int offset = 20;// 偏离距离
+        int denoise = 20; //围栏去噪精度
         // 初始化围栏监听器
         OnFenceListener onFenceListener = new OnFenceListener() {
             // 创建围栏回调
@@ -428,8 +428,8 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
         }
  
         List<Long> fenid = new ArrayList<>();
-        fenid.add(107L);
-        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildLocalRequest(1,
+        fenid.add(111L);
+        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(1,
                 StepService.serviceId, "yangshuai", fenid);
         Handler handler = new Handler();
         Runnable runnable = new Runnable() {
@@ -21,6 +21,7 @@ import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
@@ -60,7 +61,8 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView() {
-        uid = "yangshuai11";
+        uid = "yangshuai";
+        MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", uid);
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
         firstTimeFlag = true;
@@ -93,7 +95,7 @@ public class RunMainFragmentView implements MvpView {
                         }
                     }, 10);
                     //开启计步服务
-                    startStepService(uid);
+                    startStepService(getContext(), uid);
                 }
             }
         };
@@ -145,7 +147,7 @@ public class RunMainFragmentView implements MvpView {
                 }
             }, 10);
             //开启计步服务
-            startStepService(uid);
+            startStepService(getContext(), uid);
         }
  
         //设置继续按钮,缩放效果
@@ -250,6 +252,7 @@ public class RunMainFragmentView implements MvpView {
                                                     }
                                                     MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0);
                                                     fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
+                                                    MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", "");
  
                                                     //  fragment.getActivity().finish();
                                                 }
@@ -381,9 +384,9 @@ public class RunMainFragmentView implements MvpView {
      *
      * @param userId
      */
-    public void startStepService(String userId) {
+    public void startStepService(Context context, String userId) {
         Intent intent = new Intent(fragment.getActivity(), StepService.class);
-        intent.putExtra("userId", userId);
+//        intent.putExtra("userId", userId);
         ContextCompat.startForegroundService(fragment.getActivity(), intent);
  
     }
@@ -20,6 +20,7 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
@@ -30,6 +31,7 @@ import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.map.PolylineOptions;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.model.LatLngBounds;
 import com.baidu.mapapi.search.core.SearchResult;
 import com.baidu.mapapi.search.route.BikingRouteResult;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
@@ -41,6 +43,9 @@ import com.baidu.mapapi.search.route.RoutePlanSearch;
 import com.baidu.mapapi.search.route.TransitRouteResult;
 import com.baidu.mapapi.search.route.WalkingRoutePlanOption;
 import com.baidu.mapapi.search.route.WalkingRouteResult;
+import com.baidu.mapapi.utils.DistanceUtil;
+import com.baidu.trace.api.analysis.EndPoint;
+import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
@@ -48,6 +53,7 @@ import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
 import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
+import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -98,6 +104,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8},{\"latitude\":39.933903844942,\"latitudeE6\":3.9933903844942E7,\"longitude\":116.30918357649,\"longitudeE6\":1.1630918357649E8}]";
     private LinkedList<LatLng> importLatLngs;//关键点
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
+    private List<LatLng> trackPoints;
+
  
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -111,48 +119,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (fragment.getActivity() == null) {
             return;
         }
-        initMap();
-        List<LatLng> trackPoints = GsonUtil.jsonToList(test, LatLng.class);
-        Log.e(TAG, "initView: " + trackPoints.size());
         //初始化运营人员所选的关键点
-        importLatLngs = new LinkedList<>();
-//        importLatLngs.add(new LatLng(39.935861,116.308621));
-//        importLatLngs.add(new LatLng( 39.934948,116.308605));
-//        importLatLngs.add(new LatLng( 39.934516,116.3086));
-//        importLatLngs.add(new LatLng( 39.934121,116.30861));
-//        importLatLngs.add(new LatLng( 39.934105,116.308605));
-//
-//
-//        importLatLngs.add(new LatLng( 39.933702,116.3086));
-        importLatLngs.add(new LatLng(39.933890, 116.308726));
-        importLatLngs.add(new LatLng(39.933943, 116.309627));
-        importLatLngs.add(new LatLng(39.934733, 116.309515));
-        importLatLngs.add(new LatLng(39.934733, 116.308742));
-
-        MyMapUtil.drawMapLine(getContext(), baiduMap, trackPoints, R.color.red);
-
-//        searchRouteResult(new LatLng(39.934266, 116.309228), new LatLng(39.939756, 116.319766), 0);
-
-
-        //根据几个关键点进行步行路径规划
-//        if (importLatLngs != null) {
-//            if (importLatLngs.size() >= 1) {
-//                for (int index = 0; index < importLatLngs.size(); index++) {
-//                    //开始分段规划路径
-//                    //第一个点
-//                    if (index == 0) {
-//                        searchRouteResult(startLatLng, importLatLngs.get(index), 0);
-//                    } else {
-//                        searchRouteResult(importLatLngs.get(index - 1), importLatLngs.get(index), index);
-//                    }
-//                }
-//            } else {
-//            }
-//        }
+        trackPoints = GsonUtil.jsonToList(test, LatLng.class);
+        initMap();
+        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.6f);
         //设置底部卡片初始位置
-        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 200));
+        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 140));
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
@@ -173,27 +147,46 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if (fragment.getActivity() == null) {
+                    return;
+                }
                 //立即报名
                 if ("0".equals(fragment.binding.includeStreet.rlStartBtn.getTag())) {
                     fragment.binding.includeStreet.rlStartBtn.setTag("1");
-                    fragment.binding.includeStreet.tvRunNow.setText("现在开始");
+                    fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
                     fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
  
                     //设置滑动
                     fragment.binding.rlScrollViewStartBtn.setTag("1");
-                    fragment.binding.tvRunNow.setText("现在开始");
+                    fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
                     fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
                     RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
                 } else {
-                    //开始运动
-                    fragment.binding.includeStreet.rlStartBtn.setTag("0");
-                    fragment.binding.includeStreet.tvRunNow.setText("立即报名");
-                    fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
-                    fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
-                    //设置滑动
-                    fragment.binding.rlScrollViewStartBtn.setTag("0");
-                    fragment.binding.tvRunNow.setText("立即报名");
-                    fragment.binding.tvGoTip.setVisibility(View.GONE);
+                    //计算当前位置与起点坐标距离
+                    if (firstLatLng != null && trackPoints != null && trackPoints.size() > 0) {
+                        double distance = DistanceUtil.getDistance(firstLatLng, trackPoints.get(0));
+                        if (distance < 20) {
+                            //开始运动
+                            fragment.binding.includeStreet.rlStartBtn.setTag("0");
+                            fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
+                            fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
+                            fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
+                            //设置滑动
+                            fragment.binding.rlScrollViewStartBtn.setTag("0");
+                            fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
+                            fragment.binding.tvGoTip.setVisibility(View.GONE);
+                        } else {
+                            TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "确定", new TipDialog.DialogInterface() {
+                                @Override
+                                public void onClick(TipDialog dialog) {
+                                    dialog.dismiss();
+                                }
+                            });
+                            tipDialog.show();
+                            tipDialog.setCancelable(false);
+                            tipDialog.setCanceledOnTouchOutside(false);
+                        }
+                    }
                 }
             }
         });
@@ -231,7 +224,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             RaceRecordActivity.newInstance(fragment.getActivity());
         });
  
-        fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v ->{
+        fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
             TakePartActivity.newInstance(fragment.getActivity());
         });
     }
@@ -275,9 +268,34 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         LocationClientOption option = new LocationClientOption();
         option.setOpenGps(true); // 打开gps
         option.setCoorType("gcj02"); // 设置坐标类型
-        option.setScanSpan(3000);
+        //可选，默认false，设置是否开启Gps定位
+        option.setOpenGps(true);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
+        option.setOpenAutoNotifyMode();
+        //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
+        //可选，设置是否需要地址信息，默认不需要
+        option.setIsNeedAddress(true);
+        //可选，设置是否需要地址描述
+        option.setIsNeedLocationDescribe(true);
+        //可选，设置是否需要设备方向结果
+        option.setNeedDeviceDirect(true);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
         mLocClient.setLocOption(option);
         mLocClient.start();
+        //设置地图加载完毕监听
+        baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() {
+            @Override
+            public void onMapLoaded() {
+                //自动计算地图缩放
+                MapStatus.Builder builder = new MapStatus.Builder();
+                builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
+                builder.zoom(MyMapUtil.getZoom(trackPoints));
+                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+
+            }
+        });
     }
  
     /**
@@ -558,34 +576,43 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if (location == null || mMapView == null) {
                 return;
             }
-//            mCurrentLat = location.getLatitude();
-//            mCurrentLon = location.getLongitude();
+            if (isFirstLoc) {
+                isFirstLoc = false;
+                if (location.getRadius() > 20) {
+                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                }
+            } else {
+                //过滤定位精度
+                if (location.getRadius() > 20) {
+                    return;
+                }
+            }
             mCurrentAccracy = location.getRadius();
             followMyLocation = new MyLocationData.Builder()
                     .accuracy(location.getRadius())
                     // 此处设置开发者获取到的方向信息，顺时针0-360
-                    .direction(location.getDirection()).latitude(location.getLatitude())
+                    .direction(mCurrentDirection).latitude(location.getLatitude())
                     .longitude(location.getLongitude()).build();
-            if (followMyLocation == null) {
+            if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
                 return;
             }
  
             MapStatus.Builder builder = new MapStatus.Builder();
  
-            if (isFirstLoc) {
-                isFirstLoc = false;
-                firstLatLng = new LatLng(location.getLatitude(),
-                        location.getLongitude());
-                baiduMap.setMyLocationData(followMyLocation);
-                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
-                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+//            if (isFirstLoc) {
+//                isFirstLoc = false;
+            firstLatLng = new LatLng(location.getLatitude(),
+                    location.getLongitude());
+            baiduMap.setMyLocationData(followMyLocation);
+//                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
+//                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
  
 //                //显示当前位置图标
 //                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
 //                currentMark = new MarkerOptions().position(firstLatLng).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
 //                baiduMap.addOverlay(currentMark);
  
-                //根据几个关键点进行步行路径规划
+            //根据几个关键点进行步行路径规划
 //                if (importLatLngs != null) {
 //                    if (importLatLngs.size() >= 1) {
 //                        for (int index = 0; index < importLatLngs.size(); index++) {
@@ -602,7 +629,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //                    }
 //                }
  
-            }
+//            }
         }
     }
 }
@@ -13,6 +13,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
+import android.widget.Toast;
  
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
@@ -83,7 +84,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             mUiSettings = baiduMap.getUiSettings();
         }
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
-        mCurrentMode = MyLocationConfiguration.LocationMode.FOLLOWING;
+        mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
         Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
@@ -110,7 +111,20 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         LocationClientOption option = new LocationClientOption();
         option.setOpenGps(true); // 打开gps
         option.setCoorType("gcj02"); // 设置坐标类型
-        option.setScanSpan(3000);
+        //可选，默认false，设置是否开启Gps定位
+        option.setOpenGps(true);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
+        option.setOpenAutoNotifyMode();
+        //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
+        //可选，设置是否需要地址信息，默认不需要
+        option.setIsNeedAddress(true);
+        //可选，设置是否需要地址描述
+        option.setIsNeedLocationDescribe(true);
+        //可选，设置是否需要设备方向结果
+        option.setNeedDeviceDirect(false);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
         mLocClient.setLocOption(option);
         mLocClient.start();
         //地图加载完毕监听
@@ -180,22 +194,34 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
  
         @Override
         public void onReceiveLocation(BDLocation location) {
+            Toast.makeText(getContext(), "aa", Toast.LENGTH_SHORT).show();
+            Log.e(TAG, "onReceiveLocation: 状态" + location.getGpsAccuracyStatus());
             // map view 销毁后不在处理新接收的位置
             if (location == null || mMapView == null) {
                 return;
             }
-//            mCurrentLat = location.getLatitude();
-//            mCurrentLon = location.getLongitude();
+            if (isFirstLoc) {
+                isFirstLoc = false;
+                if (location.getRadius() > 20) {
+                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                }
+
+
+            } else {
+                //过滤定位精度
+                if (location.getRadius() > 20) {
+                    return;
+                }
+            }
             mCurrentAccracy = location.getRadius();
             mylocation = new MyLocationData.Builder()
                     .accuracy(location.getRadius())
                     // 此处设置开发者获取到的方向信息，顺时针0-360
                     .direction(mCurrentDirection).latitude(location.getLatitude())
                     .longitude(location.getLongitude()).build();
-            if (mylocation == null) {
+            if (mylocation == null || mylocation.latitude == 0 || mylocation.longitude == 0) {
                 return;
             }
-
             MapStatus.Builder builder = new MapStatus.Builder();
  
 //            if (isFirstLoc) {
@@ -203,9 +229,9 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             firstLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(mylocation);
-            if (trackPoints!=null){
-                Log.e(TAG, "trackPoints: "+MyMapUtil.isInPolygon(firstLatLng,trackPoints) );
-            }
+//            if (trackPoints!=null){
+//                Log.e(TAG, "trackPoints: "+MyMapUtil.isInPolygon(firstLatLng,trackPoints) );
+//            }
 //            if (isFirstLoc) {
 //                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
 //                isFirstLoc = false;
@@ -22,6 +22,7 @@ import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.Toast;
@@ -184,7 +185,6 @@ public class StepService extends Service implements SensorEventListener {
         }
         if (mTrace == null) {
             mTrace = new Trace(serviceId, entityName);
-
         }
         //初始化实时轨迹监听器
         realTimeTraceListener = new OnTrackListener() {
@@ -315,7 +315,7 @@ public class StepService extends Service implements SensorEventListener {
              */
             @Override
             public void onPushCallback(byte messageType, PushMessage pushMessage) {
-                Log.e(TAG, "onPushCallback: " );
+                Log.e(TAG, "onPushCallback: ");
                 if (messageType < 0x03 || messageType > 0x04) {
                     return;
                 }
@@ -323,7 +323,15 @@ public class StepService extends Service implements SensorEventListener {
                 if (null == alarmPushInfo) {
                     return;
                 }
-                Toast.makeText(getApplicationContext(),"onPushCallback",Toast.LENGTH_SHORT).show();
+                //超出范围
+                if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
+
+                }
+                //进入范围
+                else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
+
+                }
+                Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
  
             }
  
@@ -351,10 +359,10 @@ public class StepService extends Service implements SensorEventListener {
     @SuppressLint("WrongConstant")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent.getExtras().getString("userId") != null) {
-            userId = intent.getExtras().getString("userId");
+//        userId=intent.getExtras().getString("userId");
+        userId = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getString("userId", "");
+        if (userId != null && !TextUtils.isEmpty(userId)) {
             entityName = userId;
-            Log.e(TAG, "onStartCommand: entityName" + entityName);
             initTodayData(userId);
             initTrace();
             if (!EventBus.getDefault().isRegistered(this)) {
@@ -665,7 +673,7 @@ public class StepService extends Service implements SensorEventListener {
 //                    isCall();
 //                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
                     save();
-                    isNewDay();
+//                    isNewDay();
                 } else if ("close.StepService".equals(action)) {
                     Log.e("关闭StepService", "关闭");
                     onDestroy();
@@ -13,6 +13,7 @@ import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.map.PolylineOptions;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.example.moudle_pedometer.R;
  
@@ -79,6 +80,53 @@ public class MyMapUtil {
         return baiduMap.addOverlay(polylineOptions);
     }
  
+    /**
+     * 绘制服务器传过来的轨迹
+     */
+    public static Overlay drawServerLineTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
+        // 绘制新覆盖物前，清空之前的覆盖物
+        baiduMap.clear();
+        if (points == null || points.size() == 0) {
+            return null;
+        }
+        //只有一个点
+        if (points.size() == 1) {
+            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+            OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+//                    .zIndex(9).draggable(true);
+            return baiduMap.addOverlay(startOptions);
+        }
+
+        LatLng startPoint;
+        LatLng endPoint;
+        if (sortType == SortType.asc) {
+            startPoint = points.get(0);
+            endPoint = points.get(points.size() - 1);
+        } else {
+            startPoint = points.get(points.size() - 1);
+            endPoint = points.get(0);
+        }
+
+        // 添加起点图标
+        Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+        OverlayOptions startOptions = new MarkerOptions()
+                .position(startPoint).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+//                .zIndex(9).draggable(true);
+        // 添加终点图标
+        Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 40, 40);
+        OverlayOptions endOptions = new MarkerOptions().position(endPoint)
+                .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap));
+//                .zIndex(9).draggable(true);
+
+        // 添加路线（轨迹）
+        OverlayOptions polylineOptions = new PolylineOptions().width(10)
+                .color(context.getResources().getColor(lineColor)).points(points);
+
+        baiduMap.addOverlay(startOptions);
+        baiduMap.addOverlay(endOptions);
+        return baiduMap.addOverlay(polylineOptions);
+    }
+
  
     public static Overlay drawMapLine(Context context, BaiduMap baiduMap, List<LatLng> points, int lineColor) {
         OverlayOptions polylineOptions = new PolylineOptions().width(10)
@@ -144,36 +192,36 @@ public class MyMapUtil {
         return ret;
     }
  
-//    /**
-//     * 根据经纬极值计算绽放级别
-//     */
-//    public static float getZoom(List<LatLng> points) {
-//        double maxLng = points.get(points.size() - 1).longitude;
-//        double minLng = points.get(0).longitude;
-//        double maxLat = points.get(points.size() - 1).latitude;
-//        double minLat = points.get(0).latitude;
-//        LatLng tempLatLng;
-//
-//
-//        for (LatLng latLng : points) {
-//            tempLatLng = latLng;
-//            if (tempLatLng.longitude > maxLng) maxLng = tempLatLng.longitude;
-//            if (tempLatLng.longitude < minLng) minLng = tempLatLng.longitude;
-//            if (tempLatLng.latitude > maxLat) maxLat = tempLatLng.latitude;
-//            if (tempLatLng.latitude < minLat) minLat = tempLatLng.latitude;
-//        }
-//
-//        double[] zooms = {50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 25000, 50000, 100000, 200000, 500000, 1000000, 2000000};//级别18到3。
-//        LatLng pointA = new LatLng(maxLat, maxLng);  // 创建点坐标A
-//        LatLng pointB = new LatLng(minLat, minLng);  // 创建点坐标B
-////        double distance = DistanceUtil.getDistance(pointA, pointB);  //获取两点距离,保留小数点后两位
-//        for (int i = 0, zoomLen = zooms.length; i < zoomLen; i++) {
-//            if (zooms[i] - distance > 0) {
-//                return 18 - i + 3;//之所以会多3，是因为地图范围常常是比例尺距离的10倍以上。所以级别会增加3。
-//            }
-//        }
-//        return 18;
-//    }
+    /**
+     * 根据经纬极值计算绽放级别
+     */
+    public static float getZoom(List<LatLng> points) {
+        double maxLng = points.get(points.size() - 1).longitude;
+        double minLng = points.get(0).longitude;
+        double maxLat = points.get(points.size() - 1).latitude;
+        double minLat = points.get(0).latitude;
+        LatLng tempLatLng;
+
+
+        for (LatLng latLng : points) {
+            tempLatLng = latLng;
+            if (tempLatLng.longitude > maxLng) maxLng = tempLatLng.longitude;
+            if (tempLatLng.longitude < minLng) minLng = tempLatLng.longitude;
+            if (tempLatLng.latitude > maxLat) maxLat = tempLatLng.latitude;
+            if (tempLatLng.latitude < minLat) minLat = tempLatLng.latitude;
+        }
+
+        double[] zooms = {50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 25000, 50000, 100000, 200000, 500000, 1000000, 2000000};//级别18到3。
+        LatLng pointA = new LatLng(maxLat, maxLng);  // 创建点坐标A
+        LatLng pointB = new LatLng(minLat, minLng);  // 创建点坐标B
+        double distance = DistanceUtil.getDistance(pointA, pointB);  //获取两点距离,保留小数点后两位
+        for (int i = 0, zoomLen = zooms.length; i < zoomLen; i++) {
+            if (zooms[i] - distance > 0) {
+                return 18 - i + 3;//之所以会多3，是因为地图范围常常是比例尺距离的10倍以上。所以级别会增加3。
+            }
+        }
+        return 18;
+    }
  
     /**
      * 获取经纬度中心点
@@ -212,6 +260,8 @@ public class MyMapUtil {
     }
  
  
+
+    /*****************************************************地理围栏***************************************************************/
     /**
      * 地球半径
      */
@@ -100,7 +100,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="40sp"
                 android:layout_gravity="bottom"
-                android:background="@color/green"
+                android:background="@color/green_round"
                 android:tag="0">
  
                 <TextView
@@ -109,7 +109,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:tag="0"
-                    android:text="立即报名"
+                    android:text="@string/run_race_btn_sign_up"
                     android:textColor="@color/white"
                     android:textSize="18sp" />
  
@@ -24,7 +24,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
-                android:text="排行榜"
+                android:text="@string/layout_run_detail_rank_title"
                 android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
@@ -33,7 +33,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
-                android:text="查看排行榜 >"
+                android:text="@string/layout_run_detail_rank_see_rank"
                 android:textColor="@color/black"
                 android:textSize="13sp" />
         </LinearLayout>
@@ -73,7 +73,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
-                        android:text="人已完成"
+                        android:text="@string/layout_run_detail_rank_person_finish"
                         android:textColor="@color/text_gray"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -42,7 +42,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
-                        android:text="活动地点"
+                        android:text="@string/layout_street_active_point"
                         android:textColor="@color/bottom_sheet_dialog_race_location_text"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -77,75 +77,13 @@
                         android:textColor="@color/black"
                         android:textSize="15sp" />
                 </LinearLayout>
-                <!--起点-->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center_vertical">
-
-                    <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
-                        android:layout_marginLeft="25dp"
-                        android:background="@drawable/shape_circle_green" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="(起)"
-                        android:textColor="@color/bottom_sheet_dialog_race_location_text"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="首都师范大学操场东门"
-                        android:textColor="@color/black"
-                        android:textSize="15sp" />
-                </LinearLayout>
-                <!--终点-->
-                <LinearLayout
-                    android:id="@+id/ll_end_point"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center_vertical">
-
-                    <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
-                        android:layout_marginLeft="25dp"
-                        android:background="@drawable/shape_circle_red" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="(止)"
-                        android:textColor="@color/bottom_sheet_dialog_race_location_text"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="首都师范大学操场西门"
-                        android:textColor="@color/black"
-                        android:textSize="15sp" />
-                </LinearLayout>
-
                 <!--按钮-->
                 <RelativeLayout
                     android:id="@+id/rl_start_btn"
                     android:layout_width="match_parent"
                     android:layout_height="40sp"
                     android:layout_marginTop="10dp"
-                    android:background="@color/green"
+                    android:background="@color/green_round"
                     android:tag="0">
  
                     <TextView
@@ -153,7 +91,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:text="立即报名"
+                        android:text="@string/run_race_btn_sign_up"
                         android:textColor="@color/white"
                         android:textSize="18sp" />
  
@@ -172,6 +110,69 @@
  
                 </RelativeLayout>
             </LinearLayout>
+            <!--起点-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical">
+
+                <View
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginLeft="25dp"
+                    android:background="@drawable/shape_circle_green" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/layout_street_start_point"
+                    android:textColor="@color/bottom_sheet_dialog_race_location_text"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="首都师范大学操场东门"
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <!--终点-->
+            <LinearLayout
+                android:id="@+id/ll_end_point"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical">
+
+                <View
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginLeft="25dp"
+                    android:background="@drawable/shape_circle_red" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/layout_street_end_point"
+                    android:textColor="@color/bottom_sheet_dialog_race_location_text"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="首都师范大学操场西门"
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+
             <!--报名时间-->
             <LinearLayout
                 android:layout_width="match_parent"
@@ -188,7 +189,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:text="报名时间"
+                    android:text="@string/layout_street_sign_up_time"
                     android:textColor="@color/bottom_sheet_dialog_race_location_text"
                     android:textSize="14sp" />
             </LinearLayout>
@@ -245,7 +246,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:text="活动时间"
+                    android:text="@string/layout_street_active_time"
                     android:textColor="@color/bottom_sheet_dialog_race_location_text"
                     android:textSize="14sp" />
             </LinearLayout>
@@ -302,7 +303,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:text="参与人数"
+                    android:text="@string/layout_street_join_person_count"
                     android:textColor="@color/bottom_sheet_dialog_race_location_text"
                     android:textSize="14sp" />
             </LinearLayout>
@@ -339,7 +340,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="40dp"
                         android:layout_marginRight="10dp"
-                        FivePersonIconView:showRightFlag="true"/>
+                        FivePersonIconView:showRightFlag="true" />
  
  
                 </LinearLayout>
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="路线介绍"
+        android:text="@string/layout_run_detail_street_introduce_title"
         android:textSize="18sp"
         android:textStyle="bold" />
  
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="路线地图"
+        android:text="@string/layout_run_detail_street_introduce_map"
         android:textSize="18sp"
         android:textStyle="bold" />
  
@@ -3,7 +3,7 @@
     <color name="run_main_bg">#3D3745</color>
     <color name="run_main_time_bg">#5BC4A4</color>
     <color name="text_gray">#8F8C95</color>
-    <color name="green_round">#5BC4A5</color>
+    <color name="green_round">#29C48A</color>
     <color name="red_round">#F97070</color>
     <color name="gray_round">#D6D6D6</color>
     <color name="circle_stop">#40000000</color>
@@ -28,5 +28,21 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="share">分享</string>
     <string name="containuue">继续</string>
-
+    <!--赛事详情-->
+    <string name="run_race_btn_sign_up">立即报名</string>
+    <string name="run_race_btn_start_now">现在开始</string>
+    <string name="run_race_far_tip">您距离起点较远\n请到达起点附近再开始!</string>
+    <!--layout_street-->
+    <string name="layout_street_active_point">活动地点</string>
+    <string name="layout_street_start_point">(起)</string>
+    <string name="layout_street_end_point">(止)</string>
+    <string name="layout_street_sign_up_time">报名时间</string>
+    <string name="layout_street_active_time">活动时间</string>
+    <string name="layout_street_join_person_count">参与人数</string>
+    <string name="layout_run_detail_rank_title">排行榜</string>
+    <string name="layout_run_detail_rank_see_rank"><![CDATA[查看排行榜 >]]></string>
+    <string name="layout_run_detail_rank_person_finish">人已完成</string>
+    <string name="layout_run_detail_street_introduce_title">路线介绍</string>
+    <string name="layout_run_detail_street_introduce_map">路线地图</string>
+    <!---->
 </resources>