1 修复在无网络切换到有网时,赛事详情页小概率消失问题

2 修复部分机型在赛事结束页中相关提示标签遮挡问题 3 修复当字体调到最大时,赛事结束页UI显示异常问题 4 优化起点终点相同时,点击开始会提示结束弹框的问题

1 修复在无网络切换到有网时,赛事详情页小概率消失问题
2 修复部分机型在赛事结束页中相关提示标签遮挡问题 3 修复当字体调到最大时,赛事结束页UI显示异常问题 4 优化起点终点相同时,点击开始会提示结束弹框的问题
杨帅
1 parent bcd74012
Showing 10 changed files with 91 additions and 75 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.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/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
moudle_pedometer/src/main/res/layout/layout_finish_step.xml
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.7.26",
+            version: "0.8.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -231,7 +231,7 @@ public class OnGoingFragmentView implements MvpView {
                         return false;
                     }
                 });
-                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+//                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
             }
             //设置活动地点
             if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
@@ -376,7 +376,7 @@ public class OnGoingFragmentView implements MvpView {
     public void initMap() {
         //隐藏底部滑动卡片
-        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -430,7 +430,7 @@ public class OnGoingFragmentView implements MvpView {
         //显示空视图
         fragment.binding.emptyLayout.setVisibility(View.VISIBLE);
         //隐藏底部卡片
-        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         if (fragment.binding.emptyLayout == null) return;
         String titleText = "";
         String detailText = "";
@@ -796,6 +796,13 @@ public class RunMainFragmentView implements MvpView {
                     if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
                         endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
                     }
+                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                        return;
+                    } else {
+                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
+                            return;
+                        }
+                    }
                 }
             }
             //开始比较
@@ -348,7 +348,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     return false;
                 }
             });
-            fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+
         }
         //设置活动地点
         if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
@@ -758,7 +758,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     public void initMap() {
         //隐藏底部滑动卡片
-        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -1208,15 +1208,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if (location == null || mMapView == null) {
                 return;
             }
-//            if (null != baiduMap && null != startLatLng) {
-//                int currentDiatance = (int) DistanceUtil.getDistance(new LatLng(location.getLatitude(), location.getLongitude()), startLatLng);
-//                MyMapUtil.setStartInfoWindow(getContext(), baiduMap, new LatLng(location.getLatitude(), location.getLongitude()), currentDiatance + "", new InfoWindow.OnInfoWindowClickListener() {
-//                    @Override
-//                    public void onInfoWindowClick() {
-//
-//                    }
-//                });
-//            }
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
@@ -1310,7 +1301,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //显示空视图
         fragment.binding.emptyLayout.setVisibility(View.VISIBLE);
         //隐藏底部卡片
-        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         if (fragment.binding.emptyLayout == null) return;
         String titleText = "";
         String detailText = "";
@@ -319,7 +319,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位误差为:" + (int)location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "当前定位误差为:" + (int) location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
@@ -330,42 +330,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                 }
             }
-            //进行数据比较(先看看数据库是否有数据)
-            if (null == endLatLng) {
-                if (null == userStepEntity) {
-                    userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
-                }
-                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 (userStepEntity != null) {
-                            userStepEntity.setIsArriveEndPoint(true);
-                            //更新数据
-                            StepUtil.updateStepData(getContext(), userStepEntity);
-                        }
-
-                        if (!isfirstEndTip) {
-                            return;
-                        }
-                        if (isfirstEndTip) {
-                            isfirstEndTip = false;
-                        }
-                        //进行提示
-                        showEndTipDialog();
-                    }
-                }
-            }
             mCurrentAccracy = location.getRadius();
             mylocation = new MyLocationData.Builder()
@@ -409,6 +373,51 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             myCurLatLng = new LatLng(location.getLatitude(),
                     location.getLongitude());
             baiduMap.setMyLocationData(mylocation);
+
+            //进行数据比较(先看看数据库是否有数据)
+            if (null == endLatLng) {
+                if (null == userStepEntity) {
+                    userStepEntity = StepUtil.getUserStepData(getContext(), CommonInfo.getUserId(getContext()));
+                }
+                if (null != userStepEntity) {
+                    if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+                        endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
+                    }
+                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                        return;
+                    } else {
+                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
+                            return;
+                        }
+                    }
+                }
+            }
+
+            //开始比较
+            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 (userStepEntity != null) {
+                            userStepEntity.setIsArriveEndPoint(true);
+                            //更新数据
+                            StepUtil.updateStepData(getContext(), userStepEntity);
+                        }
+
+                        if (!isfirstEndTip) {
+                            return;
+                        }
+                        if (isfirstEndTip) {
+                            isfirstEndTip = false;
+                        }
+                        //进行提示
+                        showEndTipDialog();
+                    }
+                }
+            }
         }
     }
@@ -1288,8 +1288,16 @@ public class StepService extends Service implements SensorEventListener {
                     if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
                         endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
                     }
+                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                        return;
+                    } else {
+                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
+                            return;
+                        }
+                    }
                 }
             }
+
             //开始比较数据
             if (null != endLatLng) {
                 LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
@@ -1299,7 +1307,7 @@ public class StepService extends Service implements SensorEventListener {
                     if (distance < Constant.LOCA_END_POINT_ACCURACY) {
                         if (isHasSendEndTip) {
                             isHasSendEndTip = false;
-                            Log.e(TAG, "onReceiveLocation: 到达" );
+                            Log.e(TAG, "onReceiveLocation: 到达");
                             //发送到达终点通知
                             EventBus.getDefault().post(new MessageEvent(Constant.ARRIVE_END_POINT, ""));
                         }
@@ -181,6 +181,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/color_fff"
+            android:clickable="true"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:visibility="gone" />
@@ -31,7 +31,7 @@
                 android:gravity="bottom"
                 android:text="跑步路线"
                 android:textColor="@color/text_black"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
         </LinearLayout>
         <!--起点-->
         <LinearLayout
@@ -52,7 +52,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="@string/layout_street_start_point"
                 android:textColor="@color/text_gray"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
             <TextView
                 android:id="@+id/tv_start_point"
@@ -61,7 +61,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="--"
                 android:textColor="@color/black"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
         </LinearLayout>
         <!--竖线-->
         <View
@@ -89,7 +89,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="@string/layout_street_end_point"
                 android:textColor="@color/text_gray"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
             <TextView
                 android:id="@+id/tv_end_point"
@@ -98,7 +98,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="--"
                 android:textColor="@color/black"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
         </LinearLayout>
         <!--竖线-->
         <View
@@ -133,7 +133,7 @@
                     android:layout_marginTop="5dp"
                     android:text="--"
                     android:textColor="@color/text_black"
-                    android:textSize="18sp"
+                    android:textSize="18dp"
                     android:textStyle="bold" />
                 <TextView
@@ -142,7 +142,7 @@
                     android:layout_marginLeft="11dp"
                     android:text="跑步记录时长"
                     android:textColor="@color/text_gray"
-                    android:textSize="11sp" />
+                    android:textSize="11dp" />
                 <!---->
             </LinearLayout>
         </LinearLayout>
@@ -176,7 +176,7 @@
                 android:text="--"
                 android:textStyle="bold"
                 android:textColor="@color/text_gray"
-                android:textSize="11sp" />
+                android:textSize="11dp" />
         </LinearLayout>
         <!---->
     </LinearLayout>
@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:text="总步数"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
         </LinearLayout>
         <!---->
         <LinearLayout
@@ -43,7 +43,7 @@
                 android:layout_height="wrap_content"
                 android:text="--"
                 android:textColor="@color/green_round"
-                android:textSize="28sp"
+                android:textSize="28dp"
                 android:textStyle="bold" />
             <TextView
@@ -53,7 +53,7 @@
                 android:layout_marginTop="4dp"
                 android:text="步"
                 android:textColor="@color/text_black"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
         </LinearLayout>
         <!---->
     </LinearLayout>
@@ -8,7 +8,7 @@
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="195dp"
+            android:layout_height="200dp"
             android:layout_marginTop="30dp"
             android:background="@drawable/shape_10dp_white_raduis_bg"
             android:orientation="vertical">
@@ -21,7 +21,7 @@
                 android:layout_marginTop="10dp"
                 android:text="--"
                 android:textColor="@color/text_black"
-                android:textSize="13sp" />
+                android:textSize="13dp" />
             <!---->
             <LinearLayout
                 android:layout_width="match_parent"
@@ -42,7 +42,7 @@
                         android:layout_marginTop="15dp"
                         android:text="--"
                         android:textColor="@color/text_black"
-                        android:textSize="15sp" />
+                        android:textSize="15dp" />
                     <TextView
                         android:id="@+id/tv_date"
@@ -52,7 +52,7 @@
                         android:layout_marginTop="5dp"
                         android:text="--"
                         android:textColor="@color/text_gray"
-                        android:textSize="10sp" />
+                        android:textSize="10dp" />
                 </LinearLayout>
                 <!---->
                 <LinearLayout
@@ -68,7 +68,7 @@
                         android:layout_marginRight="10dp"
                         android:text="--"
                         android:textColor="@color/text_black"
-                        android:textSize="45sp"
+                        android:textSize="45dp"
                         android:textStyle="bold" />
                     <TextView
@@ -77,7 +77,7 @@
                         android:layout_marginRight="15dp"
                         android:text="公里"
                         android:textColor="@color/text_black"
-                        android:textSize="15sp" />
+                        android:textSize="15dp" />
                 </LinearLayout>
                 <!---->
             </LinearLayout>
@@ -108,7 +108,7 @@
                         android:layout_height="wrap_content"
                         android:text="--"
                         android:textColor="@color/text_black"
-                        android:textSize="20sp"
+                        android:textSize="20dp"
                         android:textStyle="bold" />
                     <TextView
@@ -118,7 +118,7 @@
                         android:layout_marginBottom="10dp"
                         android:text="配速"
                         android:textColor="@color/text_black"
-                        android:textSize="15sp" />
+                        android:textSize="15dp" />
                 </LinearLayout>
                 <!---->
                 <LinearLayout
@@ -134,7 +134,7 @@
                         android:layout_height="wrap_content"
                         android:text="--"
                         android:textColor="@color/text_black"
-                        android:textSize="20sp"
+                        android:textSize="20dp"
                         android:textStyle="bold" />
                     <TextView
@@ -144,7 +144,7 @@
                         android:layout_marginBottom="10dp"
                         android:text="用时"
                         android:textColor="@color/text_black"
-                        android:textSize="15sp" />
+                        android:textSize="15dp" />
                 </LinearLayout>
                 <!---->
             </LinearLayout>