Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents e655194a 28020dea
Showing 4 changed files with 17 additions and 11 deletions
app/build.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
@@ -32,8 +32,8 @@ android {
             manifestPlaceholders = [
-//                    BAIDU_MAP_APP_KEY: "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
-     BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
+                    BAIDU_MAP_APP_KEY: "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
+//     BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
             ]
         }
@@ -46,8 +46,8 @@ android {
             buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"))
             buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976"))
             manifestPlaceholders = [
-//                    BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
-                    BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
+                    BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
+//                    BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
             ]
         }
     }
@@ -679,6 +679,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
+            if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
+                builder.target(firstLatLng).zoom(DEFULT_ZOOM);
+                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+            }
             //根据几个关键点进行步行路径规划
 //                if (importLatLngs != null) {
 //                    if (importLatLngs.size() >= 1) {
@@ -666,10 +666,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
         }
-
-        if (routePlanSearch == null) {
-            routePlanSearch = RoutePlanSearch.newInstance();
-        }
+        //设置指南针位置
+        android.graphics.Point point = new android.graphics.Point(ScreenUtil.getScreenWidth(getContext()) - 80, 80);
+        baiduMap.setCompassPosition(point);
+//        if (routePlanSearch == null) {
+//            routePlanSearch = RoutePlanSearch.newInstance();
+//        }
         if (mUiSettings == null) {
             mUiSettings = baiduMap.getUiSettings();
         }
@@ -1138,7 +1140,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
             //没有获取到轨迹
-            if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
+            if ((null == queryResultPoints || queryResultPoints.size() < 1) && null != firstLatLng) {
                 builder.target(firstLatLng).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             }
 package com.cnlive.moudle.pedometer.model;
 public class Constant {
-    //    public static final long SERVICE_ID = 213511;//公司账号
-    public static final long SERVICE_ID = 213553;
+        public static final long SERVICE_ID = 213511;//公司账号
+//    public static final long SERVICE_ID = 213553;
     public static final int TAG = 1;
     public static final int GATHER_INTERVAL = 2;//位置采集周期