1 优化绑定功能逻辑

杨帅
1 parent b36c7ea5
Showing 9 changed files with 41 additions and 326 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MapUtil.java
moudle_pedometer/src/main/res/layout/fragment_collect_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_collect_run_detail_street.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
@@ -194,6 +194,31 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                     return false;
                 }
             });
+            //开始绘制历史轨迹
+            long startTime = 0;
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime())) {
+                startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
+            }
+            long endTime = 0;
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getEndTime())) {
+                endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
+            }
+            String entityName = "";
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
+                entityName = runRaceDetailInfo.getEntityName();
+            }
+            //开始查询历史轨迹
+            if (0 != startTime && 0 != endTime && !TextUtils.isEmpty(entityName)) {
+                MyMapUtil.queryHistoryTrace(getContext(), mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+                    @Override
+                    public void success(List<LatLng> resultPoints) {
+                        if (null != resultPoints && resultPoints.size() > 1) {
+                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                        }
+                    }
+                });
+            }
         }
         //设置活动地点
@@ -201,7 +226,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
             //设置活动距离
             if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
-                fragment.binding.includeStreet.tvAddress.append("\t\t" + runRaceDetailInfo.getMileage());
+                fragment.binding.includeStreet.tvAddress.append("\t\t全长" + runRaceDetailInfo.getMileage() + "公里");
             }
         }
@@ -244,7 +269,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             @Override
             public void onClick(View view) {
                 if (null != runRaceDetailInfo) {
-                    RaceNameListActivity.newInstance(fragment.getActivity(), CollCommonInfo.getStreetId(fragment.getActivity()),runRaceDetailInfo);
+                    RaceNameListActivity.newInstance(fragment.getActivity(), CollCommonInfo.getStreetId(fragment.getActivity()), runRaceDetailInfo);
 //                    StartCollectTraceActivity.startActivity(fragment.getActivity(), runRaceDetailInfo);
                 }
@@ -248,8 +248,10 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                         if (null == baiduMap) {
                             return;
                         }
-                        MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
-                        MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                        if (resultPoints.size() > 1) {
+                            MyMapUtil.drawHistoryTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                        }
                     }
                 }
             });
 package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
-import com.baidu.mapapi.map.MarkerOptions;
-import com.baidu.mapapi.map.Overlay;
-import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.utils.DistanceUtil;
-import com.baidu.trace.api.entity.AddEntityResponse;
-import com.baidu.trace.api.entity.AroundSearchResponse;
-import com.baidu.trace.api.entity.BoundSearchResponse;
-import com.baidu.trace.api.entity.DeleteEntityResponse;
-import com.baidu.trace.api.entity.DistrictSearchResponse;
-import com.baidu.trace.api.entity.EntityInfo;
-import com.baidu.trace.api.entity.EntityListRequest;
-import com.baidu.trace.api.entity.EntityListResponse;
-import com.baidu.trace.api.entity.FilterCondition;
 import com.baidu.trace.api.entity.LocRequest;
-import com.baidu.trace.api.entity.OnEntityListener;
-import com.baidu.trace.api.entity.PolygonSearchResponse;
-import com.baidu.trace.api.entity.SearchResponse;
-import com.baidu.trace.api.entity.SortBy;
-import com.baidu.trace.api.entity.UpdateEntityResponse;
 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
 import com.baidu.trace.api.fence.CreateFenceRequest;
 import com.baidu.trace.api.fence.CreateFenceResponse;
-import com.baidu.trace.api.fence.DeleteFenceRequest;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
-import com.baidu.trace.api.fence.FenceInfo;
 import com.baidu.trace.api.fence.FenceListRequest;
 import com.baidu.trace.api.fence.FenceListResponse;
 import com.baidu.trace.api.fence.HistoryAlarmResponse;
@@ -48,31 +25,16 @@ import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.api.track.DistanceRequest;
-import com.baidu.trace.api.track.DistanceResponse;
 import com.baidu.trace.api.track.HistoryTrackRequest;
-import com.baidu.trace.api.track.HistoryTrackResponse;
-import com.baidu.trace.api.track.LatestPointResponse;
-import com.baidu.trace.api.track.OnTrackListener;
-import com.baidu.trace.api.track.SupplementMode;
-import com.baidu.trace.api.track.TrackPoint;
 import com.baidu.trace.model.CoordType;
-import com.baidu.trace.model.ProcessOption;
 import com.baidu.trace.model.SortType;
-import com.baidu.trace.model.StatusCodes;
-import com.baidu.trace.model.TraceLocation;
-import com.baidu.trace.model.TransportMode;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunningMapFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
-import com.cnlive.moudle.pedometer.model.RoutePoint;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.utils.BitmapUtil;
-import com.cnlive.moudle.pedometer.utils.CommonUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
-import com.cnlive.moudle.pedometer.utils.MapUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-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.MvpBasePresenter;
@@ -317,7 +317,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
         });
         /*************************设置相关页面数据***************************/
-        if (runRaceDetailInfo.getFenceId() != null) {
+        if (runRaceDetailInfo.getFenceId() != null&&!TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
             //设置围栏ID
             CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
         }
@@ -419,7 +419,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
             //设置用时
             if (!TextUtils.isEmpty(runRaceDetailInfo.getEmployTime())) {
-                fragment.binding.includePersonScore.tvEmployTime.setText(runRaceDetailInfo.getEmployTime());
+                fragment.binding.includePersonScore.tvEmployTime.setText(TimeUtil.stampToChronometer(Long.parseLong(runRaceDetailInfo.getEmployTime())));
             }
             //设置配速
             if (!TextUtils.isEmpty(runRaceDetailInfo.getPace())) {
@@ -443,6 +443,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstName())) {
                 fragment.binding.includeRank.tvKingNickName.setText(runRaceDetailInfo.getFirstName());
             }
+            //第一名用时
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstEmployTime())){
+                fragment.binding.includeRank.tvFirstTime.setText(TimeUtil.stampToChronometer(Long.parseLong(runRaceDetailInfo.getFirstEmployTime())));
+            }
         } else {
             fragment.binding.includeRank.llRankRoot.setVisibility(View.GONE);
-package com.cnlive.moudle.pedometer.utils;
-
-import android.graphics.Color;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptor;
-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.Marker;
-import com.baidu.mapapi.map.MarkerOptions;
-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.model.LatLngBounds;
-import com.baidu.mapapi.utils.CoordinateConverter;
-import com.baidu.trace.model.CoordType;
-import com.baidu.trace.model.SortType;
-import com.baidu.trace.model.TraceLocation;
-
-import java.util.List;
-
-
-/**
- * Created by baidu on 17/2/9.
- */
-
-public class MapUtil {
-
-    private static MapUtil INSTANCE = new MapUtil();
-
-    private MapStatus mapStatus = null;
-
-    private Marker mMoveMarker = null;
-
-    public MapView mapView = null;
-
-    public BaiduMap baiduMap = null;
-
-    public LatLng lastPoint = null;
-
-    /**
-     * 路线覆盖物
-     */
-    public Overlay polylineOverlay = null;
-
-    private MapUtil() {
-    }
-
-    public static MapUtil getInstance() {
-        return INSTANCE;
-    }
-
-    public void init(MapView view) {
-        mapView = view;
-        baiduMap = mapView.getMap();
-        mapView.showZoomControls(false);
-    }
-
-    public void onPause() {
-        if (null != mapView) {
-            mapView.onPause();
-        }
-    }
-
-    public void onResume() {
-        if (null != mapView) {
-            mapView.onResume();
-        }
-    }
-
-    public void clear() {
-        lastPoint = null;
-        if (null != mMoveMarker) {
-            mMoveMarker.remove();
-            mMoveMarker = null;
-        }
-        if (null != polylineOverlay) {
-            polylineOverlay.remove();
-            polylineOverlay = null;
-        }
-        if (null != baiduMap) {
-            baiduMap.clear();
-            baiduMap = null;
-        }
-        mapStatus = null;
-        if (null != mapView) {
-            mapView.onDestroy();
-            mapView = null;
-        }
-    }
-
-    /**
-     * 将轨迹实时定位点转换为地图坐标
-     *
-     * @param location
-     *
-     * @return
-     */
-    public static LatLng convertTraceLocation2Map(TraceLocation location) {
-        if (null == location) {
-            return null;
-        }
-        double latitude = location.getLatitude();
-        double longitude = location.getLongitude();
-        if (Math.abs(latitude - 0.0) < 0.000001 && Math.abs(longitude - 0.0) < 0.000001) {
-            return null;
-        }
-        LatLng currentLatLng = new LatLng(latitude, longitude);
-        if (CoordType.wgs84 == location.getCoordType()) {
-            LatLng sourceLatLng = currentLatLng;
-            CoordinateConverter converter = new CoordinateConverter();
-            converter.from(CoordinateConverter.CoordType.GPS);
-            converter.coord(sourceLatLng);
-            currentLatLng = converter.convert();
-        }
-        return currentLatLng;
-    }
-
-    /**
-     * 将地图坐标转换轨迹坐标
-     *
-     * @param latLng
-     *
-     * @return
-     */
-    public static com.baidu.trace.model.LatLng convertMap2Trace(LatLng latLng) {
-        return new com.baidu.trace.model.LatLng(latLng.latitude, latLng.longitude);
-    }
-
-    /**
-     * 将轨迹坐标对象转换为地图坐标对象
-     *
-     * @param traceLatLng
-     *
-     * @return
-     */
-    public static LatLng convertTrace2Map(com.baidu.trace.model.LatLng traceLatLng) {
-        return new LatLng(traceLatLng.latitude, traceLatLng.longitude);
-    }
-
-//    /**
-//     * 设置地图中心：使用已有定位信息；
-//     *
-//     * @param trackApp
-//     */
-//    public void setCenter(TrackApplication trackApp) {
-//        if (!CommonUtil.isZeroPoint(CurrentLocation.latitude, CurrentLocation.longitude)) {
-//            LatLng currentLatLng = new LatLng(CurrentLocation.latitude, CurrentLocation.longitude);
-//            updateStatus(currentLatLng, false);
-//            return;
-//        }
-//        String lastLocation = trackApp.trackConf.getString(Constants.LAST_LOCATION, null);
-//        if (!TextUtils.isEmpty(lastLocation)) {
-//            String[] locationInfo = lastLocation.split(";");
-//            if (!CommonUtil.isZeroPoint(Double.parseDouble(locationInfo[1]),
-//                    Double.parseDouble(locationInfo[2]))) {
-//                LatLng currentLatLng = new LatLng(Double.parseDouble(locationInfo[1]),
-//                        Double.parseDouble(locationInfo[2]));
-//                updateStatus(currentLatLng, false);
-//                return;
-//            }
-//        }
-//    }
-
-//    public void updateStatus(LatLng currentPoint, boolean showMarker) {
-//        if (null == baiduMap || null == currentPoint) {
-//            return;
-//        }
-//
-//        if (null != baiduMap.getProjection()) {
-//            Point screenPoint = baiduMap.getProjection().toScreenLocation(currentPoint);
-//            // 点在屏幕上的坐标超过限制范围，则重新聚焦底图
-//            if (screenPoint.y < 200 || screenPoint.y > TrackApplication.screenHeight - 500
-//                    || screenPoint.x < 200 || screenPoint.x > TrackApplication.screenWidth - 200
-//                    || null == mapStatus) {
-//                animateMapStatus(currentPoint, 15.0f);
-//            }
-//        } else if (null == mapStatus) {
-//            // 第一次定位时，聚焦底图
-//            setMapStatus(currentPoint, 15.0f);
-//        }
-//
-//        if (showMarker) {
-//            addMarker(currentPoint);
-//        }
-//
-//    }
-
-    public Marker addOverlay(LatLng currentPoint, BitmapDescriptor icon, Bundle bundle) {
-        OverlayOptions overlayOptions = new MarkerOptions().position(currentPoint)
-                .icon(icon).zIndex(9).draggable(true);
-        Marker marker = (Marker) baiduMap.addOverlay(overlayOptions);
-        if (null != bundle) {
-            marker.setExtraInfo(bundle);
-        }
-        return marker;
-    }
-
-    /**
-     * 添加地图覆盖物
-     */
-//    public void addMarker(LatLng currentPoint) {
-//        if (null == mMoveMarker) {
-//            mMoveMarker = addOverlay(currentPoint, BitmapUtil.bmArrowPoint, null);
-//            return;
-//        }
-//
-//        if (null != lastPoint) {
-//            moveLooper(currentPoint);
-//        } else {
-//            lastPoint = currentPoint;
-//            mMoveMarker.setPosition(currentPoint);
-//        }
-//    }
-
-    /**
-     * 移动逻辑
-     */
-    public void moveLooper(LatLng endPoint) {
-
-        mMoveMarker.setPosition(lastPoint);
-        mMoveMarker.setRotate((float) CommonUtil.getAngle(lastPoint, endPoint));
-
-        double slope = CommonUtil.getSlope(lastPoint, endPoint);
-        // 是不是正向的标示（向上设为正向）
-        boolean isReverse = (lastPoint.latitude > endPoint.latitude);
-        double intercept = CommonUtil.getInterception(slope, lastPoint);
-        double xMoveDistance = isReverse ? CommonUtil.getXMoveDistance(slope) : -1 * CommonUtil.getXMoveDistance(slope);
-
-        for (double latitude = lastPoint.latitude; latitude > endPoint.latitude == isReverse; latitude =
-                latitude - xMoveDistance) {
-            LatLng latLng;
-            if (slope != Double.MAX_VALUE) {
-                latLng = new LatLng(latitude, (latitude - intercept) / slope);
-            } else {
-                latLng = new LatLng(latitude, lastPoint.longitude);
-            }
-            mMoveMarker.setPosition(latLng);
-        }
-    }
-
-
-    public void animateMapStatus(List<LatLng> points) {
-        if (null == points || points.isEmpty()) {
-            return;
-        }
-        LatLngBounds.Builder builder = new LatLngBounds.Builder();
-        for (LatLng point : points) {
-            builder.include(point);
-        }
-        MapStatusUpdate msUpdate = MapStatusUpdateFactory.newLatLngBounds(builder.build());
-        baiduMap.animateMapStatus(msUpdate);
-    }
-
-    public void animateMapStatus(LatLng point, float zoom) {
-        MapStatus.Builder builder = new MapStatus.Builder();
-        mapStatus = builder.target(point).zoom(zoom).build();
-        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(mapStatus));
-    }
-
-    public void setMapStatus(LatLng point, float zoom) {
-        MapStatus.Builder builder = new MapStatus.Builder();
-        mapStatus = builder.target(point).zoom(zoom).build();
-        baiduMap.setMapStatus(MapStatusUpdateFactory.newMapStatus(mapStatus));
-    }
-
-    public void refresh() {
-        LatLng mapCenter = baiduMap.getMapStatus().target;
-        float mapZoom = baiduMap.getMapStatus().zoom - 1.0f;
-        setMapStatus(mapCenter, mapZoom);
-    }
-
-}
-
@@ -59,7 +59,7 @@
                 android:id="@+id/dragView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/shape_left_right_10dp_white_raduis_bg"
+                android:background="@color/white"
                 android:clickable="false"
                 android:focusable="false">
@@ -76,6 +76,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
+                            android:layout_marginRight="25dp"
                             android:text="--"
                             android:textColor="@color/text_black"
                             android:textSize="15sp" />
@@ -9,7 +9,7 @@
         <!--个人最佳成绩-->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="190dp"
             android:background="@drawable/white_shadow_bg"
             android:orientation="vertical"
             android:paddingLeft="15dp"
@@ -102,6 +102,7 @@
                         <TextView
+                            android:id="@+id/tv_first_time"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="--"