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

韩亚云
2 parents 16d09460 f478a583
Showing 6 changed files with 76 additions and 22 deletions
app/build.gradle
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/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
@@ -28,17 +28,23 @@ android {
             buildConfigField("String", "APP_ID", stringValue("802_jhbqccxw08"))
             buildConfigField("String", "APP_KEY", stringValue("9c5619e9be747bb3b925dd215ca5923d86f12c09b9394f"))
             buildConfigField("String", "APP_SCERET", stringValue("1e6380cb347255e777f72b5aa60f41daa68443a132aaea"))
+            //                    BAIDU_MAP_APP_KEY : "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
             manifestPlaceholders = [
-                    BAIDU_MAP_APP_KEY : "2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"
+
+                    BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2"
+
+
             ]
         }
+//        BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
+
         release {
             resValue("string", "app_name", "网++")
             buildConfigField("String", "APP_ID", stringValue("769_jetj7bq525"))
             buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"))
             buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976"))
             manifestPlaceholders = [
-                    BAIDU_MAP_APP_KEY : "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
+                    BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
             ]
         }
     }
@@ -19,6 +19,7 @@ import com.baidu.trace.api.track.LatestPointResponse;
 import com.baidu.trace.api.track.OnTrackListener;
 import com.baidu.trace.api.track.SupplementMode;
 import com.baidu.trace.api.track.TrackPoint;
+import com.baidu.trace.model.CoordType;
 import com.baidu.trace.model.ProcessOption;
 import com.baidu.trace.model.SortType;
 import com.baidu.trace.model.StatusCodes;
@@ -60,9 +61,10 @@ 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();
+            Log.e(TAG, "queryHistoryTrace: StepService.serviceId" + StepService.serviceId + ",entityName:" + entityName);
+            Log.e(TAG, "queryHistoryTrace: startTime:" + startTime + ",endTime:" + endTime);
+            historyTrackRequest = new HistoryTrackRequest(1, StepService.serviceId, entityName);
             //设置查询设备名称
             historyTrackRequest.setEntityName(entityName);
             //历史轨迹开始时间
@@ -75,6 +77,8 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             historyTrackRequest.setPageSize(pageSize);
             //设置是否进行纠偏
             historyTrackRequest.setProcessed(true);
+            //设置返回坐标系
+            historyTrackRequest.setCoordTypeOutput(CoordType.gcj02);
             //其他设置
             ProcessOption processOption = new ProcessOption();
             //去噪：可设置是否需要去除角度、速度和方向异常的轨迹点
@@ -84,9 +88,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             //抽稀：设置是否进行抽稀处理，对冗余的轨迹点进行抽稀去除处理，如一条直线上除起终点外的多个轨迹点
             processOption.setNeedVacuate(true);
             //自动判断交通方式
-            processOption.setTransportMode(TransportMode.auto);
+            processOption.setTransportMode(TransportMode.walking);
             // 设置精度过滤值(定位精度大于100米的过滤掉)
-            processOption.setRadiusThreshold(100);
+            processOption.setRadiusThreshold(20);
             // 设置纠偏选项
             historyTrackRequest.setProcessOption(processOption);
             // 设置里程填充方式为驾车
@@ -102,7 +106,10 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             public void onHistoryTrackCallback(HistoryTrackResponse response) {
                 super.onHistoryTrackCallback(response);
                 int total = response.getTotal();
+                Log.e(TAG, "onHistoryTrackCallback: total" + total + "数量");
+
                 if (StatusCodes.SUCCESS != response.getStatus()) {
+                    Toast.makeText(context, "获取轨迹失败!" + response.getStatus(), Toast.LENGTH_SHORT).show();
                 } else if (0 == total) {
                     Toast.makeText(context, "暂未查到您的轨迹,请稍后重试!", Toast.LENGTH_SHORT).show();
                 } else {
@@ -123,7 +130,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                     queryHistoryTrace(context, entityName, startTime, endTime);
                 } else {
                     if (getView() != null) {
-                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.run_map_icon_end);
+                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
                     }
                 }
             }
@@ -131,15 +138,17 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
             @Override
             public void onLatestPointCallback(LatestPointResponse latestPointResponse) {
                 super.onLatestPointCallback(latestPointResponse);
-                if (StatusCodes.SUCCESS != latestPointResponse.getStatus()) {
-                } else {
-                    Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.run_map_icon_start), 40, 40);
-                    OverlayOptions startOptions = new MarkerOptions()
-                            .position(MyMapUtil.convertTrace2Map(latestPointResponse.getLatestPoint().getLocation())).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
-                    if (getView() != null) {
-                        getView().baiduMap.addOverlay(startOptions);
-                    }
-                }
+                Log.e(TAG, "onLatestPointCallback: ");
+
+//                if (StatusCodes.SUCCESS != latestPointResponse.getStatus()) {
+//                } else {
+//                    Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), R.drawable.run_map_icon_start), 40, 40);
+//                    OverlayOptions startOptions = new MarkerOptions()
+//                            .position(MyMapUtil.convertTrace2Map(latestPointResponse.getLatestPoint().getLocation())).icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap));
+//                    if (getView() != null) {
+//                        getView().baiduMap.addOverlay(startOptions);
+//                    }
+//                }
             }
         };
         //开始查询历史轨迹
@@ -19,6 +19,7 @@ import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
+import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -172,6 +173,10 @@ public class RunMainFragmentView implements MvpView {
         fragment.binding.flContinue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                //继续记录轨迹
+                if (StepService.mClient != null && StepService.traceListener != null) {
+                    StepService.mClient.startGather(StepService.traceListener);
+                }
                 needWriteDataFlag = true;
                 //将当前计时器时间戳写入数据库
                 setSQLPauseTime();
@@ -237,14 +242,16 @@ public class RunMainFragmentView implements MvpView {
                                                 public void onClick(SelectDialog dialog) {
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
-                                                    fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
                                                     //清空数据
                                                     StepUtil.clearRunData(getContext(), uid);
                                                     dialog.dismiss();
                                                     if (StepService.mClient != null) {
                                                         StepService.mClient.stopGather(StepService.traceListener);
                                                     }
-//                                                    fragment.getActivity().finish();
+                                                    MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0);
+                                                    fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class));
+
+                                                    //  fragment.getActivity().finish();
                                                 }
                                             }, "取消", new SelectDialog.DialogInterface() {
                                                 @Override
@@ -296,6 +303,10 @@ public class RunMainFragmentView implements MvpView {
         fragment.binding.flPause.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                //暂停轨迹记录
+                if (StepService.mClient != null && StepService.traceListener != null) {
+                    StepService.mClient.stopGather(StepService.traceListener);
+                }
                 //将当前计时器时间戳写入数据库
                 setSQLPauseTime();
                 needWriteDataFlag = false;
@@ -47,6 +47,8 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
+import com.cnlive.moudle.pedometer.utils.MySpHelper;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.orhanobut.logger.Logger;
@@ -144,7 +146,10 @@ public class StepService extends Service implements SensorEventListener {
     //打包周期
     private int packInterval = 30;
     // 轨迹服务ID
-    public static final long serviceId = 213511;
+//    public static final long serviceId = 213511;
+//杨帅
+    public static final long serviceId = 213553;
+
     // 设备标识
     public static String entityName = "";
     /**
@@ -174,9 +179,12 @@ public class StepService extends Service implements SensorEventListener {
     private void initTrace() {
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
+            // 设置定位和打包周期
+            mClient.setInterval(gatherInterval, packInterval);
         }
         if (mTrace == null) {
             mTrace = new Trace(serviceId, entityName);
+
         }
         //初始化实时轨迹监听器
         realTimeTraceListener = new OnTrackListener() {
@@ -324,6 +332,10 @@ public class StepService extends Service implements SensorEventListener {
         //开启轨迹服务
         if (mClient != null) {
             mClient.startTrace(mTrace, traceListener);
+            long stepStartTime = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
+            if (stepStartTime == 0) {
+                MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", TimeUtil.getCurrentTime());
+            }
         }
     }
 package com.cnlive.moudle.pedometer.ui.fragment;
+import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -16,6 +18,7 @@ import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.service.StepService;
+import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunningMapBinding;
@@ -83,8 +86,21 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         }
         //开始进行历史轨迹查询
         if (getPresenter() != null && !TextUtils.isEmpty(StepService.entityName)) {
-            long startTime = runningMapBean.getTimeBase();
-            long endTime = TimeUtil.getCurrentTime();
+            long stepStartTime = MySpHelper.getInstance(getActivity(), Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
+            long startTime = 0;
+            if (stepStartTime != 0) {
+                startTime = stepStartTime;
+            } else {
+                startTime = (int) (System.currentTimeMillis() / 1000 - 12 * 60 * 60);
+            }
+//            long base = runningMapBean.getTimeBase() + (SystemClock.elapsedRealtime() - runningMapBean.getRecordTime());
+//            int hour = (int) ((SystemClock.elapsedRealtime() - base) / 1000 / 60 / 60);
+//            int minute = (int) ((SystemClock.elapsedRealtime() - base) / 1000 / 60) % 60;
+//            int second = (int) ((SystemClock.elapsedRealtime() - base) / 1000) % 60;
+            long current = TimeUtil.getCurrentTime();
+//            long startTime = current - hour * 3600 * 1000 - minute * 60 * 1000 - second * 1000;
+            long endTime = current;
+//            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
             getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, startTime, endTime);
         }
     }
@@ -75,7 +75,7 @@ public class MyMapUtil {
                 .color(context.getResources().getColor(lineColor)).points(points);
         baiduMap.addOverlay(startOptions);
-//        baiduMap.addOverlay(endOptions);
+        baiduMap.addOverlay(endOptions);
         return baiduMap.addOverlay(polylineOptions);
     }
 }