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

韩亚云
2 parents 05045556 9681ca81
Showing 4 changed files with 6 additions and 9 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.util.Log;
 import android.widget.Toast;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
@@ -37,6 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFragmentView> {
+    private final String TAG = "RunningMapPresenter";
     /******轨迹查询相关******/
     //分页大小
     private int pageSize = 1000;
@@ -58,6 +60,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
      * @param endTime
      */
     public void queryHistoryTrace(Context context, String entityName, long startTime, long endTime) {
+        Log.e(TAG, "queryHistoryTrace: ");
         if (historyTrackRequest == null) {
             historyTrackRequest = new HistoryTrackRequest();
             //设置查询设备名称
@@ -59,7 +59,7 @@ public class RunMainFragmentView implements MvpView {
      * 初始化相关视图
      */
     public void initView() {
-        uid = "123";
+        uid = "yangshuai";
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
         firstTimeFlag = true;
@@ -274,7 +274,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
      * 开始路线规划
      */
     public void searchRouteResult(LatLng StartPoint, LatLng EndPoint, int index, int listSize) {
-        Log.e(TAG, "searchRouteResult: ");
+//        Log.e(TAG, "searchRouteResult: ");
         float currentZoom = baiduMap.getMapStatus().zoom;
         // 设置起终点信息，对于tranist search 来说，城市名无意义
         PlanNode stNode = PlanNode.withLocation(StartPoint);
@@ -167,14 +167,7 @@ public class StepService extends Service implements SensorEventListener {
         Log.e("执行onCreate", "onCreate");
         super.onCreate();
         init();
-        if (mClient == null) {
-            mClient = new LBSTraceClient(getApplicationContext());
-        }
-        if (mTrace == null) {
-            mTrace = new Trace(serviceId, entityName);
-        }
         showStartForegroundNotification();
-
         initBroadcastReceiver();
     }
@@ -346,6 +339,7 @@ public class StepService extends Service implements SensorEventListener {
         if (intent.getExtras().getString("userId") != null) {
             userId = intent.getExtras().getString("userId");
             entityName = userId;
+            Log.e(TAG, "onStartCommand: entityName" + entityName);
             initTodayData(userId);
             initTrace();
             if (!EventBus.getDefault().isRegistered(this)) {