CNLive Android Team / ModulePedometer · Commits

Commit 9414c796757767674be2afc4f3e4866de2bf40ea

Authored by 韩亚云
2 parents e655194a 28020dea

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

Inline Side-by-side
Showing 4 changed files with 17 additions and 11 deletions
app/build.gradle
  View file @9414c79
... ... @@ -32,8 +32,8 @@ android {
32 32  
33 33 manifestPlaceholders = [
34 34  
35   -// BAIDU_MAP_APP_KEY: "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
36   - BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
  35 + BAIDU_MAP_APP_KEY: "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
  36 +// BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
37 37  
38 38 ]
39 39 }
... ... @@ -46,8 +46,8 @@ android {
46 46 buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"))
47 47 buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976"))
48 48 manifestPlaceholders = [
49   -// BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
50   - BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
  49 + BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
  50 +// BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
51 51 ]
52 52 }
53 53 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
  View file @9414c79
... ... @@ -679,6 +679,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
679 679 location.getLongitude());
680 680 baiduMap.setMyLocationData(followMyLocation);
681 681  
  682 + if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
  683 + builder.target(firstLatLng).zoom(DEFULT_ZOOM);
  684 + baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
  685 + }
682 686 //根据几个关键点进行步行路径规划
683 687 // if (importLatLngs != null) {
684 688 // if (importLatLngs.size() >= 1) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @9414c79
... ... @@ -666,10 +666,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
666 666 if (baiduMap == null) {
667 667 baiduMap = mMapView.getMap();
668 668 }
669   -
670   - if (routePlanSearch == null) {
671   - routePlanSearch = RoutePlanSearch.newInstance();
672   - }
  669 + //设置指南针位置
  670 + android.graphics.Point point = new android.graphics.Point(ScreenUtil.getScreenWidth(getContext()) - 80, 80);
  671 + baiduMap.setCompassPosition(point);
  672 +// if (routePlanSearch == null) {
  673 +// routePlanSearch = RoutePlanSearch.newInstance();
  674 +// }
673 675 if (mUiSettings == null) {
674 676 mUiSettings = baiduMap.getUiSettings();
675 677 }
... ... @@ -1138,7 +1140,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
1138 1140 location.getLongitude());
1139 1141 baiduMap.setMyLocationData(followMyLocation);
1140 1142 //没有获取到轨迹
1141   - if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
  1143 + if ((null == queryResultPoints || queryResultPoints.size() < 1) && null != firstLatLng) {
1142 1144 builder.target(firstLatLng).zoom(DEFULT_ZOOM);
1143 1145 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
1144 1146 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
  View file @9414c79
1 1 package com.cnlive.moudle.pedometer.model;
2 2  
3 3 public class Constant {
4   - // public static final long SERVICE_ID = 213511;//公司账号
5   - public static final long SERVICE_ID = 213553;
  4 + public static final long SERVICE_ID = 213511;//公司账号
  5 +// public static final long SERVICE_ID = 213553;
6 6  
7 7 public static final int TAG = 1;
8 8 public static final int GATHER_INTERVAL = 2;//位置采集周期
... ...