1.修改计步服务启动逻辑

杨帅
1 parent eadcb01f
Showing 28 changed files with 566 additions and 161 deletions
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunRaceDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/StartTraceFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CollCommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.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/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
@@ -170,7 +170,6 @@
         </receiver>
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"
-            android:launchMode="singleTask"
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"
@@ -25,7 +25,7 @@ import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
 public class CollRunRaceDetailFragmentPresenter extends MvpBasePresenter<CollRunRaceDetailFragmentView> {
-    public void getRunRaceDetailInfo(Context context, String id, String userId,String state) {
+    public void getRunRaceDetailInfo(Context context, String id, String userId, String state) {
         //设置请求参数
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
@@ -97,7 +97,7 @@ public class CollRunRaceDetailFragmentPresenter extends MvpBasePresenter&lt;CollRun
                         getView().showRetryView(code, new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
-                                getRunRaceDetailInfo(context, id, userId,state);
+                                getRunRaceDetailInfo(context, id, userId, state);
                             }
                         });
                     }
@@ -108,7 +108,7 @@ public class CollRunRaceDetailFragmentPresenter extends MvpBasePresenter&lt;CollRun
                     return;
                 }
                 if (baseInfo.getData() != null) {
-                    getView().initView(baseInfo.getData());
+                    getView().initView(baseInfo.getData(), userId);
                 }
             }
         }).start();
@@ -107,7 +107,6 @@ public class CollRunMainFragmentView implements MvpView {
      */
     public void initView() {
         uid = "yangshuai";
-        CollCommonInfo.setUserId(getContext(), uid);
         initLocationClient();
         CollUserStepEntity userStepEntity = CollStepUtil.getCollUserStepData(getContext(), uid);
         if (userStepEntity != null) {
@@ -147,8 +146,7 @@ public class CollRunMainFragmentView implements MvpView {
                             }
                         }
                     }, 10);
-                    //开启计步服务
-                    startStepService(getContext(), uid);
+
                 }
             }
         };
@@ -453,23 +451,7 @@ public class CollRunMainFragmentView implements MvpView {
         }
     }
-    /**
-     * 启动计步服务
-     *
-     * @param userId
-     */
-    public void startStepService(Context context, String userId) {
-        if (CollCommonInfo.getStepStartTime(context) == 0) {
-            CollCommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
-        }
-        CollCommonInfo.setIsRunKeepAliveService(context, true);
-        CollCommonInfo.setIsRunStepService(context, true);
-        CollCommonInfo.setTsRunBaiduTraceService(context, true);
-        CollCommonInfo.setIsWriteUserStep(context, true);
-        Intent intent = new Intent(fragment.getActivity(), CollKeepLiveService.class);
-        ContextCompat.startForegroundService(fragment.getActivity(), intent);
-    }
     /**
      * 更新行走距离
 package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -41,12 +43,15 @@ import com.baidu.mapapi.search.route.RoutePlanSearch;
 import com.baidu.mapapi.search.route.TransitRouteResult;
 import com.baidu.mapapi.search.route.WalkingRoutePlanOption;
 import com.baidu.mapapi.search.route.WalkingRouteResult;
+import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
@@ -106,12 +111,13 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     }
-    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+    public void initView(RunRaceDetailInfo runRaceDetailInfo, String uid) {
         if (fragment.getActivity() == null) {
             return;
         }
+        CollCommonInfo.setUserId(getContext(), uid);
         this.runRaceDetailInfo = runRaceDetailInfo;
-//        //初始化地图点位
+        //初始化地图点位
         if (runRaceDetailInfo.getLatLongitude() != null) {
             Log.e(TAG, "initView: 长度:" + runRaceDetailInfo.getLatLongitude().length());
             trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude(), LatLng.class);
@@ -205,6 +211,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     }
+
     public void initMap() {
         //隐藏底部滑动卡片
         fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
 package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
@@ -26,13 +28,17 @@ import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.route.RoutePlanSearch;
+import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -83,8 +89,10 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                 public void onClick(SelectDialog dialog) {
                     dialog.dismiss();
                     isShowFollowAddress = false;
-                    CollPedometerMainActivity.startActivity(fragment.getActivity());
-                    fragment.getActivity().finish();
+                    QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
+                    //开启计步服务
+                    startStepService(getContext());
+
                 }
             });
             selectDialog.setCancelable(false);
@@ -107,6 +115,22 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
     }
     /**
+     * 启动计步服务
+     */
+    public void startStepService(Context context) {
+        if (CollCommonInfo.getStepStartTime(context) == 0) {
+            CollCommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
+        }
+        CollCommonInfo.setIsRunKeepAliveService(context, true);
+        CollCommonInfo.setIsRunStepService(context, true);
+        CollCommonInfo.setTsRunBaiduTraceService(context, true);
+        CollCommonInfo.setIsWriteUserStep(context, true);
+        Intent intent = new Intent(fragment.getActivity(), CollKeepLiveService.class);
+        ContextCompat.startForegroundService(fragment.getActivity(), intent);
+
+    }
+
+    /**
      * 初始化地图
      */
     public void initMap() {
@@ -146,15 +146,12 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
         this.startId = startId;
         //跨进程读取配置文件
         boolean isRun = CollCommonInfo.getIsRunKeepAliveService(getApplicationContext());
-        Log.e("isRun onStartCommand", "" + isRun);
         if (isRun) {
             if (runnable != null) {
                 handler.postDelayed(runnable, 5000);
             }
             showHideForegroundNotification();
-//            startService(new Intent(getApplicationContext(), HideKeepTipService.class));
-            Log.e(TAG, "启动HideKeepTipService");
             startPlaySong();
         }
         return START_STICKY;
@@ -220,7 +217,6 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.e("onDestroy", "onDestroy:" + notification);
         if (myReceiver != null) {
             unregisterReceiver(myReceiver);
         }
@@ -37,6 +37,7 @@ import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -158,6 +159,8 @@ public class CollStepService extends Service implements SensorEventListener {
      */
     public static Trace mTrace = null;
+    private boolean isFirstSendNotification = true;
+
     public CollStepService() {
     }
@@ -168,17 +171,11 @@ public class CollStepService extends Service implements SensorEventListener {
         super.onCreate();
         init();
         initBroadcastReceiver();
-        if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.collectionTrace.service.CollKeepLiveService")) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                startForegroundService(new Intent(getApplicationContext(), CollKeepLiveService.class));
-            } else {
-                startService(new Intent(getApplicationContext(), CollKeepLiveService.class));
-            }
-        }
         showStartForegroundNotification();
     }
     private void initTrace() {
+
         if (mClient == null) {
             mClient = new LBSTraceClient(getApplicationContext());
             // 设置定位和打包周期
@@ -279,6 +276,17 @@ public class CollStepService extends Service implements SensorEventListener {
             public void onStartGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
+                    boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                    if (isFirstSendNotification) {
+                        CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                        EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_SUCCESS, ""));
+                    }
+                } else {
+                    boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                    if (isFirstSendNotification) {
+                        CollCommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                        EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_FAIL, ""));
+                    }
                 }
             }
@@ -362,7 +370,7 @@ public class CollStepService extends Service implements SensorEventListener {
     @SuppressLint("WrongConstant")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        userId = CommonInfo.getUserId(getApplicationContext());
+        userId = CollCommonInfo.getUserId(getApplicationContext());
         if (userId != null && !TextUtils.isEmpty(userId)) {
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
@@ -380,6 +388,9 @@ public class CollStepService extends Service implements SensorEventListener {
                 }
             }).start();
             startTimeCount();
+        } else {
+            EventBus.getDefault().post(new MessageEvent(Constant.COLL_START_TRACE_GATHER_FAIL, ""));
+
         }
 //        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
 //            //开始配置JobInfo
@@ -32,7 +32,7 @@ import static android.provider.Settings.EXTRA_APP_PACKAGE;
  */
 @Route(path = "/moudle_pedometer/InterestActivity")
 public class CollPedometerMainActivity extends QMUIFragmentActivity {
-    private static final String TAG = "CollPedometerMainActivity";
+    private static final String TAG = "CollPedometerMain";
     private NotificationManagerCompat notificationManagerCompat;
     private boolean isOpen;
@@ -56,6 +56,7 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        Log.e(TAG, "onDestroy: ");
     }
     private void check() {
@@ -112,38 +113,8 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onResume() {
-
-        boolean result = false;
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECEIVE_BOOT_COMPLETED) == PackageManager.PERMISSION_GRANTED) {
-            result = true;
-        }
-        Log.e("i", "" + result + "," + getPackageName());
-        PackageManager pm = getPackageManager();
-        pm.checkPermission("android.permission.RECEIVE_BOOT_COMPLETED", getPackageName());
-        try {
-            PackageInfo packageInfo = pm.getPackageInfo(getPackageName(), PackageManager.GET_PERMISSIONS);
-            for (int i = 0; i < packageInfo.requestedPermissions.length; i++) {
-            }
-//                Log.e("i", "" + packageInfo.requestedPermissions[i]);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
         super.onResume();
         check();
-//        PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-
-//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-//            boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(getPackageName());
-//            if (!hasIgnored) {
-//                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-//                intent.setData(Uri.parse("package:" + getPackageName()));
-//                PackageManager pm = getPackageManager();
-//                if (intent.resolveActivity(pm) != null) {
-//                    startActivity(intent);
-//                }
-//            }
-//        }
         getPermissionsWithTip();
     }
@@ -178,7 +149,9 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
                             startActivityForResult(intent, 10);
                             Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
                         } else {
-                            addFragment();
+                            if (getCurrentFragment() == null) {
+                                addFragment();
+                            }
                         }
                     }
                 })
@@ -227,4 +200,6 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
         Intent intent = new Intent(activity, CollPedometerMainActivity.class);
         activity.startActivity(intent);
     }
+
+
 }
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -13,6 +14,7 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.example.moudle_pedometer.R;
 /**
@@ -22,6 +24,7 @@ import com.example.moudle_pedometer.R;
  */
 @Route(path = "/moudle_pedometer/CollRunRaceDetailActivity")
 public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
+    private final String TAG = "CollRunRaceDetail";
     private QMUIFragment fragment;
     @Override
@@ -38,7 +41,7 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
 //        boolean isRunStep = CollCommonInfo.getIsRunStepService(this);
 //        //没有找到相关记录
 //        if (!isRunStep) {
-            fragment = new CollRunRaceDetailFragment();
+        fragment = new CollRunRaceDetailFragment();
 //        }
 //        //找到记录
 //        else {
@@ -47,6 +50,18 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
         if (fragment != null) {
             addFragment(fragment);
         }
+
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        boolean isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
+        if (!isSet) {
+            isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
+        }
+
     }
     private void addFragment(QMUIFragment fragment) {
@@ -35,6 +35,5 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
     public static void startActivity(Activity activity) {
         Intent intent = new Intent(activity, StartCollectTraceActivity.class);
         activity.startActivity(intent);
-        activity.finish();
     }
 }
@@ -2,9 +2,13 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
@@ -23,6 +27,12 @@ public class CollRunMainFragment extends QMUIFragment&lt;CollRunMainFragmentView, C
     private final String TAG = "CollRunMainFragment";
     private String userId = "yangshuai";
+    @NonNull
+    @Override
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+        return super.onCreateView(inflater, container);
+    }
+
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -32,6 +42,7 @@ public class CollRunMainFragment extends QMUIFragment&lt;CollRunMainFragmentView, C
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
+
                     getMvpView().initView();
                 }
             }, 5);
@@ -11,11 +11,19 @@ import android.widget.Button;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
+import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollectRunRaceDetailBinding;
 import com.qmuiteam.qmui.widget.QMUITopBar;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import static android.content.Context.SENSOR_SERVICE;
 /**
@@ -60,7 +68,6 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
             getMvpView().initMap();
@@ -111,6 +118,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
         }
     }
+
     /**
      * 屏蔽边缘返回
      * 杨帅
@@ -167,4 +175,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
 //        FivePersonIconView fivePersonIconView = view.findViewById(R.id.five_join_person);
 //        fivePersonIconView.initIconData(data);
 //    }
+
+
+
 }
@@ -25,6 +25,7 @@ import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
+import com.example.moudle_pedometer.databinding.FragmentCollectRunningMapBinding;
 import com.example.moudle_pedometer.databinding.FragmentRunningMapBinding;
 import org.greenrobot.eventbus.EventBus;
@@ -41,7 +42,7 @@ import static android.content.Context.SENSOR_SERVICE;
  *
  * @author ShinnyYang
  */
-public class CollRunningMapFragment extends QMUIFragment<CollRunningMapFragmentView, CollRunningMapFragmentPresenter, FragmentRunningMapBinding> {
+public class CollRunningMapFragment extends QMUIFragment<CollRunningMapFragmentView, CollRunningMapFragmentPresenter, FragmentCollectRunningMapBinding> {
     private static final String TAG = "CollRunningMapFragment";
     private RunningMapBean runningMapBean;
     private SensorManager mSensorManager;
@@ -62,7 +63,7 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
     @Override
     protected int getLayoutId() {
-        return R.layout.fragment_running_map;
+        return R.layout.fragment_collect_running_map;
     }
     public static CollRunningMapFragment getInstance(RunningMapBean runningMapBean) {
@@ -118,7 +119,7 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
 //            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
             getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, startTime, endTime);
             //查询实时轨迹
-            getPresenter().queryRealTimeTrace(getActivity(), StepService.entityName, startTime);
+//            getPresenter().queryRealTimeTrace(getActivity(), StepService.entityName, startTime);
         }
@@ -128,7 +129,6 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
             com.baidu.trace.model.LatLng tempLatLng = new com.baidu.trace.model.LatLng(latLng.latitude, latLng.longitude);
             fenceLatLngs.add(tempLatLng);
         }
-        getPresenter().createFence(getActivity(), fenceLatLngs);
     }
     @Override
@@ -5,12 +5,22 @@ import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
+
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.StartTraceFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.StartTraceFragmentView;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
+import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentStartCollectTraceBinding;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import static android.content.Context.SENSOR_SERVICE;
 public class StartTraceFragment extends QMUIFragment<StartTraceFragmentView, StartTraceFragmentPresenter, FragmentStartCollectTraceBinding> {
@@ -35,6 +45,7 @@ public class StartTraceFragment extends QMUIFragment&lt;StartTraceFragmentView, Sta
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBus.getDefault().register(this);
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
@@ -68,6 +79,9 @@ public class StartTraceFragment extends QMUIFragment&lt;StartTraceFragmentView, Sta
         if (getMvpView() != null) {
             getMvpView().onDestroy();
         }
+        if (EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this);
+        }
     }
     /**
@@ -81,4 +95,22 @@ public class StartTraceFragment extends QMUIFragment&lt;StartTraceFragmentView, Sta
         return 0;
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void Event(MessageEvent messageEvent) {
+        //启动鹰眼成功
+        if (messageEvent.getMessageType() == Constant.COLL_START_TRACE_GATHER_SUCCESS) {
+            if (getMvpView() != null) {
+                QMUITipDialogUtil.dismessDialog();
+                CollPedometerMainActivity.startActivity(getActivity());
+            }
+        }
+        //启动鹰眼失败
+        else if (messageEvent.getMessageType() == Constant.COLL_START_TRACE_GATHER_FAIL) {
+            if (getMvpView() != null) {
+                QMUITipDialogUtil.dismessDialog();
+                QMUITipDialogUtil.textDialog(getContext(), "服务异常,请重试!", 1);
+            }
+        }
+    }
 }
@@ -135,6 +135,26 @@ public class CollCommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollRunBaiduTraceService", false);
     }
+    /**
+     * 是否是第一次启动鹰眼服务的通知
+     *
+     * @param context
+     * @param isAllow
+     */
+    public static void setIsFirstStepSendTraceTip(Context context, boolean isAllow) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollFirstStepSendTraceTip", isAllow);
+    }
+
+    /**
+     * 是否是第一次启动鹰眼服务的通知
+     * 默认返回true
+     *
+     * @param context
+     */
+    public static boolean getIsFirstStepSendTraceTip(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollFirstStepSendTraceTip", true);
+    }
+
     /*重置
      * @param context
      */
@@ -146,7 +166,7 @@ public class CollCommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollKeepAliveService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollRunBaiduTraceService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollstreetId");
-
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollFirstStepSendTraceTip");
     }
@@ -136,6 +136,26 @@ public class CommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("RunBaiduTraceService", false);
     }
+    /**
+     * 是否是第一次启动鹰眼服务的通知
+     *
+     * @param context
+     * @param isAllow
+     */
+    public static void setIsFirstStepSendTraceTip(Context context, boolean isAllow) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("FirstStepSendTraceTip", isAllow);
+    }
+
+    /**
+     * 是否是第一次启动鹰眼服务的通知
+     * 默认返回true
+     *
+     * @param context
+     */
+    public static boolean getIsFirstStepSendTraceTip(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("FirstStepSendTraceTip", true);
+    }
+
     /*重置
      * @param context
      */
@@ -147,7 +167,7 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("KeepAliveService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("RunBaiduTraceService");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("streetId");
-
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
     }
@@ -156,8 +156,6 @@ public class RunMainFragmentView implements MvpView {
                             }
                         }
                     }, 10);
-                    //开启计步服务
-                    startStepService(getContext(), uid);
                 }
             }
         };
@@ -460,23 +458,7 @@ public class RunMainFragmentView implements MvpView {
         }
     }
-    /**
-     * 启动计步服务
-     *
-     * @param userId
-     */
-    public void startStepService(Context context, String userId) {
-        if (CommonInfo.getStepStartTime(context) == 0) {
-            CommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
-        }
-        CommonInfo.setIsRunKeepAliveService(context, true);
-        CommonInfo.setIsRunStepService(context, true);
-        CommonInfo.setTsRunBaiduTraceService(context, true);
-        CommonInfo.setIsWriteUserStep(context, true);
-        Intent intent = new Intent(fragment.getActivity(), KeepLiveService.class);
-        ContextCompat.startForegroundService(fragment.getActivity(), intent);
-    }
     /**
      * 更新行走距离
@@ -8,6 +8,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -45,7 +46,9 @@ import com.baidu.mapapi.search.route.WalkingRoutePlanOption;
 import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
+import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
@@ -101,7 +104,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private String startPoint = "首都师范大学南门";
     private String endPoint = "首都师范大学篮球场";
-//    private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8}]";
+    //    private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8}]";
     private LinkedList<LatLng> importLatLngs;//关键点
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
     private List<LatLng> trackPoints;
@@ -198,7 +201,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
             //设置活动距离
             if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
-                fragment.binding.includeStreet.tvAddress.append("\t\t"+runRaceDetailInfo.getMileage());
+                fragment.binding.includeStreet.tvAddress.append("\t\t" + runRaceDetailInfo.getMileage());
             }
         }
@@ -228,7 +231,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"));
         }
         //设置活动类型
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())){
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())) {
             fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType());
         }
         //设置参加人数
@@ -248,7 +251,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             //显示
             fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
             //设置完成人数
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())){
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
                 fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
             }
             //设置个人行走距离
@@ -290,7 +293,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //设置路线描述
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())){
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
             fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
         }
         //设置路线介绍的图片
@@ -300,11 +303,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //判断用户是否报名
-        if (runRaceDetailInfo.isSignResult()){
+        if (runRaceDetailInfo.isSignResult()) {
             fragment.binding.rlScrollViewStartBtn.setTag("1");
             fragment.binding.tvRunNow.setText("现在开始");
             fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             fragment.binding.rlScrollViewStartBtn.setTag("0");
             fragment.binding.tvRunNow.setText("立即报名");
             fragment.binding.tvGoTip.setVisibility(View.GONE);
@@ -376,19 +379,18 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     fragment.binding.rlScrollViewStartBtn.setTag("0");
                     fragment.binding.tvRunNow.setText("立即报名");
                     fragment.binding.tvGoTip.setVisibility(View.GONE);
-                    fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
+                    startStepService(getContext());
                     //设置未滑动
                     fragment.binding.includeStreet.rlStartBtn.setTag("0");
                     fragment.binding.includeStreet.tvRunNow.setText("立即报名");
                     fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
-                    fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
                 }
             }
         });
         //查看全部成绩点击事件
         fragment.binding.includePersonScore.checkAllCord.setOnClickListener(v -> {
-            RaceRecordActivity.newInstance(fragment.getActivity(),runRaceDetailInfo.getTitle());
+            RaceRecordActivity.newInstance(fragment.getActivity(), runRaceDetailInfo.getTitle());
         });
         fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
@@ -407,15 +409,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     }
     public void initMap() {
-        List<String> icons = new ArrayList<>();
-        icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg");
-        icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg");
-        icons.add("http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg");
-        icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg");
-        icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg");
         //隐藏底部滑动卡片
         fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
-        fragment.binding.includeStreet.fiveJoinPerson.initIconData(icons);
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -863,4 +858,22 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
     }
+
+    /**
+     * 启动计步服务
+     *
+     */
+    public void startStepService(Context context) {
+        if (CommonInfo.getStepStartTime(context) == 0) {
+            CommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
+        }
+        CommonInfo.setIsRunKeepAliveService(context, true);
+        CommonInfo.setIsRunStepService(context, true);
+        CommonInfo.setTsRunBaiduTraceService(context, true);
+        CommonInfo.setIsWriteUserStep(context, true);
+        Intent intent = new Intent(fragment.getActivity(), KeepLiveService.class);
+        ContextCompat.startForegroundService(fragment.getActivity(), intent);
+
+    }
+
 }
@@ -8,5 +8,9 @@ public class Constant {
     public static final int FRAGMENT_RUN_CHRONOMETER = 4;//同步计时器
     public static final int EXIT_RANGE = 5;//超出范围
     public static final int ENTER_RANGE = 6;//进入范围
+    public static final int COLL_START_TRACE_GATHER_SUCCESS = 7;//启动轨迹服务成功(运营)
+    public static final int COLL_START_TRACE_GATHER_FAIL = 8;//启动轨迹服务失败(运营)
+    public static final int START_TRACE_GATHER_SUCCESS = 9;//启动轨迹服务成功(用户)
+    public static final int START_TRACE_GATHER_FAIL = 10;//启动轨迹服务失败(用户)
 }
@@ -221,7 +221,6 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.e("onDestroy", "onDestroy:" + notification);
         if (myReceiver != null) {
             unregisterReceiver(myReceiver);
         }
@@ -37,6 +37,7 @@ import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
@@ -241,6 +242,17 @@ public class StepService extends Service implements SensorEventListener {
                     if (mClient != null) {
                         mClient.startGather(traceListener);
                         Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
+                        boolean isFirstSendNotification = CommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                        if (isFirstSendNotification) {
+                            CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                            EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_SUCCESS, ""));
+                        }
+                    }
+                } else {
+                    boolean isFirstSendNotification = CommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
+                    if (isFirstSendNotification) {
+                        CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
+                        EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
                     }
                 }
             }
@@ -382,6 +394,8 @@ public class StepService extends Service implements SensorEventListener {
                 }
             }).start();
             startTimeCount();
+        } else {
+            EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
         }
 //        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
 //            //开始配置JobInfo
@@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        UserStepEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
+        UserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        UserStepEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
+        UserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(UserStepEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
+        registerDaoClass(UserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,11 +8,11 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
-    private final DaoConfig userStepEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
+    private final DaoConfig userStepEntityDaoConfig;
-    private final UserStepEntityDao userStepEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
+    private final UserStepEntityDao userStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
-        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
-        userStepEntityDaoConfig.initIdentityScope(type);
-
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
-        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
+        userStepEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
+        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        registerDao(UserStepEntity.class, userStepEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
+        registerDao(UserStepEntity.class, userStepEntityDao);
     }
     public void clear() {
-        userStepEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
-    }
-
-    public UserStepEntityDao getUserStepEntityDao() {
-        return userStepEntityDao;
+        userStepEntityDaoConfig.clearIdentityScope();
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
         return collUserStepEntityDao;
     }
+    public UserStepEntityDao getUserStepEntityDao() {
+        return userStepEntityDao;
+    }
+
 }
@@ -24,6 +24,7 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
@@ -137,19 +138,7 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         super.onResume();
         check();
-//        PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-
-//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-//            boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(getPackageName());
-//            if (!hasIgnored) {
-//                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-//                intent.setData(Uri.parse("package:" + getPackageName()));
-//                PackageManager pm = getPackageManager();
-//                if (intent.resolveActivity(pm) != null) {
-//                    startActivity(intent);
-//                }
-//            }
-//        }
+//
         getPermissionsWithTip();
     }
@@ -184,7 +173,9 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
                             startActivityForResult(intent, 10);
                             Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
                         } else {
-                            addFragment();
+                            if (getCurrentFragment() == null) {
+                                addFragment();
+                            }
                         }
                     }
                 })
@@ -229,4 +220,8 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         return;
     }
+    public static void startActivity(Activity activity) {
+        Intent intent = new Intent(activity, PedometerMainActivity.class);
+        activity.startActivity(intent);
+    }
 }
@@ -15,12 +15,17 @@ import android.widget.LinearLayout;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
 import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
@@ -29,6 +34,8 @@ import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 import java.util.List;
@@ -171,4 +178,22 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
 //        FivePersonIconView fivePersonIconView = view.findViewById(R.id.five_join_person);
 //        fivePersonIconView.initIconData(data);
 //    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void Event(MessageEvent messageEvent) {
+        //启动鹰眼成功
+        if (messageEvent.getMessageType() == Constant.START_TRACE_GATHER_SUCCESS) {
+            if (getMvpView() != null) {
+                QMUITipDialogUtil.dismessDialog();
+                PedometerMainActivity.startActivity(getActivity());
+            }
+        }
+        //启动鹰眼失败
+        else if (messageEvent.getMessageType() == Constant.START_TRACE_GATHER_FAIL) {
+            if (getMvpView() != null) {
+                QMUITipDialogUtil.dismessDialog();
+                QMUITipDialogUtil.textDialog(getContext(), "服务异常,请重试!", 1);
+            }
+        }
+    }
 }
+package com.cnlive.moudle.pedometer.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.PowerManager;
+import android.provider.Settings;
+
+import static android.content.Context.POWER_SERVICE;
+
+public class CheckUtil {
+
+    public static boolean isIgnoringBatteryOptimizationss(Activity context) {
+        PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+            if (!hasIgnored) {
+                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                intent.setData(Uri.parse("package:" + context.getPackageName()));
+                PackageManager pm = context.getPackageManager();
+                if (intent.resolveActivity(pm) != null) {
+                    context.startActivity(intent);
+                }
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.baidu.mapapi.map.MapView
+            android:id="@+id/mapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+
+        <!--地图上面加一层类似于全透明黑色蒙版-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#0D000000"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"></LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/fl_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/circle_white_shadow_bg"
+            android:focusable="true">
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="-2dp"
+                android:layout_marginBottom="3dp"
+                android:background="@drawable/icon_back"
+                android:focusable="false" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|right"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="10dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="80dp"
+                android:layout_height="35dp"
+                android:layout_gravity="right"
+                android:background="@drawable/gps_white_shadow"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:text="GPS"
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:id="@+id/iv_gps_state"
+                    android:layout_width="18dp"
+                    android:layout_height="5dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginBottom="4dp" />
+            </LinearLayout>
+            <!---->
+            <TextView
+                android:id="@+id/tv_gps_pop_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="45dp"
+                android:layout_marginTop="-5dp"
+                android:background="@drawable/gps_tip_bg"
+                android:gravity="center"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
+                android:textColor="@color/text_black"
+                android:textSize="12sp"
+                android:visibility="gone" />
+            <!---->
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/fl_location"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="150dp"
+            android:background="@drawable/circle_white_shadow_bg"
+            android:focusable="true">
+
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
+                android:background="@drawable/rt_ic_location_blank"
+                android:focusable="false" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/fl_take_import_point"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="right|bottom"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="200dp"
+            android:background="@drawable/circle_white_shadow_bg"
+            android:focusable="true">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="5dp"
+                android:text="打点"
+                android:textColor="@color/text_black"
+                android:textSize="15sp" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/fl_end_point"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="right|bottom"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="140dp"
+            android:background="@drawable/circle_white_shadow_bg"
+            android:focusable="true">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="5dp"
+                android:text="结束"
+                android:textColor="@color/text_black"
+                android:textSize="15sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="130dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/white_shadow_bg"
+            android:scaleX="1.02">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1.2"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp">
+
+                <TextView
+                    android:id="@+id/tv_current_speed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="--"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="配速"
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1.2"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <Chronometer
+                    android:id="@+id/chronometer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:format="00:00:00"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="用时"
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp">
+
+                <TextView
+                    android:id="@+id/tv_current_diatance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="--"
+                    android:textColor="@color/black"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="距离(km)"
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!---->
+
+    </FrameLayout>
+</layout>
 \ No newline at end of file
@@ -20,7 +20,8 @@
                 <RelativeLayout
                     android:id="@+id/rl_close"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
                     <ImageView
                         android:layout_width="25dp"
@@ -33,7 +34,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1"
+                    android:layout_weight="1.2"
                     android:gravity="center"
                     android:paddingLeft="50dp">
@@ -85,8 +86,7 @@
                             android:layout_height="5dp"
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="5dp"
-                            android:layout_toRightOf="@id/tv_gps"
-                             />
+                            android:layout_toRightOf="@id/tv_gps" />
                         <TextView
                             android:id="@+id/tv_look_trace"
@@ -163,8 +163,7 @@
                                 android:gravity="center"
                                 android:text="配速"
                                 android:textColor="@color/text_gray99"
-                                android:textSize="15sp"
-                               />
+                                android:textSize="15sp" />
                         </LinearLayout>
                         <!--用时-->
                         <LinearLayout
@@ -196,8 +195,7 @@
                                 android:gravity="center"
                                 android:text="用时"
                                 android:textColor="@color/text_gray99"
-                                android:textSize="15sp"
-                                 />
+                                android:textSize="15sp" />
                         </LinearLayout>
                         <!--热量-->
                         <LinearLayout
@@ -230,8 +228,7 @@
                                 android:gravity="center"
                                 android:text="步"
                                 android:textColor="@color/text_gray99"
-                                android:textSize="15sp"
-                                />
+                                android:textSize="15sp" />
                         </LinearLayout>
                     </LinearLayout>
@@ -259,11 +256,11 @@
                         <LinearLayout
                             android:id="@+id/ll_two_bottom_button"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginBottom="25dp"
                             android:gravity="center_horizontal"
-                            android:visibility="gone"
-
-                            >
+                            android:visibility="gone">
                             <LinearLayout
                                 android:layout_width="wrap_content"