1 修复BUG

杨帅
1 parent 259138b6
Showing 2 changed files with 51 additions and 17 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
@@ -76,6 +76,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
     private SelectDialog selectDialog;
     private boolean isShowFollowAddress = false;//是否显示跟随地址
     public RunRaceDetailInfo runRaceDetailInfo;
+    private boolean isFollowUserShow = true;//是否跟随用户视角
     public StartTraceFragmentView(StartTraceFragment fragment) {
         this.fragment = fragment;
@@ -442,10 +443,13 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                         // 此处设置开发者获取到的方向信息，顺时针0-360
                         .direction(location.getDirection()).latitude(location.getLatitude())
                         .longitude(location.getLongitude()).build();
-                baiduMap.setMyLocationData(followMyLocation);
-                MapStatus.Builder builder = new MapStatus.Builder();
-                builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
-                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+                if (isFollowUserShow) {
+                    baiduMap.setMyLocationData(followMyLocation);
+                    MapStatus.Builder builder = new MapStatus.Builder();
+                    builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
+                    baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+                    isFollowUserShow=false;
+                }
             }
 //            if (location.hasAddr()) {
 //                if (!TextUtils.isEmpty(location.getAddress().address)) {
@@ -69,6 +69,9 @@ public class MyMapUtil {
      * @param geoCodeResult
      */
     public static void getGeoCoderResult(LatLng latLng, GeoCodeResult geoCodeResult) {
+        if (null == latLng) {
+            return;
+        }
         if (null == mSearch) {
             mSearch = GeoCoder.newInstance();
         }
@@ -87,15 +90,15 @@ public class MyMapUtil {
                     queryGeoCount = 0;
                     if (null != geoCodeResult) {
                         List<PoiInfo> pois = reverseGeoCodeResult.getPoiList();
-                        if (null != pois&&pois.size()>0) {
-                            if (!TextUtils.isEmpty(pois.get(0).name)){
+                        if (null != pois && pois.size() > 0) {
+                            if (!TextUtils.isEmpty(pois.get(0).name)) {
                                 geoCodeResult.success(pois.get(0).name);
-                            }else {
+                            } else {
                                 geoCodeResult.success(null);
                             }
                         } else {
                             //如果街道号或者街道为空
-                            if ((null==reverseGeoCodeResult.getAddressDetail().street||TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().street)) && (null==reverseGeoCodeResult.getAddressDetail().streetNumber||TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().streetNumber))) {
+                            if ((null == reverseGeoCodeResult.getAddressDetail().street || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().street)) && (null == reverseGeoCodeResult.getAddressDetail().streetNumber || TextUtils.isEmpty(reverseGeoCodeResult.getAddressDetail().streetNumber))) {
                                 if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress()) && !TextUtils.isEmpty(reverseGeoCodeResult.getSematicDescription())) {
                                     geoCodeResult.success(reverseGeoCodeResult.getAddress() + "," + reverseGeoCodeResult.getSematicDescription());
                                 } else if (!TextUtils.isEmpty(reverseGeoCodeResult.getAddress())) {
@@ -147,7 +150,7 @@ public class MyMapUtil {
      * @return
      */
     public static Overlay setMapMarker(Context context, BaiduMap baiduMap, LatLng startLatLng, int startIconRes) {
-        if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap) {
+        if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap || null == startLatLng) {
             return null;
         }
         try {
@@ -182,7 +185,7 @@ public class MyMapUtil {
      * @return
      */
     public static List<Overlay> setStartMarker(Context context, BaiduMap baiduMap, LatLng startLatLng, int startIconRes) {
-        if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap) {
+        if (0 == startIconRes || null == startLatLng || null == context || null == baiduMap || null == startLatLng) {
             return null;
         }
         List<Overlay> resultOverlays = new ArrayList<>();
@@ -234,6 +237,9 @@ public class MyMapUtil {
      * @param zoomBy
      */
     public static float setMapAutoZoom(BaiduMap baiduMap, List<LatLng> trackPoints, float zoomBy) {
+        if (null == baiduMap || null == trackPoints) {
+            return 0;
+        }
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
         for (LatLng latLng : trackPoints) {
             builder.include(latLng);
@@ -261,6 +267,9 @@ public class MyMapUtil {
      * @param zoomBy
      */
     public static void setCollMapAutoZoom(BaiduMap baiduMap, List<CollectPoint> trackPoints, float zoomBy) {
+        if (null == baiduMap || null == trackPoints) {
+            return;
+        }
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
         List<LatLng> latLngs = new ArrayList<>();
         for (int i = 0; i < trackPoints.size(); i++) {
@@ -292,6 +301,9 @@ public class MyMapUtil {
      * @return
      */
     public static boolean checkIsFinishTrace(List<LatLng> importPoints, List<LatLng> trackPoints, double passRate) {
+        if (null == importPoints || null == trackPoints) {
+            return false;
+        }
         HashMap<Integer, Boolean> importHash = new HashMap<>();
         for (int i = 0; i < importPoints.size(); i++) {
             importHash.put(i, false);
@@ -341,6 +353,16 @@ public class MyMapUtil {
     private static int queryNum = 0;//查询次数
     public static void queryHistoryTrace(Context context, LBSTraceClient mClient, String entityName, long startTime, long endTime, CallBack callBack) {
+        if (null == context || null == mClient) {
+            return;
+        }
+        if (0 == startTime || 0 == endTime) {
+            if (callBack != null) {
+                callBack.success(null);
+            } else {
+                return;
+            }
+        }
         HistoryTrackRequest historyTrackRequest = new HistoryTrackRequest(Constant.TAG, Constant.SERVICE_ID, entityName);
         //设置查询设备名称
         historyTrackRequest.setEntityName(entityName);
@@ -491,15 +513,20 @@ public class MyMapUtil {
      */
     public static List<Overlay> drawHistoryTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        if (points == null || points.size() == 0 || lineColor == 0) {
+        if (points == null || points.size() == 0 || lineColor == 0 || null == context) {
             return null;
         }
         List<Overlay> overlayList = new ArrayList<>();
         //只有一个点
         if (points.size() == 1) {
             if (startIconRes != 0) {
-                Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
-                OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+
+                Bitmap pointBitmap = null;
+                pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 24, 30);
+                OverlayOptions startOptions = null;
+                if (null != pointBitmap) {
+                    startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
+                }
                 if (null != startOptions) {
                     overlayList.add(baiduMap.addOverlay(startOptions));
                 }
@@ -548,15 +575,15 @@ public class MyMapUtil {
             polylineOptions = new PolylineOptions().width(10)
                     .color(context.getResources().getColor(lineColor)).points(points);
         }
+        if (null != polylineOptions) {
+            overlayList.add(baiduMap.addOverlay(polylineOptions));
+        }
         if (startOptions != null) {
             overlayList.add(baiduMap.addOverlay(startOptions));
         }
         if (endOptions != null) {
             overlayList.add(baiduMap.addOverlay(endOptions));
         }
-        if (null != polylineOptions) {
-            overlayList.add(baiduMap.addOverlay(polylineOptions));
-        }
         if (null != overlayList) {
             return overlayList;
         } else if (overlayList.size() == 0) {
@@ -571,7 +598,7 @@ public class MyMapUtil {
      */
     public static Overlay drawRealTimeTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes) {
         // 绘制新覆盖物前，清空之前的覆盖物
-        if (points == null || points.size() == 0 || lineColor == 0) {
+        if (points == null || points.size() == 0 || lineColor == 0 || null == context) {
             return null;
         }
         //只有一个点
@@ -618,6 +645,9 @@ public class MyMapUtil {
      * 绘制服务器传过来的轨迹
      */
     public static List<Overlay> drawServerLineTrack(Context context, BaiduMap baiduMap, List<LatLng> points, SortType sortType, int lineColor, int startIconRes, int endIconRes) {
+        if (null == context || null == baiduMap || null == points) {
+            return null;
+        }
         try {
             // 绘制新覆盖物前，清空之前的覆盖物
             if (points == null || points.size() == 0) {