1 修复用户开始运动后,点击返回按钮,赛事详情页按钮无法及时刷新问题

杨帅
1 parent 14c61e0f
Showing 3 changed files with 29 additions and 30 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.4.2",
+            version: "0.4.3",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -87,7 +87,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private MarkerOptions endMark;
     private MarkerOptions startMark;
  
-    private LatLng firstLatLng;
+    private LatLng userCurrentLatLng;
     private Double lastX = 0.0;
     private int mCurrentDirection = 0;
     //    private double mCurrentLat = 0.0;
@@ -432,7 +432,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 fragment.binding.includeRank.tvFirstTime.setText(TimeUtil.stampToChronometer(Long.parseLong(runRaceDetailInfo.getFirstEmployTime())));
             }
             //设置完成人数
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())){
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
                 fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
             }
         } else {
@@ -481,8 +481,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //                    RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
 //                } else {
 //                    //计算当前位置与起点坐标距离
-//                    if (firstLatLng != null && trackPoints != null && trackPoints.size() > 0) {
-//                        double distance = DistanceUtil.getDistance(firstLatLng, trackPoints.get(0));
+//                    if (userCurrentLatLng != null && trackPoints != null && trackPoints.size() > 0) {
+//                        double distance = DistanceUtil.getDistance(userCurrentLatLng, trackPoints.get(0));
 //                        if (distance < 20) {
 //                            //开始运动
 //                            fragment.binding.includeStreet.rlStartBtn.setTag("0");
@@ -521,8 +521,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     //先判断是否从百度查询到赛事轨迹
                     if (null != endLatLng && null != startLatLng) {
                         //开始比较距离
-                        if (null != firstLatLng) {
-                            double currentDiatance = DistanceUtil.getDistance(firstLatLng, startLatLng);
+                        if (null != userCurrentLatLng) {
+                            double currentDiatance = DistanceUtil.getDistance(userCurrentLatLng, startLatLng);
                             if (currentDiatance < Constant.LOCA_START_POINT_ACCURACY) {
                                 //设置终点坐标
                                 runRaceDetailInfo.setEndLatLng(GsonUtil.GsonString(endLatLng));
@@ -945,12 +945,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         double x = sensorEvent.values[SensorManager.DATA_X];
         if (Math.abs(x - lastX) > 1.0) {
             mCurrentDirection = (int) x;
-            if (firstLatLng != null) {
+            if (userCurrentLatLng != null) {
                 followMyLocation = new MyLocationData.Builder()
                         .accuracy(mCurrentAccracy)
                         // 此处设置开发者获取到的方向信息，顺时针0-360
-                        .direction(mCurrentDirection).latitude(firstLatLng.latitude)
-                        .longitude(firstLatLng.longitude).build();
+                        .direction(mCurrentDirection).latitude(userCurrentLatLng.latitude)
+                        .longitude(userCurrentLatLng.longitude).build();
                 baiduMap.setMyLocationData(followMyLocation);
             }
         }
@@ -1031,23 +1031,23 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             else {
                 isDifferentStreet = true;
             }
-
-        }
-
-        if (null == runRaceDetailInfo) {
-            return;
-        }
-        if (runRaceDetailInfo.isSignResult()) {
-            fragment.binding.rlScrollViewStartBtn.setTag("1");
-            fragment.binding.tvRunNow.setText("现在开始");
-            fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+            //判断赛事是否已经结束
+            checkTheRaceIsEnd();
         } else {
-            fragment.binding.rlScrollViewStartBtn.setTag("0");
-            fragment.binding.tvRunNow.setText("立即报名");
-            fragment.binding.tvGoTip.setVisibility(View.GONE);
+            if (null == runRaceDetailInfo) {
+                return;
+            }
+            if (runRaceDetailInfo.isSignResult()) {
+                fragment.binding.rlScrollViewStartBtn.setTag("1");
+                fragment.binding.tvRunNow.setText("现在开始");
+                fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+            } else {
+                fragment.binding.rlScrollViewStartBtn.setTag("0");
+                fragment.binding.tvRunNow.setText("立即报名");
+                fragment.binding.tvGoTip.setVisibility(View.GONE);
+            }
         }
-        //判断赛事是否已经结束
-        checkTheRaceIsEnd();
+
  
     }
  
@@ -1150,19 +1150,19 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
  
             MapStatus.Builder builder = new MapStatus.Builder();
-            firstLatLng = new LatLng(location.getLatitude(),
+            userCurrentLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
             //没有获取到轨迹
-            if ((null == queryResultPoints || queryResultPoints.size() < 1) && null != firstLatLng) {
-                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
+            if ((null == queryResultPoints || queryResultPoints.size() < 1) && null != userCurrentLatLng) {
+                builder.target(userCurrentLatLng).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));
+//                currentMark = new MarkerOptions().position(userCurrentLatLng).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
 //                baiduMap.addOverlay(currentMark);
  
             //根据几个关键点进行步行路径规划
@@ -230,7 +230,6 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                 .build();
         // 0 隐藏前台服务通知
         startForeground(100, notification);
-//        stopForeground(true);
     }
  
     @Override