Commit 115b7a32b56ea1a818af6bdff04cde6d0e06f69e
1 parent
9681ca81
1.赛事详情
Showing
3 changed files
with
19 additions
and
4 deletions
app/build.gradle
| @@ -28,17 +28,23 @@ android { | @@ -28,17 +28,23 @@ android { | ||
| 28 | buildConfigField("String", "APP_ID", stringValue("802_jhbqccxw08")) | 28 | buildConfigField("String", "APP_ID", stringValue("802_jhbqccxw08")) |
| 29 | buildConfigField("String", "APP_KEY", stringValue("9c5619e9be747bb3b925dd215ca5923d86f12c09b9394f")) | 29 | buildConfigField("String", "APP_KEY", stringValue("9c5619e9be747bb3b925dd215ca5923d86f12c09b9394f")) |
| 30 | buildConfigField("String", "APP_SCERET", stringValue("1e6380cb347255e777f72b5aa60f41daa68443a132aaea")) | 30 | buildConfigField("String", "APP_SCERET", stringValue("1e6380cb347255e777f72b5aa60f41daa68443a132aaea")) |
| 31 | + // BAIDU_MAP_APP_KEY : "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN" | ||
| 31 | manifestPlaceholders = [ | 32 | manifestPlaceholders = [ |
| 32 | - BAIDU_MAP_APP_KEY : "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN" | 33 | + |
| 34 | + BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2" | ||
| 35 | + | ||
| 36 | + | ||
| 33 | ] | 37 | ] |
| 34 | } | 38 | } |
| 39 | +// BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2" | ||
| 40 | + | ||
| 35 | release { | 41 | release { |
| 36 | resValue("string", "app_name", "网++") | 42 | resValue("string", "app_name", "网++") |
| 37 | buildConfigField("String", "APP_ID", stringValue("769_jetj7bq525")) | 43 | buildConfigField("String", "APP_ID", stringValue("769_jetj7bq525")) |
| 38 | buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d")) | 44 | buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d")) |
| 39 | buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976")) | 45 | buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976")) |
| 40 | manifestPlaceholders = [ | 46 | manifestPlaceholders = [ |
| 41 | - BAIDU_MAP_APP_KEY : "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2" | 47 | + BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ" |
| 42 | ] | 48 | ] |
| 43 | } | 49 | } |
| 44 | } | 50 | } |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
| @@ -60,7 +60,6 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | @@ -60,7 +60,6 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | ||
| 60 | * @param endTime | 60 | * @param endTime |
| 61 | */ | 61 | */ |
| 62 | public void queryHistoryTrace(Context context, String entityName, long startTime, long endTime) { | 62 | public void queryHistoryTrace(Context context, String entityName, long startTime, long endTime) { |
| 63 | - Log.e(TAG, "queryHistoryTrace: "); | ||
| 64 | if (historyTrackRequest == null) { | 63 | if (historyTrackRequest == null) { |
| 65 | historyTrackRequest = new HistoryTrackRequest(); | 64 | historyTrackRequest = new HistoryTrackRequest(); |
| 66 | //设置查询设备名称 | 65 | //设置查询设备名称 |
| @@ -100,9 +99,11 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | @@ -100,9 +99,11 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | ||
| 100 | OnTrackListener historyTrackListener = new OnTrackListener() { | 99 | OnTrackListener historyTrackListener = new OnTrackListener() { |
| 101 | @Override | 100 | @Override |
| 102 | public void onHistoryTrackCallback(HistoryTrackResponse response) { | 101 | public void onHistoryTrackCallback(HistoryTrackResponse response) { |
| 102 | + Log.e(TAG, "onHistoryTrackCallback: "); | ||
| 103 | super.onHistoryTrackCallback(response); | 103 | super.onHistoryTrackCallback(response); |
| 104 | int total = response.getTotal(); | 104 | int total = response.getTotal(); |
| 105 | if (StatusCodes.SUCCESS != response.getStatus()) { | 105 | if (StatusCodes.SUCCESS != response.getStatus()) { |
| 106 | + Toast.makeText(context, "获取轨迹失败!"+response.getStatus(), Toast.LENGTH_SHORT).show(); | ||
| 106 | } else if (0 == total) { | 107 | } else if (0 == total) { |
| 107 | Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show(); | 108 | Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show(); |
| 108 | } else { | 109 | } else { |
| @@ -131,6 +132,8 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | @@ -131,6 +132,8 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag | ||
| 131 | @Override | 132 | @Override |
| 132 | public void onLatestPointCallback(LatestPointResponse latestPointResponse) { | 133 | public void onLatestPointCallback(LatestPointResponse latestPointResponse) { |
| 133 | super.onLatestPointCallback(latestPointResponse); | 134 | super.onLatestPointCallback(latestPointResponse); |
| 135 | + Log.e(TAG, "onLatestPointCallback: "); | ||
| 136 | + | ||
| 134 | if (StatusCodes.SUCCESS != latestPointResponse.getStatus()) { | 137 | if (StatusCodes.SUCCESS != latestPointResponse.getStatus()) { |
| 135 | } else { | 138 | } else { |
| 136 | Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.run_map_icon_start), 40, 40); | 139 | Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.run_map_icon_start), 40, 40); |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
| @@ -144,7 +144,10 @@ public class StepService extends Service implements SensorEventListener { | @@ -144,7 +144,10 @@ public class StepService extends Service implements SensorEventListener { | ||
| 144 | //打包周期 | 144 | //打包周期 |
| 145 | private int packInterval = 30; | 145 | private int packInterval = 30; |
| 146 | // 轨迹服务ID | 146 | // 轨迹服务ID |
| 147 | - public static final long serviceId = 213511; | 147 | +// public static final long serviceId = 213511; |
| 148 | +//杨帅 | ||
| 149 | + public static final long serviceId = 213553; | ||
| 150 | + | ||
| 148 | // 设备标识 | 151 | // 设备标识 |
| 149 | public static String entityName = ""; | 152 | public static String entityName = ""; |
| 150 | /** | 153 | /** |
| @@ -174,9 +177,12 @@ public class StepService extends Service implements SensorEventListener { | @@ -174,9 +177,12 @@ public class StepService extends Service implements SensorEventListener { | ||
| 174 | private void initTrace() { | 177 | private void initTrace() { |
| 175 | if (mClient == null) { | 178 | if (mClient == null) { |
| 176 | mClient = new LBSTraceClient(getApplicationContext()); | 179 | mClient = new LBSTraceClient(getApplicationContext()); |
| 180 | + // 设置定位和打包周期 | ||
| 181 | + mClient.setInterval(gatherInterval, packInterval); | ||
| 177 | } | 182 | } |
| 178 | if (mTrace == null) { | 183 | if (mTrace == null) { |
| 179 | mTrace = new Trace(serviceId, entityName); | 184 | mTrace = new Trace(serviceId, entityName); |
| 185 | + | ||
| 180 | } | 186 | } |
| 181 | //初始化实时轨迹监听器 | 187 | //初始化实时轨迹监听器 |
| 182 | realTimeTraceListener = new OnTrackListener() { | 188 | realTimeTraceListener = new OnTrackListener() { |