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

韩亚云
2 parents cda63833 c18828ed
Showing 45 changed files with 3554 additions and 306 deletions
build.gradle
moudle_pedometer/build.gradle
moudle_pedometer/src/main/AndroidManifest.xml
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/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunRaceDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
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/frame/view/RunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/SubscriptionRequest.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/upload/FeedBackInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/upload/StorageInfoData.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/upload/UploadAuthData.java
@@ -100,5 +100,10 @@ ext {
     libAnalytics = '1.0.8'
     okhttp = '3.8.1'
     oki = '1.13.0'
-
+    //七牛
+    qiniuAndroidSdk = '7.3.11'
+    libUpload = '2.0.6'
+    //视频库
+    libVideoQiniu = '1.0.6'
+    libMediaPicker = '1.5.1'
 }
@@ -6,7 +6,7 @@ android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
-
+    useLibrary 'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -112,5 +112,13 @@ dependencies {
     implementation project(':library_baidumap')
     //加载动画
     implementation 'com.wang.avi:library:2.1.3'
-
+    implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
+    //七牛上传
+    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
+    implementation("com.cnlive:lib_upload:$rootProject.libUpload") {
+        exclude group: 'com.android.support'
+        exclude group: 'com.cnlive'
+    }
+    implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
+    implementation 'org.apache.httpcomponents:httpcore:4.4.2'
 }
@@ -123,9 +123,11 @@
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
+            android:launchMode="singleTask"
             android:process=":step" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
+            android:launchMode="singleTask"
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
@@ -269,9 +269,9 @@ public class CollRunMainFragmentView implements MvpView {
                         //隐藏两个按钮
                         fragment.binding.flStopTip.setVisibility(View.INVISIBLE);
                         fragment.binding.llTwoBottomButton.setVisibility(View.GONE);
-                        ButtonAnimUtil.setViewShowZoomIn(fragment.binding.llPause);
+//                        ButtonAnimUtil.setViewShowZoomIn(fragment.binding.llPause);
                         //显示暂停按钮
-                        fragment.binding.llPause.setVisibility(View.VISIBLE);
+                        fragment.binding.flPause.setVisibility(View.VISIBLE);
                         //
                     }
                 }, ButtonAnimUtil.DEFAULT_ZOOM_DURATION * 2);
@@ -401,12 +401,12 @@ public class CollRunMainFragmentView implements MvpView {
                 //将当前计时器时间戳写入数据库
                 setSQLPauseTime(uid);
                 needWriteDataFlag = false;
-                ButtonAnimUtil.setViewHideZoomOut(fragment.binding.llPause);
+//                ButtonAnimUtil.setViewHideZoomOut(fragment.binding.llPause);
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         //隐藏本身
-                        fragment.binding.llPause.setVisibility(View.GONE);
+                        fragment.binding.flPause.setVisibility(View.GONE);
                     }
                 }, ButtonAnimUtil.HIDE_VIEW_ZOOM_DURATION);
                 //显示继续按钮
@@ -119,9 +119,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         this.runRaceDetailInfo = runRaceDetailInfo;
         //初始化地图点位
         if (runRaceDetailInfo.getLatLongitude() != null) {
-            Log.e(TAG, "initView: 长度:" + runRaceDetailInfo.getLatLongitude().length());
+//            Log.e(TAG, "initView: 长度:" + runRaceDetailInfo.getLatLongitude().length());
             trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude(), LatLng.class);
-            Log.e(TAG, "initView: trackPoints" + trackPoints.size());
+//            Log.e(TAG, "initView: trackPoints" + trackPoints.size());
 //            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
 //            //自动计算地图缩放
             MapStatus.Builder builder = new MapStatus.Builder();
@@ -295,6 +295,69 @@ public class CommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runIsPauseState", false);
     }
+    /**
+     * 设置轨迹查询开始时间
+     *
+     * @param context
+     * @param startTime
+     */
+    public static void setQueryTraceStartTime(Context context, long startTime) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("runQueryTraceStartTime", startTime);
+
+    }
+
+    /**
+     * 互殴轨迹查询开始时间
+     *
+     * @param context
+     */
+    public static long getQueryTraceStartTime(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("runQueryTraceStartTime", 0);
+
+    }
+
+    /**
+     * 设置轨迹查询结束时间
+     *
+     * @param context
+     * @param startTime
+     */
+    public static void setQueryTraceEndTime(Context context, long startTime) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("runQueryTraceEndTime", startTime);
+
+    }
+
+    /**
+     * 互殴轨迹查询开始时间
+     *
+     * @param context
+     */
+    public static long getQueryTraceEndTime(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("runQueryTraceEndTime", 0);
+
+    }
+
+    /**
+     * 设置轨迹查询实体名称
+     *
+     * @param context
+     */
+    public static void setQueryEntityName(Context context, String entityName) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runQueryEntityName", entityName);
+
+    }
+
+    /**
+     * 互殴轨迹查询\的实体名称
+     *
+     * @param context
+     */
+    public static String getQueryQueryEntityName(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runQueryEntityName", "");
+
+    }
+
+
     /*重置
      * @param context
      */
@@ -309,6 +372,12 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FenceId");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runIsPauseState");
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryTraceStartTime");
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryTraceEndTime");
+//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runQueryEntityName");
+
+
     }
     /*重置赛事
@@ -33,41 +33,6 @@ public class RunRaceDetailFragmentPresenter extends MvpBasePresenter&lt;RunRaceDeta
         paramsMap.put("sid", userId);
 //        0-用户使用 1-运营使用
         paramsMap.put("state", state);
-//        Logic.create(paramsMap)
-//                .action(new Logic.Action<Map<String, String>, BaseInfo<RunRaceDetailInfo>>() {
-//                    @Override
-//                    public Disposable action(Map<String, String> paramsMap, DataCallback<BaseInfo<RunRaceDetailInfo>> dataCallback) {
-//                        return ApiRequest.service(ApiServiceRunLin.class, api -> api.getRunRaceDetail(paramsMap)).subscribe(context, dataCallback);
-//                    }
-//                }).<BaseInfo<RunRaceDetailInfo>>event()
-//                .setStateCallback(new StateCallback() {
-//                    @Override
-//                    public void onState(int i) {
-//                        if (getView() == null) {
-//                            return;
-//                        }
-//                        if (i == STATE_LOAD) {
-//                            QMUITipDialogUtil.loadingDialog(context, "正在获取赛事详情", false);
-//                        } else if (i == STATE_IDLE) {
-//                        }
-//
-//                    }
-//                })
-//                .setSuccessCallback(new SuccessCallback<BaseInfo<RunRaceDetailInfo>>() {
-//                    @Override
-//                    public void onSuccess(BaseInfo<RunRaceDetailInfo> runRaceDetailInfoBaseInfo) {
-//                        if (getView() == null) {
-//                            return;
-//                        }
-//                    }
-//                }).setFailureCallback(new FailureCallback() {
-//            @Override
-//            public void onFailure(int i, String s) {
-//                if (getView() == null) {
-//                    return;
-//                }
-//            }
-//        }).start();
         Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo<RunRaceDetailInfo>>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<RunRaceDetailInfo>> dataCallback) {
 package com.cnlive.moudle.pedometer.frame.presenter;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.logic.Event;
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.StateCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.libs.base.util.ToastUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
+import com.cnlive.moudle.pedometer.service.StepService;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
+import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
+import com.cnlive.moudle.pedometer.upload.UploadLogic;
+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.StepUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
+import static com.cnlive.libs.base.logic.Config.STATE_IDLE;
+import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
+
 public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinishFragmentView> {
+    private LBSTraceClient mClient = null;
+    private String imports = "[{\"latitude\":39.93395837223,\"latitudeE6\":3.993395837223E7,\"longitude\":116.30855458458,\"longitudeE6\":1.1630855458457999E8},{\"latitude\":39.93396326228,\"latitudeE6\":3.993396326228E7,\"longitude\":116.30861833018,\"longitudeE6\":1.1630861833017999E8},{\"latitude\":39.934156956749995,\"latitudeE6\":3.993415695675E7,\"longitude\":116.30869672329999,\"longitudeE6\":1.163086967233E8},{\"latitude\":39.934220163784,\"latitudeE6\":3.9934220163784E7,\"longitude\":116.3087100148,\"longitudeE6\":1.163087100148E8},{\"latitude\":39.934285263072,\"latitudeE6\":3.9934285263072E7,\"longitude\":116.30866498582,\"longitudeE6\":1.1630866498582E8},{\"latitude\":39.934351994321,\"latitudeE6\":3.9934351994320996E7,\"longitude\":116.30865820422,\"longitudeE6\":1.1630865820422E8},{\"latitude\":39.934393506188,\"latitudeE6\":3.9934393506188005E7,\"longitude\":116.3087268324,\"longitudeE6\":1.163087268324E8},{\"latitude\":39.934515310648,\"latitudeE6\":3.9934515310648E7,\"longitude\":116.30877023341,\"longitudeE6\":1.1630877023341E8},{\"latitude\":39.934576888398,\"latitudeE6\":3.9934576888398E7,\"longitude\":116.30876860572,\"longitudeE6\":1.1630876860572E8},{\"latitude\":39.934641987882,\"latitudeE6\":3.9934641987882E7,\"longitude\":116.30872520428,\"longitudeE6\":1.1630872520427999E8},{\"latitude\":39.934720386354,\"latitudeE6\":3.9934720386354E7,\"longitude\":116.30874175083,\"longitudeE6\":1.1630874175083E8},{\"latitude\":39.934703845843,\"latitudeE6\":3.9934703845843E7,\"longitude\":116.30880197017,\"longitudeE6\":1.1630880197016999E8},{\"latitude\":39.934719055573,\"latitudeE6\":3.9934719055573E7,\"longitude\":116.30896553874,\"longitudeE6\":1.1630896553874E8},{\"latitude\":39.93482461107,\"latitudeE6\":3.993482461107E7,\"longitude\":116.30924466304002,\"longitudeE6\":1.1630924466304001E8},{\"latitude\":39.934804821527,\"latitudeE6\":3.9934804821527004E7,\"longitude\":116.30935804892,\"longitudeE6\":1.1630935804892E8},{\"latitude\":39.934856643274,\"latitudeE6\":3.9934856643274E7,\"longitude\":116.30943996874,\"longitudeE6\":1.1630943996874E8},{\"latitude\":39.934844987999,\"latitudeE6\":3.9934844987999E7,\"longitude\":116.30952026112,\"longitudeE6\":1.1630952026112E8},{\"latitude\":39.934722121282,\"latitudeE6\":3.9934722121282004E7,\"longitude\":116.30967542086,\"longitudeE6\":1.1630967542086E8},{\"latitude\":39.934828721701,\"latitudeE6\":3.9934828721701E7,\"longitude\":116.30960516489,\"longitudeE6\":1.1630960516489E8},{\"latitude\":39.934408798988,\"latitudeE6\":3.9934408798988E7,\"longitude\":116.30961357453,\"longitudeE6\":1.1630961357453E8},{\"latitude\":39.934345321571,\"latitudeE6\":3.9934345321571E7,\"longitude\":116.30960842073,\"longitudeE6\":1.1630960842073E8},{\"latitude\":39.93436159016,\"latitudeE6\":3.9934361590160005E7,\"longitude\":116.30954331882,\"longitudeE6\":1.1630954331882E8},{\"latitude\":39.934295133241,\"latitudeE6\":3.9934295133241E7,\"longitude\":116.30957668364,\"longitudeE6\":1.1630957668364E8},{\"latitude\":39.934188525341,\"latitudeE6\":3.9934188525341E7,\"longitude\":116.30958183769,\"longitudeE6\":1.1630958183769001E8},{\"latitude\":39.933976660469,\"latitudeE6\":3.9933976660469E7,\"longitude\":116.30954494693,\"longitudeE6\":1.1630954494693E8},{\"latitude\":39.933993190121,\"latitudeE6\":3.9933993190121E7,\"longitude\":116.30939114375,\"longitudeE6\":1.1630939114375001E8},{\"latitude\":39.933938115564,\"latitudeE6\":3.9933938115563996E7,\"longitude\":116.30932956832,\"longitudeE6\":1.1630932956831999E8},{\"latitude\":39.933916130555,\"latitudeE6\":3.9933916130555E7,\"longitude\":116.30922269279,\"longitudeE6\":1.1630922269279E8},{\"latitude\":39.933836097011,\"latitudeE6\":3.9933836097011E7,\"longitude\":116.30914077307,\"longitudeE6\":1.1630914077307E8}]\n";
+
+    public void saveRouteData(Context context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        // 赛事id
+        String eventId = userStepEntity.getStreetId();
+        //用户ID
+        String sid = CommonInfo.getUserId(context);
+        //用时
+        String employTime = runningFinishBean.getEmployTime();
+        //路线全程里数
+        String mileage = "";
+        if ("--".equals(runningFinishBean.getRunDistance())) {
+            mileage = "0";
+        } else {
+            mileage = runningFinishBean.getRunDistance();
+        }
+        //配速
+        String pace = "";
+        if ("--".equals(runningFinishBean.getSpeed())) {
+            pace = "0";
+        } else {
+            pace = runningFinishBean.getSpeed();
+        }
+        //  路线图
+        String roadmap = runningFinishBean.getRoadmap();
+        //经纬度
+        String latLongitude = "";
+        // 开始时间
+        String startTime = userStepEntity.getStartTimeStamp() + "";
+        //结束时间
+        String endTime = userStepEntity.getFinishTimeStamp() + "";
+        //暂停时间
+        String pauseTime = "";
+        String isPause = "0";//1暂停
+        if (userStepEntity.getPauseCount() > 0) {
+            pauseTime = userStepEntity.getUserPauseTimeStamp() + "";
+            isPause = "1";
+        }
+        //继续时间
+        String continueTime = "";
+        //是否完成
+        String completeStatus = runningFinishBean.getIsFinish();
+
+        //设置请求参数
+        Map<String, String> paramsMap = new HashMap<>();
+        paramsMap.put("eventId", eventId);
+        paramsMap.put("sid", sid);
+        paramsMap.put("employTime", employTime);
+        paramsMap.put("mileage", mileage);
+        paramsMap.put("pace", pace);
+        paramsMap.put("latLongitude", latLongitude);
+        paramsMap.put("roadmap", roadmap);
+        paramsMap.put("startTime", startTime);
+        paramsMap.put("endTime", endTime);
+        paramsMap.put("pauseTime", pauseTime);
+        paramsMap.put("continueTime", continueTime);
+        paramsMap.put("isPause", isPause);
+        paramsMap.put("completeStatus", completeStatus);
+
+
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.saveRouteData(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event()
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        QMUITipDialogUtil.dismessDialog();
+                        if (getView() == null) {
+                            return;
+                        }
+                        Log.e("saveRouteData", "onFailure: " + message);
+//                        getView().hideLoadingView();
+//                        getView().showRetryView(code, new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View view) {
+//                                getRunRaceDetailInfo(context, id, userId,state);
+//                            }
+//                        });
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+                Log.e("saveRouteData", "onSuccess: ");
+
+                QMUITipDialogUtil.dismessDialog();
+                getView().updataIsFinish(runningFinishBean);
+                StepUtil.clearRunData(context, CommonInfo.getUserId(context));
+                CommonInfo.reset(context);
+
+            }
+        }).start();
+    }
+
+    /**
+     * 查询当前用户历史轨迹
+     */
+    public void queryHistoryTrace(Context context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        //查询当前用户的历史轨迹
+        long startTime = userStepEntity.getStartTimeStamp();
+        //获取当前的时间戳(秒)
+        long endTime = userStepEntity.getFinishTimeStamp();
+        //获取当前的实体名称
+        String entityName = CommonInfo.getUserId(context);
+        //路线全程里数
+
+        //打的重要点
+        List<LatLng> importPoints = GsonUtil.jsonToList(imports, LatLng.class);
+        if (mClient == null) {
+            mClient = new LBSTraceClient(context);
+        }
+        MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
+            @Override
+            public void success(List<LatLng> resultPoints) {
+                if (resultPoints != null) {
+                    if (getView() != null && resultPoints != null) {
+                        if (importPoints != null && resultPoints != null) {
+                            //判断是否完成
+                            boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, 0.6);
+                            if (isFinish) {
+                                Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
+                                runningFinishBean.setIsFinish("1");
+                            } else {
+                                Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
+                                runningFinishBean.setIsFinish("0");
+                            }
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            new Handler().postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    //开始截图
+                                    getView().baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
+                                        @Override
+                                        public void onSnapshotReady(Bitmap bitmap) {
+                                            if (context == null) {
+                                                return;
+                                            }
+                                            if (null == bitmap) {
+                                                return;
+                                            }
+                                            //开始保存截屏
+                                            try {
+                                                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                                                File image = new File(context.getExternalCacheDir() + "/location_screenshot_" + sdf.format(new Date()) + ".jpeg");
+                                                FileOutputStream fos = new FileOutputStream(image);
+                                                boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+                                                fos.flush();
+                                                fos.close();
+                                                String mapImagePath = image.getAbsolutePath();
+                                                if (!TextUtils.isEmpty(mapImagePath)) {
+                                                    QMUITipDialogUtil.loadingDialog(context, "正在上传数据", false);
+                                                    //开始上传7牛
+                                                    List<String> imagePaths = new ArrayList<>();
+                                                    imagePaths.add(mapImagePath);
+                                                    UploadLogic.uploadAddressPicInfo(getView().getContext(), imagePaths, new Event<String>()
+                                                            .setFailureCallback(new FailureCallback() {
+                                                                @Override
+                                                                public void onFailure(int i, String s) {
+                                                                    QMUITipDialogUtil.dismessDialog();
+                                                                }
+                                                            })
+                                                            .setSuccessCallback(new SuccessCallback<String>() {
+                                                                @Override
+                                                                public void onSuccess(String data) {
+                                                                    //设置截图
+                                                                    runningFinishBean.setRoadmap(data);
+                                                                    //开始向服务器传数据
+                                                                    saveRouteData(context, userStepEntity, runningFinishBean);
+                                                                }
+                                                            })
+                                                    );
+                                                }
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                    });
+//
+                                }
+                            }, 2000);
+                            //
+                        }
+                    }
+                }
+                //查询失败
+                else {
+                    QMUITipDialogUtil.dismessDialog();
+                    SelectDialog selectDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.dismiss();
+                            queryHistoryTrace(context, userStepEntity, runningFinishBean);
+                        }
+                    }, "暂存", new SelectDialog.DialogInterface() {
+                        @Override
+                        public void onClick(SelectDialog dialog) {
+                            dialog.dismiss();
+                        }
+                    });
+                    selectDialog.setCanceledOnTouchOutside(false);
+                    selectDialog.setCancelable(false);
+                    selectDialog.show();
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 查询运营人员踩得轨迹
+     *
+     * @param userStepEntity
+     */
+    public void getServerStreetTrace(Context context, UserStepEntity userStepEntity) {
+        if (mClient == null) {
+            mClient = new LBSTraceClient(context);
+        }
+        long serverStartTime = userStepEntity.getQueryTraceStartTime();
+        long serverEndTime = userStepEntity.getQueryTraceEndTime();
+        String serverEntityName = userStepEntity.getQueryEntityName();
+        if (serverStartTime != 0 && serverEndTime != 0 && !TextUtils.isEmpty(serverEntityName) && mClient != null) {
+            //查询服务赛道历史轨迹
+            MyMapUtil.queryHistoryTrace(context, mClient, serverEntityName, serverStartTime, serverEndTime, new MyMapUtil.CallBack() {
+                @Override
+                public void success(List<LatLng> resultPoints) {
+                    if (resultPoints != null && resultPoints.size() > 1) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        getView().drawServerStreetTrace(resultPoints);
+                    }
+
+
+                }
+            });
+        }
+
+    }
 }
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -60,16 +61,19 @@ import com.baidu.trace.model.SortType;
 import com.baidu.trace.model.StatusCodes;
 import com.baidu.trace.model.TraceLocation;
 import com.baidu.trace.model.TransportMode;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunningMapFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.RoutePoint;
 import com.cnlive.moudle.pedometer.service.StepService;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.CommonUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MapUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
@@ -106,11 +110,34 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
     /**
      * 轨迹点集合
      */
-    private List<LatLng> realTimePoints;
     private String imports = "[{\"latitude\":39.93395837223,\"latitudeE6\":3.993395837223E7,\"longitude\":116.30855458458,\"longitudeE6\":1.1630855458457999E8},{\"latitude\":39.93396326228,\"latitudeE6\":3.993396326228E7,\"longitude\":116.30861833018,\"longitudeE6\":1.1630861833017999E8},{\"latitude\":39.934156956749995,\"latitudeE6\":3.993415695675E7,\"longitude\":116.30869672329999,\"longitudeE6\":1.163086967233E8},{\"latitude\":39.934220163784,\"latitudeE6\":3.9934220163784E7,\"longitude\":116.3087100148,\"longitudeE6\":1.163087100148E8},{\"latitude\":39.934285263072,\"latitudeE6\":3.9934285263072E7,\"longitude\":116.30866498582,\"longitudeE6\":1.1630866498582E8},{\"latitude\":39.934351994321,\"latitudeE6\":3.9934351994320996E7,\"longitude\":116.30865820422,\"longitudeE6\":1.1630865820422E8},{\"latitude\":39.934393506188,\"latitudeE6\":3.9934393506188005E7,\"longitude\":116.3087268324,\"longitudeE6\":1.163087268324E8},{\"latitude\":39.934515310648,\"latitudeE6\":3.9934515310648E7,\"longitude\":116.30877023341,\"longitudeE6\":1.1630877023341E8},{\"latitude\":39.934576888398,\"latitudeE6\":3.9934576888398E7,\"longitude\":116.30876860572,\"longitudeE6\":1.1630876860572E8},{\"latitude\":39.934641987882,\"latitudeE6\":3.9934641987882E7,\"longitude\":116.30872520428,\"longitudeE6\":1.1630872520427999E8},{\"latitude\":39.934720386354,\"latitudeE6\":3.9934720386354E7,\"longitude\":116.30874175083,\"longitudeE6\":1.1630874175083E8},{\"latitude\":39.934703845843,\"latitudeE6\":3.9934703845843E7,\"longitude\":116.30880197017,\"longitudeE6\":1.1630880197016999E8},{\"latitude\":39.934719055573,\"latitudeE6\":3.9934719055573E7,\"longitude\":116.30896553874,\"longitudeE6\":1.1630896553874E8},{\"latitude\":39.93482461107,\"latitudeE6\":3.993482461107E7,\"longitude\":116.30924466304002,\"longitudeE6\":1.1630924466304001E8},{\"latitude\":39.934804821527,\"latitudeE6\":3.9934804821527004E7,\"longitude\":116.30935804892,\"longitudeE6\":1.1630935804892E8},{\"latitude\":39.934856643274,\"latitudeE6\":3.9934856643274E7,\"longitude\":116.30943996874,\"longitudeE6\":1.1630943996874E8},{\"latitude\":39.934844987999,\"latitudeE6\":3.9934844987999E7,\"longitude\":116.30952026112,\"longitudeE6\":1.1630952026112E8},{\"latitude\":39.934722121282,\"latitudeE6\":3.9934722121282004E7,\"longitude\":116.30967542086,\"longitudeE6\":1.1630967542086E8},{\"latitude\":39.934828721701,\"latitudeE6\":3.9934828721701E7,\"longitude\":116.30960516489,\"longitudeE6\":1.1630960516489E8},{\"latitude\":39.934408798988,\"latitudeE6\":3.9934408798988E7,\"longitude\":116.30961357453,\"longitudeE6\":1.1630961357453E8},{\"latitude\":39.934345321571,\"latitudeE6\":3.9934345321571E7,\"longitude\":116.30960842073,\"longitudeE6\":1.1630960842073E8},{\"latitude\":39.93436159016,\"latitudeE6\":3.9934361590160005E7,\"longitude\":116.30954331882,\"longitudeE6\":1.1630954331882E8},{\"latitude\":39.934295133241,\"latitudeE6\":3.9934295133241E7,\"longitude\":116.30957668364,\"longitudeE6\":1.1630957668364E8},{\"latitude\":39.934188525341,\"latitudeE6\":3.9934188525341E7,\"longitude\":116.30958183769,\"longitudeE6\":1.1630958183769001E8},{\"latitude\":39.933976660469,\"latitudeE6\":3.9933976660469E7,\"longitude\":116.30954494693,\"longitudeE6\":1.1630954494693E8},{\"latitude\":39.933993190121,\"latitudeE6\":3.9933993190121E7,\"longitude\":116.30939114375,\"longitudeE6\":1.1630939114375001E8},{\"latitude\":39.933938115564,\"latitudeE6\":3.9933938115563996E7,\"longitude\":116.30932956832,\"longitudeE6\":1.1630932956831999E8},{\"latitude\":39.933916130555,\"latitudeE6\":3.9933916130555E7,\"longitude\":116.30922269279,\"longitudeE6\":1.1630922269279E8},{\"latitude\":39.933836097011,\"latitudeE6\":3.9933836097011E7,\"longitude\":116.30914077307,\"longitudeE6\":1.1630914077307E8}]\n";
     private HashMap<Integer, Boolean> importHash;
-    private static int matchIndex = 0;
+    /**
+     * 查询运营人员踩得轨迹
+     *
+     * @param userStepEntity
+     */
+    public void getServerStreetTrace(Context context, UserStepEntity userStepEntity) {
+        long serverStartTime = userStepEntity.getQueryTraceStartTime();
+        long serverEndTime = userStepEntity.getQueryTraceEndTime();
+        String serverEntityName = userStepEntity.getQueryEntityName();
+        if (serverStartTime != 0 && serverEndTime != 0 && !TextUtils.isEmpty(serverEntityName) && StepService.mClient != null) {
+            //查询服务赛道历史轨迹
+            MyMapUtil.queryHistoryTrace(context, StepService.mClient, serverEntityName, serverStartTime, serverEndTime, new MyMapUtil.CallBack() {
+                @Override
+                public void success(List<LatLng> resultPoints) {
+                    if (resultPoints != null && resultPoints.size() > 1) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        getView().drawServerStreetTrace(resultPoints);
+                    }
+                }
+            });
+        }
+
+    }
 //    /**
 //     * 查询历史轨迹
 //     *
@@ -313,19 +340,21 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
     /**
-     * 查询历史轨迹
-     *
-     * @param startTime
-     * @param endTime
+     * 查询当前用户历史轨迹
      */
-    public void queryHistoryTrace(Context context, String entityName, long startTime, long endTime) {
-        Log.e(TAG, "queryHistoryTrace: 时间:" + startTime);
+    public void queryHistoryTrace(Context context, UserStepEntity userStepEntity) {
+        //查询当前用户的历史轨迹
+        long startTime = userStepEntity.getStartTimeStamp();
+        //获取当前的时间戳(秒)
+        long endTime = TimeUtil.getNowTimeStamp();
+        //获取当前的实体名称
+        String entityName = CommonInfo.getUserId(context);
         //打的重要点
         List<LatLng> importPoints = GsonUtil.jsonToList(imports, LatLng.class);
         MyMapUtil.queryHistoryTrace(context, StepService.mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
             @Override
             public void success(List<LatLng> resultPoints) {
-                if (resultPoints != null&&resultPoints.size()>1) {
+                if (resultPoints != null && resultPoints.size() > 1) {
                     if (getView() != null && resultPoints != null) {
                         if (resultPoints.size() == 1) {
                             getView().setHistoryLastPoint(resultPoints.get(0));
@@ -60,6 +60,7 @@ public class RunMainFragmentView implements MvpView {
     private int timeCountDown;//时间倒计时
     private String uid;
     private boolean needWriteDataFlag = true;//是否需要将计时器基值写入到数据库
+    private UserStepEntity userStepEntity;
     // 定位相关
     private LocationClient mLocClient;
     public MyLocationListenner myListener = new MyLocationListenner();
@@ -118,6 +119,7 @@ public class RunMainFragmentView implements MvpView {
     public void initView() {
         Log.e(TAG, "initView: +时间" + SystemClock.elapsedRealtime());
         uid = CommonInfo.getUserId(getContext());
+        userStepEntity = StepUtil.getUserStepData(getContext(), uid);
         initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
@@ -186,7 +188,6 @@ public class RunMainFragmentView implements MvpView {
             handler.postDelayed(runnable, 1000);
             CommonInfo.setIsFirstShowTimeTip(getContext(), false);
         } else {
-            UserStepEntity userStepEntity = StepUtil.getUserStepData(getContext(), uid);
             //隐藏计时界面
             fragment.binding.llStartTimeTip.setVisibility(View.GONE);
             fragment.binding.llRunMainRoot.setVisibility(View.VISIBLE);
@@ -208,6 +209,8 @@ public class RunMainFragmentView implements MvpView {
                                     fragment.binding.chronometer.setFormat("00:00:01");
                                     fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
                                 }
+                                //设置继续运动时间
+                                StepUtil.setContinueTime(getContext(),uid,TimeUtil.getNowTimeStamp());
                                 //因为进来以后就运动了,所以需要改变状态
                                 CommonInfo.setIsPauseState(getContext(), false);
                                 //重新设置开始时间
@@ -259,6 +262,8 @@ public class RunMainFragmentView implements MvpView {
         fragment.binding.flContinue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                //设置继续运动时间
+                StepUtil.setContinueTime(getContext(),uid,TimeUtil.getNowTimeStamp());
                 //设置继续标志
                 CommonInfo.setIsPauseState(getContext(), false);
                 //继续记录轨迹
@@ -276,10 +281,9 @@ public class RunMainFragmentView implements MvpView {
                     public void run() {
                         //隐藏两个按钮
                         fragment.binding.flStopTip.setVisibility(View.INVISIBLE);
-                        fragment.binding.llTwoBottomButton.setVisibility(View.GONE);
-                        ButtonAnimUtil.setViewShowZoomIn(fragment.binding.llPause);
+//                        ButtonAnimUtil.setViewShowZoomIn(fragment.binding.llPause);
                         //显示暂停按钮
-                        fragment.binding.llPause.setVisibility(View.VISIBLE);
+                        fragment.binding.flPause.setVisibility(View.VISIBLE);
                     }
                 }, ButtonAnimUtil.DEFAULT_ZOOM_DURATION * 2);
                 //继续计步
@@ -335,13 +339,15 @@ public class RunMainFragmentView implements MvpView {
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
                                                     dialog.dismiss();
                                                     RunningFinishBean runningFinishBean = new RunningFinishBean();
-                                                    runningFinishBean.setStartPoint("开始地点");
-                                                    runningFinishBean.setEndPoint("结束地点");
+                                                    runningFinishBean.setStartPoint(userStepEntity.getStartPoint());
+                                                    runningFinishBean.setEndPoint(userStepEntity.getEndPoint());
                                                     runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
                                                     runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
                                                     runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
                                                     runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
                                                     runningFinishBean.setDate(TimeUtil.getFormatNowTime());
+                                                    //设置用时
+                                                    runningFinishBean.setEmployTime(TimeUtil.getChronometerSeconds(fragment.binding.chronometer));
                                                     RunningFinishActivity.startActivity(fragment.getActivity(), runningFinishBean);
                                                     fragment.getActivity().finish();
                                                 }
@@ -395,61 +401,40 @@ public class RunMainFragmentView implements MvpView {
         fragment.binding.flPause.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //将当前计时器时间戳写入数据库
-                setSQLPauseTime(uid);
-                //设置暂停标志
-                CommonInfo.setIsPauseState(getContext(), true);
-                //暂停轨迹记录
-                if (StepService.mClient != null && StepService.traceListener != null) {
-                    CommonInfo.setTsRunBaiduTraceService(getContext(), false);
-                    StepService.mClient.stopGather(StepService.traceListener);
-                }
-                needWriteDataFlag = false;
-                ButtonAnimUtil.setViewHideZoomOut(fragment.binding.llPause);
-                handler.postDelayed(new Runnable() {
+                //进行提示
+                SelectDialog selectDialog = new SelectDialog(getContext(), getContext().getString(R.string.run_pause_tip), "否", new SelectDialog.DialogInterface() {
                     @Override
-                    public void run() {
-                        //隐藏本身
-                        fragment.binding.llPause.setVisibility(View.GONE);
+                    public void onClick(SelectDialog dialog) {
+                        dialog.dismiss();
                     }
-                }, ButtonAnimUtil.HIDE_VIEW_ZOOM_DURATION);
-
+                }, "是", new SelectDialog.DialogInterface() {
+                    @Override
+                    public void onClick(SelectDialog dialog) {
+                        dialog.dismiss();
+                        //进行暂停
+                        onBtnPause();
+                    }
+                });
+                selectDialog.setCancelable(false);
+                selectDialog.setCanceledOnTouchOutside(true);
+                //先获取暂停次数
                 //获取当前用户暂停次数
                 int userPauseCount = StepUtil.getUserPauseCount(getContext(), uid);
-                if (userPauseCount != -1) {
-                    if (userPauseCount > 1) {
-                        //设置停止标志位,关闭相关服务
-                        setStopStartFlag();
-                        //清除数据库
-                        StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
-                        //进行提示
-                        TipDialog tipDialog = new TipDialog(getContext(), getContext().getString(R.string.more_than_pause_count_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
-                            @Override
-                            public void onClick(TipDialog dialog) {
-                                //关闭当前对话框
-                                dialog.dismiss();
-                                //关闭当前页面
-                                if (getContext() == null) {
-                                    return;
-                                }
-                                fragment.getActivity().finish();
-                            }
-                        });
-                        tipDialog.setCanceledOnTouchOutside(false);
-                        tipDialog.setCancelable(false);
-                        tipDialog.show();
-
-                    }
-                    //显示继续按钮
-                    fragment.binding.llTwoBottomButton.setVisibility(View.VISIBLE);
-                    ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flContinue);
-                    ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flStop);
-                    //停止计时
-                    fragment.binding.chronometer.stop();
-                    mRecordTime = SystemClock.elapsedRealtime();
-                    //暂停计步
-                    EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
+                if (userPauseCount < 1) {
+                    selectDialog.show();
+                } else {
+                    //只提示,不进行任何操作
+                    TipDialog tipDialog = new TipDialog(getContext(), "当前无法暂停", "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
+                        @Override
+                        public void onClick(TipDialog dialog) {
+                            dialog.dismiss();
+                        }
+                    });
+                    tipDialog.setCanceledOnTouchOutside(false);
+                    tipDialog.setCancelable(false);
+                    tipDialog.show();
                 }
+
             }
         });
         //gps点击事件
@@ -475,7 +460,7 @@ public class RunMainFragmentView implements MvpView {
             }
         });
         //返回按钮点击事件
-        fragment.binding.ivBack.setOnClickListener(new View.OnClickListener() {
+        fragment.binding.llBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (getContext() == null) {
@@ -493,24 +478,84 @@ public class RunMainFragmentView implements MvpView {
         });
     }
+    /**
+     * 暂停按钮
+     */
+    public void onBtnPause() {
+        //将当前计时器时间戳写入数据库
+        setSQLPauseTime(uid);
+        //设置暂停标志
+        CommonInfo.setIsPauseState(getContext(), true);
+        //暂停轨迹记录
+        if (StepService.mClient != null && StepService.traceListener != null) {
+            CommonInfo.setTsRunBaiduTraceService(getContext(), false);
+            StepService.mClient.stopGather(StepService.traceListener);
+        }
+        needWriteDataFlag = false;
+//                ButtonAnimUtil.setViewHideZoomOut(fragment.binding.llPause);
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //隐藏本身
+                fragment.binding.flPause.setVisibility(View.GONE);
+            }
+        }, ButtonAnimUtil.HIDE_VIEW_ZOOM_DURATION);
+
+        //获取当前用户暂停次数
+        int userPauseCount = StepUtil.getUserPauseCount(getContext(), uid);
+        if (userPauseCount != -1) {
+            if (userPauseCount > 1) {
+                //设置停止标志位,关闭相关服务
+                setStopStartFlag();
+                //清除数据库
+                StepUtil.clearRunData(getContext(), CommonInfo.getUserId(getContext()));
+                //进行提示
+                TipDialog tipDialog = new TipDialog(getContext(), getContext().getString(R.string.more_than_pause_count_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
+                    @Override
+                    public void onClick(TipDialog dialog) {
+                        //关闭当前对话框
+                        dialog.dismiss();
+                        //关闭当前页面
+                        if (getContext() == null) {
+                            return;
+                        }
+                        fragment.getActivity().finish();
+                    }
+                });
+                tipDialog.setCanceledOnTouchOutside(false);
+                tipDialog.setCancelable(false);
+                tipDialog.show();
+
+            }
+            //显示继续按钮
+            ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flContinue);
+            ButtonAnimUtil.setViewShowZoomIn(fragment.binding.flStop);
+            //停止计时
+            fragment.binding.chronometer.stop();
+            mRecordTime = SystemClock.elapsedRealtime();
+            //暂停计步
+            EventBus.getDefault().post(new MessageEvent(Constant.SERVICE_STEP_COUNT_PAUSE, ""));
+        }
+    }
+
     public void setSQLPauseTime(String id) {
-        Log.e(TAG, "setSQLPauseTime: " );
+        Log.e(TAG, "setSQLPauseTime: ");
 //        if (needWriteDataFlag) {
-            //将当前计时器时间戳写入数据库
-            if (!TextUtils.isEmpty(id)) {
-                UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid);
-                if (userStepEntity != null) {
-                    userStepEntity.setPauseTimeStamp(fragment.binding.chronometer.getBase());
-                    //设置当前暂停的时间戳
-                    userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
-                    //设置当前用户暂停的时间戳
-                    userStepEntity.setUserPauseTimeStamp(TimeUtil.getNowTimeStamp());
-                    //设置暂停次数
-                    userStepEntity.setPauseCount(userStepEntity.getPauseCount() + 1);
-                    //更新数据
-                    StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
-                }
+        //将当前计时器时间戳写入数据库
+        if (!TextUtils.isEmpty(id)) {
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid);
+            if (userStepEntity != null) {
+                userStepEntity.setPauseTimeStamp(fragment.binding.chronometer.getBase());
+                //设置当前暂停的时间戳
+                userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
+                //设置当前用户暂停的时间戳
+                userStepEntity.setUserPauseTimeStamp(TimeUtil.getNowTimeStamp());
+                //设置暂停次数
+                userStepEntity.setPauseCount(userStepEntity.getPauseCount() + 1);
+                //更新数据
+                StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
             }
+        }
 //        }
     }
@@ -8,6 +8,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.os.Handler;
 import android.os.SystemClock;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
@@ -53,6 +54,9 @@ import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
 import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.logic.Event;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -67,6 +71,7 @@ import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
+import com.cnlive.moudle.pedometer.upload.UploadLogic;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -80,8 +85,12 @@ import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.LineNumberReader;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -126,6 +135,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private UserStepEntity userStepEntity;
     private boolean isDifferentStreet = false;
     private LBSTraceClient mClient = null;
+    private List<LatLng> resultStreetPoints;
+    public List<LatLng> importStreetPoints;//运营打的重要的点
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -137,29 +148,78 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+
+//       new Handler().postDelayed(new Runnable() {
+//           @Override
+//           public void run() {
+//               baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
+//                   @Override
+//                   public void onSnapshotReady(Bitmap bitmap) {
+//                       SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+//                       if (null == bitmap) {
+//                           return;
+//                       }
+//                       QMUITipDialogUtil.loadingDialog(getContext(), "上传", false);
+//                       //开始保存截屏
+//                       try {
+//                           File image = new File(getContext().getExternalCacheDir() + "/location_screenshot_" + sdf.format(new Date()) + ".jpeg");
+//                           FileOutputStream fos = new FileOutputStream(image);
+//                           boolean b = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+//                           fos.flush();
+//                           fos.close();
+//                           List<String> imagePaths = new ArrayList<>();
+//                           imagePaths.add(image.getAbsolutePath());
+//                           Log.e(TAG, "onSnapshotReady: "+image.getAbsolutePath() );
+//
+//                           UploadLogic.uploadAddressPicInfo(getContext(), imagePaths, new Event<String>()
+//                                   .setFailureCallback(new FailureCallback() {
+//                                       @Override
+//                                       public void onFailure(int i, String s) {
+//                                           QMUITipDialogUtil.dismessDialog();
+//                                           Log.e(TAG, "onFailure: " + s);
+//                                       }
+//                                   })
+//                                   .setSuccessCallback(new SuccessCallback<String>() {
+//                                       @Override
+//                                       public void onSuccess(String data) {
+//                                           QMUITipDialogUtil.dismessDialog();
+//                                           Log.e(TAG, "onSuccess: " + data);
+//                                       }
+//                                   })
+//                           );
+//                       } catch (Exception e) {
+//                           e.printStackTrace();
+//                       }
+//                   }
+//               });
+//               //
+//           }
+//       },2000);
+
         if (fragment.getActivity() == null) {
             return;
         }
         this.runRaceDetailInfo = runRaceDetailInfo;
 //        //初始化地图点位
-//        if (runRaceDetailInfo.getLatLongitude() != null) {
-//            Log.e(TAG, "initView: 长度:" + runRaceDetailInfo.getLatLongitude().length());
-//            trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude().trim(), LatLng.class);
-//            Log.e(TAG, "initView: trackPoints" + trackPoints.size());
-//            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
-//            //自动计算地图缩放
-//            MapStatus.Builder builder = new MapStatus.Builder();
-//            builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
-//            builder.zoom(MyMapUtil.getZoom(trackPoints));
-//            baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-//        }
+        if (runRaceDetailInfo.getLatLongitude() != null) {
+            importStreetPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude().trim(), LatLng.class);
+            Log.e(TAG, "importStreetPoints点数量" + importStreetPoints.size());
+        }
         //轨迹开始时间
         long startTime = 0;
         //轨迹结束时间
         long endTime = 0;
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime())&&!TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
             startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
             endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
+            //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
+            //设置轨迹查询实体名称
+            CommonInfo.setQueryEntityName(getContext(), runRaceDetailInfo.getEntityName());
+            //设置轨迹查询开始时间
+            CommonInfo.setQueryTraceStartTime(getContext(), startTime);
+            //设置轨迹查询结束时间
+            CommonInfo.setQueryTraceEndTime(getContext(), endTime);
+
             mClient = new LBSTraceClient(getContext());
             //获取轨迹
             if (mClient != null) {
@@ -167,6 +227,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     @Override
                     public void success(List<LatLng> resultPoints) {
                         if (resultPoints != null && resultPoints.size() > 1) {
+                            resultStreetPoints = resultPoints;
                             Log.e(TAG, "resultPoints: " + resultPoints.size());
                             MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
 //                        //自动计算地图缩放
@@ -175,14 +236,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //                        builder.zoom(MyMapUtil.getZoom(resultPoints));
 //                        baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-                            LatLngBounds.Builder builder = new LatLngBounds.Builder();
-                            for (LatLng latLng : resultPoints) {
-                                builder.include(latLng);
-                            }
-                            MapStatusUpdate mapStatusUpdate = MapStatusUpdateFactory.newLatLngBounds(builder.build());
-                            baiduMap.setMapStatus(mapStatusUpdate);
-                            MapStatusUpdate msu = MapStatusUpdateFactory.zoomBy(-0.8f);
-                            baiduMap.setMapStatus(msu);
+                            //设置地图自动缩放
+                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
                         }
                     }
@@ -247,9 +302,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             }
         });
         /*************************设置相关页面数据***************************/
-
-        //设置围栏ID
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
+        if (runRaceDetailInfo.getFenceId() != null) {
+            //设置围栏ID
             CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
         }
         //设置标题
@@ -438,7 +492,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 }
                 //现在开始
                 else if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
-                    startStepService(getContext());
+                    //先判断是否从百度查询到赛事轨迹
+                    if (resultStreetPoints != null) {
+                        startStepService(getContext());
+                    } else {
+                        QMUITipDialogUtil.textDialog(getContext(), "正在获取轨迹请稍后...", 1);
+                    }
                 }
                 //继续运动
                 else if ("2".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
@@ -515,10 +574,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 stopStepService();
                 startStepService(getContext());
             } else {
-                PedometerMainActivity.startActivity(fragment.getActivity());
+                PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo.getStartLocation(), runRaceDetailInfo.getEndLocation(),importStreetPoints);
             }
         } else {
-            PedometerMainActivity.startActivity(fragment.getActivity());
+            PedometerMainActivity.startActivity(fragment.getActivity(), runRaceDetailInfo.getStartLocation(), runRaceDetailInfo.getEndLocation(),importStreetPoints);
         }
     }
@@ -540,6 +599,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
         }
+
         if (routePlanSearch == null) {
             routePlanSearch = RoutePlanSearch.newInstance();
         }
@@ -851,6 +911,20 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (mMapView != null) {
             mMapView.onResume();
         }
+        //todo 防止停止后,再次开始,无法获取到赛道的轨迹
+        if (runRaceDetailInfo != null) {
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
+                long startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
+                long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
+                //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
+                //设置轨迹查询实体名称
+                CommonInfo.setQueryEntityName(getContext(), runRaceDetailInfo.getEntityName());
+                //设置轨迹查询开始时间
+                CommonInfo.setQueryTraceStartTime(getContext(), startTime);
+                //设置轨迹查询结束时间
+                CommonInfo.setQueryTraceEndTime(getContext(), endTime);
+            }
+        }
     }
@@ -5,17 +5,31 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.UiSettings;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.trace.model.SortType;
 import com.bumptech.glide.Glide;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+
+import java.util.List;
 public class RunningFinishFragmentView implements MvpView {
     private final String TAG = "RunningFinishView";
     private RunningFinishFragment fragment;
+    public BaiduMap baiduMap;
+    private MapView mMapView;
+    private UiSettings mUiSettings;
     public RunningFinishFragmentView(RunningFinishFragment fragment) {
         this.fragment = fragment;
@@ -26,6 +40,8 @@ public class RunningFinishFragmentView implements MvpView {
     }
     public void initView(RunningFinishBean runningFinishBean) {
+        this.mMapView = fragment.binding.mapView;
+        initMap();
         //设置用户头像
         String faceUrl = CommonInfo.getUserIcon(getContext());
         if (!TextUtils.isEmpty(faceUrl)) {
@@ -70,5 +86,65 @@ public class RunningFinishFragmentView implements MvpView {
                 fragment.getActivity().finish();
             }
         });
+        //完成按钮
+        fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                    if (fragment.getActivity() != null) {
+                        fragment.getActivity().finish();
+                    }
+                }
+            }
+        });
+    }
+
+    public void initMap() {
+        if (baiduMap == null) {
+            baiduMap = mMapView.getMap();
+        }
+        if (mUiSettings == null) {
+            mUiSettings = baiduMap.getUiSettings();
+        }
+        //启动所有手势
+        mUiSettings.setAllGesturesEnabled(true);
+        //通过设置enable为true或false 选择是否显示缩放按钮
+        mMapView.showZoomControls(false);
+        mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
+        //隐藏自带的指南针，改用自定义指南针 杨帅
+        mUiSettings.setCompassEnabled(false);
+        //显示定位图层
+        baiduMap.setMyLocationEnabled(false);
+    }
+
+    public void drawServerStreetTrace(List<LatLng> trackPoints) {
+        if (getContext() == null) {
+            return;
+        }
+        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
+        //设置地图自动缩放
+        MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
+    }
+
+    public void updataIsFinish(RunningFinishBean runningFinishBean) {
+        if (getContext() == null || runningFinishBean == null) {
+            return;
+        }
+        //显示提示框
+        QMUITipDialogUtil.messageDialog(getContext(), "成绩已上传", 2);
+        //改变提示文字
+        fragment.binding.tvRunNow.setText("完成");
+        fragment.binding.rlScrollViewStartBtn.setTag("1");
+        fragment.binding.loading.setVisibility(View.GONE);
+        //设置是否完成
+        if ("1".equals(runningFinishBean.getIsFinish())) {
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.green_round));
+        } else {
+            fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线未完成");
+            fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.red));
+        }
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED);
+
     }
 }
@@ -23,6 +23,7 @@ import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BitmapDescriptor;
 import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.map.MarkerOptions;
@@ -31,6 +32,7 @@ import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.model.LatLngBounds;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
@@ -71,7 +73,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     public MyLocationListenner myListener = new MyLocationListenner();
     private final int DEFULT_ZOOM = 17;
     private boolean isFirstLoadMap = true;
-    private List<LatLng> trackPoints;
     private Overlay currentLine;
     private List<LatLng> currentPoints;
@@ -83,9 +84,8 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void initView(List<LatLng> trackPoints) {
+    public void initView() {
         currentPoints = new ArrayList<>();
-        this.trackPoints = trackPoints;
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
             baiduMap = mMapView.getMap();
@@ -156,24 +156,6 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
         baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() {
             @Override
             public void onMapLoaded() {
-                //自动计算地图缩放
-                MapStatus.Builder builder = new MapStatus.Builder();
-                builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
-                builder.zoom(MyMapUtil.getZoom(trackPoints));
-                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-                if (isFirstLoadMap) {
-                    isFirstLoadMap = false;
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            //绘制赛道轨迹
-                            if (getContext() == null) {
-                                return;
-                            }
-                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
-                        }
-                    }, 1500);
-                }
             }
         });
         //返回键
@@ -218,6 +200,15 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
+    public void drawServerStreetTrace(List<LatLng> trackPoints) {
+        if (getContext() == null) {
+            return;
+        }
+        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_50, R.drawable.icon_start, R.drawable.icon_end);
+        //设置地图自动缩放
+        MyMapUtil.setMapAutoZoom(baiduMap, trackPoints, -1.5f);
+    }
+
     /**
      * //设置定位监听器，获取到用户当前位置 杨帅
@@ -429,7 +420,9 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                         // 此处设置开发者获取到的方向信息，顺时针0-360
                         .direction(mCurrentDirection).latitude(mylocation.latitude)
                         .longitude(mylocation.longitude).build();
-                baiduMap.setMyLocationData(mylocation);
+                if (baiduMap != null) {
+                    baiduMap.setMyLocationData(mylocation);
+                }
             }
         }
         lastX = x;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.pedometer.model;
 public class Constant {
     public static final long SERVICE_ID = 213511;
     public static final int TAG = 1;
-    public static final int GATHER_INTERVAL = 3;//位置采集周期
+    public static final int GATHER_INTERVAL =2;//位置采集周期
     public static final int PACK_INTERVAL = 10;//位置采集周期
     public static final int SERVICE_STEP_COUNT_UPDATE = 0;//步数更新
@@ -17,8 +17,25 @@ public class RunningFinishBean implements Serializable {
     private String endPoint;
     private String date;
     private List<String> latList;
+    private String employTime;
+    private String isFinish;
+    private String roadmap;
+    public String getRoadmap() {
+        return roadmap;
+    }
+
+    public void setRoadmap(String roadmap) {
+        this.roadmap = roadmap;
+    }
+    public String getIsFinish() {
+        return isFinish;
+    }
+
+    public void setIsFinish(String isFinish) {
+        this.isFinish = isFinish;
+    }
     public String getRunDistance() {
         return runDistance;
@@ -75,4 +92,20 @@ public class RunningFinishBean implements Serializable {
     public void setDate(String date) {
         this.date = date;
     }
+
+    public List<String> getLatList() {
+        return latList;
+    }
+
+    public void setLatList(List<String> latList) {
+        this.latList = latList;
+    }
+
+    public String getEmployTime() {
+        return employTime;
+    }
+
+    public void setEmployTime(String employTime) {
+        this.employTime = employTime;
+    }
 }
@@ -67,6 +67,13 @@ public interface ApiServiceRunLin {
     Observable<Result<BaseInfo<SelfRecordInfo>>> getSelfRecordInfo(@QueryMap() Map<String, String> maps);
     /**
+     * 保存个人约跑路线记录
+     */
+    @POST("Daren/event/routeRecord.action")
+    Observable<Result<BaseInfo>> saveRouteData(@QueryMap() Map<String, String> maps);
+
+
+    /**
      * 踩点轨迹列表
      */
     @POST("Daren/event/getShoeLineList.action")
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.net;
 import android.content.Context;
 import okhttp3.Interceptor;
+
 import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.data.network.ApiBuild;
@@ -11,6 +12,7 @@ import com.cnlive.libs.data.network.interceptor.NetPPEncryptInterceptor;
 import com.cnlive.libs.data.network.interceptor.NetPPPayEncryptInterceptor;
 import com.cnlive.libs.data.network.interceptor.SignEncryptInterceptor;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceOpen;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -21,17 +23,19 @@ import static com.cnlive.libs.base.logic.Config.SUCCESS;
 /**
  * Created by Lynn on 2019/3/27.
+ * modify by ShinnyYang
  */
 public class SubscriptionRequest<Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo> {
     private static final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com:8768/";
     private static final String SP_CMS_URL = "http://cms.cnlive.com:8768/";
-
+    private static final int OKHTTP_KEEP_ALIVE_DURATION_SECONDS = 10;
+    //OPEN API 接口域名
+    private static final String OPEN_URL = "https://api.cnlive.com/";
     //网++ 接口域名
     public static final String SP_BASE_URL = "https://apiwjj.cnlive.com/";
     //网++ 测试环境 接口域名
     public static final String SP_DEBUG_URL = "http://apiwjjtest.cnlive.com/";
     //OPEN API 接口域名
-    private static final String SP_OPEN_URL = "https://api.cnlive.com/";
     private Observable observable;
     private static <T> String baseCMSEndpoint() {
@@ -43,7 +47,11 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
     }
     private static <T> String serviceEndpoint(Class<T> clazz) {
-        return baseEndpoint();
+        if (clazz == ApiServiceOpen.class) {
+            return OPEN_URL;
+        } else {
+            return baseEndpoint();
+        }
     }
     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
@@ -51,6 +59,21 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
         return service(clazz, api, new SignEncryptInterceptor());
     }
+    public static <Service> Service service(Class<Service> clazz) {
+        return service(clazz, new SignEncryptInterceptor());
+    }
+
+    private static <Service> Service service(Class<Service> clazz, Interceptor... interceptor) {
+        return service(clazz, false, interceptor);
+    }
+
+    private static <Service> Service service(Class<Service> clazz, boolean decode, Interceptor... interceptor) {
+        return ApiBuild.service(clazz, null)
+                .setEndpoint(serviceEndpoint(clazz))
+                .addInterceptor(interceptor)
+                .service(decode, OKHTTP_KEEP_ALIVE_DURATION_SECONDS);
+    }
+
     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
     SubscriptionRequest<Observable, BaseData> serviceEncrypt(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
         return service(clazz, api, new NetPPEncryptInterceptor());
@@ -78,13 +101,17 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
         Subscriber<BaseData> subscriber = new Subscriber<BaseData>(context) {
             @Override
             public void onCompleted(String s, String s1, BaseData data) {
-                if (callback == null) return;
+                if (callback == null) {
+                    return;
+                }
                 callback.callback(SUCCESS, "", data);
             }
             @Override
             public void onError(String code, String message) {
-                if (callback == null) return;
+                if (callback == null) {
+                    return;
+                }
                 int errorCode = -1;
                 try {
                     errorCode = Integer.valueOf(code);
@@ -101,5 +128,12 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
                 .subscribe(subscriber.next, subscriber.error, subscriber.complete, subscriber.subscribe);
     }
+    public static <Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
+    Disposable subscribe(Observable observable, Subscriber<BaseData> subscriber) {
+        return observable.take(1)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(subscriber.next, subscriber.error, subscriber.complete, subscriber.subscribe);
+    }
 }
+package com.cnlive.moudle.pedometer.net.bean.upload;
+
+/**
+ * Created by Lynn on 2018/9/4.
+ */
+
+public class FeedBackInfo {
+    private String imageUrl;
+    private long imageWidth;
+    private long imageHeight;
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public long getImageWidth() {
+        return imageWidth;
+    }
+
+    public void setImageWidth(long imageWidth) {
+        this.imageWidth = imageWidth;
+    }
+
+    public long getImageHeight() {
+        return imageHeight;
+    }
+
+    public void setImageHeight(long imageHeight) {
+        this.imageHeight = imageHeight;
+    }
+
+    @Override
+    public String toString() {
+        return "FeedBackInfo{" +
+                "imageUrl='" + imageUrl + '\'' +
+                ", imageWidth=" + imageWidth +
+                ", imageHeight=" + imageHeight +
+                '}';
+    }
+}
+package com.cnlive.moudle.pedometer.net.bean.upload;
+
+/**
+ * Created by cnlive201803 on 2018/5/31.
+ */
+
+public class StorageInfoData {
+    private int storageId;
+    private String storageName;
+    private int storageType;
+    private int state;
+    private int contentType;
+    private int profile;
+    private String domain;
+
+
+    public int getStorageId() {
+        return storageId;
+    }
+
+    public void setStorageId(int storageId) {
+        this.storageId = storageId;
+    }
+
+    public String getStorageName() {
+        return storageName;
+    }
+
+    public void setStorageName(String storageName) {
+        this.storageName = storageName;
+    }
+
+    public int getStorageType() {
+        return storageType;
+    }
+
+    public void setStorageType(int storageType) {
+        this.storageType = storageType;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(int contentType) {
+        this.contentType = contentType;
+    }
+
+    public int getProfile() {
+        return profile;
+    }
+
+    public void setProfile(int profile) {
+        this.profile = profile;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+}
+package com.cnlive.moudle.pedometer.net.bean.upload;
+
+/**
+ * Created by cnlive201803 on 2018/5/9.
+ */
+
+public class UploadAuthData {
+    private String Authorization;
+    private String Date;
+    private String token;
+
+    public String getAuthorization() {
+        return Authorization;
+    }
+
+    public void setAuthorization(String authorization) {
+        Authorization = authorization;
+    }
+
+    public String getDate() {
+        return Date;
+    }
+
+    public void setDate(String date) {
+        Date = date;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public String toString() {
+        return "UploadAuthData{" +
+                "Authorization='" + Authorization + '\'' +
+                ", Date='" + Date + '\'' +
+                ", token='" + token + '\'' +
+                '}';
+    }
+}
+package com.cnlive.moudle.pedometer.net.bean.upload.api;
+
+
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import retrofit2.adapter.rxjava2.Result;
+import retrofit2.http.FieldMap;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.Headers;
+import retrofit2.http.Multipart;
+import retrofit2.http.POST;
+import retrofit2.http.Part;
+import retrofit2.http.PartMap;
+import retrofit2.http.Path;
+import retrofit2.http.QueryMap;
+
+/**
+ * 达人有关的接口
+ */
+public interface ApiServiceMoment {
+
+    /**
+     * 上传发布内容(图片传七牛)
+     */
+    @POST("{user}")
+    Observable<Result<BaseInfo>> releaseMomentNe(@Path(value = "user", encoded = true) String path, @QueryMap Map<String, Object> maps);
+
+
+    /**
+     * 上传发布内容(不含图片)
+     */
+    @POST("{user}")
+    Observable<Result<BaseInfo>> releaseMomentText(@Path(value = "user", encoded = true) String path, @QueryMap() Map<String, String> maps);
+
+
+
+}
+
+package com.cnlive.moudle.pedometer.net.bean.upload.api;
+
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.StorageInfoData;
+import com.cnlive.moudle.pedometer.net.bean.upload.UploadAuthData;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.adapter.rxjava2.Result;
+import retrofit2.http.POST;
+import retrofit2.http.QueryMap;
+
+/**
+ * Created by xiansong on 2018/3/22.
+ */
+
+public interface ApiServiceOpen {
+
+
+    /**
+     * 上传鉴权
+     *
+     * @param maps
+     * @return
+     */
+    @POST("open/api2/vod_epg/getUploadAuthForApp")
+    Observable<Result<BaseInfo<UploadAuthData>>> getUploadAuthForApp(@QueryMap Map<String, String> maps);
+
+    /**
+     * 获取存储信息
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/storage/getStorageInfo")
+    Observable<Result<BaseInfo<List<StorageInfoData>>>> getStorageInfo(@QueryMap Map<String, String> map);
+
+}
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
@@ -19,6 +20,7 @@ import android.util.Log;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.receivers.ServiceReceiver;
+import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
@@ -209,9 +211,22 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
             channel.setLockscreenVisibility(NotificationCompat.VISIBILITY_PRIVATE);
             mNM.createNotificationChannel(channel);
         }
+//        notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
+//                .setWhen(System.currentTimeMillis())
+//                .setContentTitle(getApplicationContext().getString(R.string.app_name))
+//                .setContentText("正在计步,请勿关闭")
+//                .setSound(null)
+//                .build();
+        Intent notificationIntent = new Intent(this, PedometerMainActivity.class);
         notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
-                .setWhen(System.currentTimeMillis())
+                .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
+                .setSmallIcon(R.mipmap.ic_launcher)
+//                .setCustomContentView(remoteViews)
+                .setContentTitle(getResources().getString(R.string.app_name))
+                .setContentText("正在记录您的运动")
+                .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
+                .setWhen(System.currentTimeMillis())
                 .build();
         // 0 隐藏前台服务通知
         startForeground(100, notification);
@@ -221,11 +236,10 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (myReceiver != null) {
-            unregisterReceiver(myReceiver);
-        }
         try {
-//            stopForeground(true);
+            if (myReceiver != null) {
+                unregisterReceiver(myReceiver);
+            }
         } catch (Exception e) {
         }
         stopPlaySong();
@@ -28,8 +28,22 @@ import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
+import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
+import com.baidu.trace.api.fence.CreateFenceResponse;
+import com.baidu.trace.api.fence.DeleteFenceResponse;
+import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
 import com.baidu.trace.api.fence.FenceAlarmPushInfo;
+import com.baidu.trace.api.fence.FenceListResponse;
+import com.baidu.trace.api.fence.HistoryAlarmResponse;
+import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
 import com.baidu.trace.api.fence.MonitoredAction;
+import com.baidu.trace.api.fence.MonitoredStatus;
+import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
+import com.baidu.trace.api.fence.MonitoredStatusInfo;
+import com.baidu.trace.api.fence.MonitoredStatusRequest;
+import com.baidu.trace.api.fence.MonitoredStatusResponse;
+import com.baidu.trace.api.fence.OnFenceListener;
+import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.api.track.LatestPoint;
 import com.baidu.trace.api.track.LatestPointResponse;
 import com.baidu.trace.api.track.OnTrackListener;
@@ -55,7 +69,9 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 public class StepService extends Service implements SensorEventListener {
@@ -234,6 +250,25 @@ public class StepService extends Service implements SensorEventListener {
                             CommonInfo.setIsFirstStepSendTraceTip(getApplicationContext(), false);
                             EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_SUCCESS, ""));
                         }
+                        //设置用户开始时间以及赛事ID
+                        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+                        if (userStepEntity == null) {
+                            StepUtil.setStepStartData(getApplicationContext(), userId, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getApplicationContext()));
+                            //设置从服务器获取的时间(后续查询历史轨迹的时间,要从数据库中获取,因为涉及到现有运动恢复问题)
+                            StepUtil.setQueryTraceTime(getApplicationContext(), userId, CommonInfo.getQueryTraceStartTime(getApplicationContext()), CommonInfo.getQueryTraceEndTime(getApplicationContext()), CommonInfo.getQueryQueryEntityName(getApplicationContext()));
+                            int fenceId = CommonInfo.getFenceId(getApplicationContext());
+                            //设置围栏id
+                            StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
+                            //清空临时保存的时间
+                            CommonInfo.setQueryTraceEndTime(getApplicationContext(), 0);
+                            CommonInfo.setQueryTraceStartTime(getApplicationContext(), 0);
+                            CommonInfo.setQueryEntityName(getApplicationContext(), "");
+                            CommonInfo.setFenceId(getApplicationContext(), -1);
+                        }
+                        //开始设置围栏报警
+                        startQueryFence();
+
+
                     }
                 } else {
                     boolean isFirstSendNotification = CommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
@@ -327,16 +362,22 @@ public class StepService extends Service implements SensorEventListener {
                 if (null == alarmPushInfo) {
                     return;
                 }
-                //超出范围
-                if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
-                    EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
-                }
-                //进入范围
-                else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
-                    EventBus.getDefault().post(new MessageEvent(Constant.ENTER_RANGE, ""));
+                UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+                if (userStepEntity == null) {
+                    return;
                 }
-                Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
+                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId()) {
+                    //超出范围
+                    if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
+                        EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
+                    }
+                    //进入范围
+                    else if (alarmPushInfo.getMonitoredAction() == MonitoredAction.enter) {
+                        EventBus.getDefault().post(new MessageEvent(Constant.ENTER_RANGE, ""));
+                    }
+                    Toast.makeText(getApplicationContext(), "onPushCallback:" + alarmPushInfo.getMonitoredAction(), Toast.LENGTH_SHORT).show();
+                }
             }
             @Override
@@ -347,15 +388,122 @@ public class StepService extends Service implements SensorEventListener {
         //开启轨迹服务
         if (mClient != null) {
             mClient.startTrace(mTrace, traceListener);
-            //设置用户开始时间以及赛事ID
-            UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
-            if (userStepEntity == null) {
-                StepUtil.setStepStartData(getApplicationContext(), userId, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getApplicationContext()));
-            }
         }
     }
+    public void startQueryFence() {
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+        // 初始化围栏监听器
+        OnFenceListener onFenceListener = new OnFenceListener() {
+            // 创建围栏回调
+            @Override
+            public void onCreateFenceCallback(CreateFenceResponse createFenceResponse) {
+                if ("成功".equals(createFenceResponse.getMessage())) {
+//                    Toast.makeText(context, "创建围栏回调成功", Toast.LENGTH_SHORT).show();
+                    Log.e(TAG, "onCreateFenceCallback: " + createFenceResponse.getFenceId());
+                    // 查询围栏监控者状态
+                    List<Long> list = new ArrayList<>();
+                    list.add(createFenceResponse.getFenceId());
+                    // 创建查询服务端围栏监控状态请求
+
+                }
+            }
+
+            // 更新围栏回调
+            @Override
+            public void onUpdateFenceCallback(UpdateFenceResponse updateFenceResponse) {
+
+            }
+
+            // 删除围栏回调
+            @Override
+            public void onDeleteFenceCallback(DeleteFenceResponse deleteFenceResponse) {
+
+            }
+
+            // 围栏列表回调
+            @Override
+            public void onFenceListCallback(FenceListResponse fenceListResponse) {
+                if ("成功".equals(fenceListResponse.getMessage())) {
+//                    Toast.makeText(context, "围栏列表回调成功:" + fenceListResponse.getSize(), Toast.LENGTH_SHORT).show();
+                }
+            }
+
+            // 监控状态回调
+            @Override
+            public void onMonitoredStatusCallback(MonitoredStatusResponse monitoredStatusResponse) {
+                if (monitoredStatusResponse.getMonitoredStatusInfos() != null) {
+                    Toast.makeText(getApplicationContext(), "围栏列表回调成功:个数:" + monitoredStatusResponse.getMonitoredStatusInfos().size(), Toast.LENGTH_SHORT).show();
+                } //查询监控对象状态响应结果
+                List<MonitoredStatusInfo> monitoredStatusInfos = monitoredStatusResponse.getMonitoredStatusInfos();
+                if (monitoredStatusInfos == null) {
+                    return;
+                }
+                for (MonitoredStatusInfo monitoredStatusInfo : monitoredStatusInfos) {
+                    if (monitoredStatusInfo.getFenceId() == userStepEntity.getFenceId()) {
+                        MonitoredStatus status = monitoredStatusInfo.getMonitoredStatus();//获取状态
+                        switch (status) {
+                            case in:
+                                //监控的设备在围栏内
+                                Toast.makeText(getApplicationContext(), "监控的设备在围栏内", Toast.LENGTH_SHORT).show();
+                                Log.e(TAG, "监控的设备在围栏内: ");
+                                break;
+                            case out:
+                                //监控的设备在围栏外
+                                Toast.makeText(getApplicationContext(), "监控的设备在围栏外", Toast.LENGTH_SHORT).show();
+                                Log.e(TAG, "监控的设备在围栏外: ");
+
+                                break;
+                            case unknown:
+                                //监控的设备状态未知
+                                Toast.makeText(getApplicationContext(), "监控的设备状态未知", Toast.LENGTH_SHORT).show();
+                                Log.e(TAG, "监控的设备状态未知: ");
+
+                                break;
+                        }
+                    }
+                }
+            }
+
+            // 指定位置监控状态回调
+            @Override
+            public void onMonitoredStatusByLocationCallback(MonitoredStatusByLocationResponse monitoredStatusByLocationResponse) {
+                Log.e(TAG, "onMonitoredStatusByLocationCallback: ");
+            }
+
+            // 历史报警回调
+            @Override
+            public void onHistoryAlarmCallback(HistoryAlarmResponse historyAlarmResponse) {
+                Log.e(TAG, "onHistoryAlarmCallback: ");
+            }
+
+            @Override
+            public void onAddMonitoredPersonCallback(AddMonitoredPersonResponse addMonitoredPersonResponse) {
+                Log.e(TAG, "onAddMonitoredPersonCallback: ");
+            }
+
+            @Override
+            public void onDeleteMonitoredPersonCallback(DeleteMonitoredPersonResponse deleteMonitoredPersonResponse) {
+                Log.e(TAG, "onDeleteMonitoredPersonCallback: ");
+            }
+
+            @Override
+            public void onListMonitoredPersonCallback(ListMonitoredPersonResponse listMonitoredPersonResponse) {
+                Log.e(TAG, "onListMonitoredPersonCallback: ");
+            }
+        };
+        if (userStepEntity != null) {
+            List<Long> fenids = new ArrayList<>();
+            fenids.add(userStepEntity.getFenceId());
+            MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
+                    Constant.SERVICE_ID, userId, fenids);
+            if (mClient != null) {
+                mClient.queryMonitoredStatus(request1, onFenceListener);
+            }
+        }
+    }
+
     private long i = 0;
     private long index = 0;
     private int mJobId;
@@ -919,6 +1067,7 @@ public class StepService extends Service implements SensorEventListener {
         }
     }
+
     /**
      * 保存记步数据
      */
@@ -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;
+    }
+
 }
@@ -39,6 +39,12 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         public final static Property PauseCount = new Property(12, int.class, "pauseCount", false, "PAUSE_COUNT");
         public final static Property UserPauseTimeStamp = new Property(13, long.class, "userPauseTimeStamp", false, "USER_PAUSE_TIME_STAMP");
         public final static Property ChronometerBase = new Property(14, long.class, "chronometerBase", false, "CHRONOMETER_BASE");
+        public final static Property QueryTraceStartTime = new Property(15, long.class, "queryTraceStartTime", false, "QUERY_TRACE_START_TIME");
+        public final static Property QueryTraceEndTime = new Property(16, long.class, "queryTraceEndTime", false, "QUERY_TRACE_END_TIME");
+        public final static Property QueryEntityName = new Property(17, String.class, "queryEntityName", false, "QUERY_ENTITY_NAME");
+        public final static Property ContinueTime = new Property(18, long.class, "continueTime", false, "CONTINUE_TIME");
+        public final static Property FenceId = new Property(19, long.class, "fenceId", false, "FENCE_ID");
+        public final static Property ImportPoint = new Property(20, String.class, "importPoint", false, "IMPORT_POINT");
     }
@@ -68,7 +74,13 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
                 "\"STREET_ID\" TEXT," + // 11: streetId
                 "\"PAUSE_COUNT\" INTEGER NOT NULL ," + // 12: pauseCount
                 "\"USER_PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 13: userPauseTimeStamp
-                "\"CHRONOMETER_BASE\" INTEGER NOT NULL );"); // 14: chronometerBase
+                "\"CHRONOMETER_BASE\" INTEGER NOT NULL ," + // 14: chronometerBase
+                "\"QUERY_TRACE_START_TIME\" INTEGER NOT NULL ," + // 15: queryTraceStartTime
+                "\"QUERY_TRACE_END_TIME\" INTEGER NOT NULL ," + // 16: queryTraceEndTime
+                "\"QUERY_ENTITY_NAME\" TEXT," + // 17: queryEntityName
+                "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 18: continueTime
+                "\"FENCE_ID\" INTEGER NOT NULL ," + // 19: fenceId
+                "\"IMPORT_POINT\" TEXT);"); // 20: importPoint
     }
     /** Drops the underlying database table. */
@@ -123,6 +135,20 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         stmt.bindLong(13, entity.getPauseCount());
         stmt.bindLong(14, entity.getUserPauseTimeStamp());
         stmt.bindLong(15, entity.getChronometerBase());
+        stmt.bindLong(16, entity.getQueryTraceStartTime());
+        stmt.bindLong(17, entity.getQueryTraceEndTime());
+ 
+        String queryEntityName = entity.getQueryEntityName();
+        if (queryEntityName != null) {
+            stmt.bindString(18, queryEntityName);
+        }
+        stmt.bindLong(19, entity.getContinueTime());
+        stmt.bindLong(20, entity.getFenceId());
+ 
+        String importPoint = entity.getImportPoint();
+        if (importPoint != null) {
+            stmt.bindString(21, importPoint);
+        }
     }
     @Override
@@ -171,6 +197,20 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         stmt.bindLong(13, entity.getPauseCount());
         stmt.bindLong(14, entity.getUserPauseTimeStamp());
         stmt.bindLong(15, entity.getChronometerBase());
+        stmt.bindLong(16, entity.getQueryTraceStartTime());
+        stmt.bindLong(17, entity.getQueryTraceEndTime());
+ 
+        String queryEntityName = entity.getQueryEntityName();
+        if (queryEntityName != null) {
+            stmt.bindString(18, queryEntityName);
+        }
+        stmt.bindLong(19, entity.getContinueTime());
+        stmt.bindLong(20, entity.getFenceId());
+ 
+        String importPoint = entity.getImportPoint();
+        if (importPoint != null) {
+            stmt.bindString(21, importPoint);
+        }
     }
     @Override
@@ -195,7 +235,13 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
             cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // streetId
             cursor.getInt(offset + 12), // pauseCount
             cursor.getLong(offset + 13), // userPauseTimeStamp
-            cursor.getLong(offset + 14) // chronometerBase
+            cursor.getLong(offset + 14), // chronometerBase
+            cursor.getLong(offset + 15), // queryTraceStartTime
+            cursor.getLong(offset + 16), // queryTraceEndTime
+            cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // queryEntityName
+            cursor.getLong(offset + 18), // continueTime
+            cursor.getLong(offset + 19), // fenceId
+            cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20) // importPoint
         );
         return entity;
     }
@@ -217,6 +263,12 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         entity.setPauseCount(cursor.getInt(offset + 12));
         entity.setUserPauseTimeStamp(cursor.getLong(offset + 13));
         entity.setChronometerBase(cursor.getLong(offset + 14));
+        entity.setQueryTraceStartTime(cursor.getLong(offset + 15));
+        entity.setQueryTraceEndTime(cursor.getLong(offset + 16));
+        entity.setQueryEntityName(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17));
+        entity.setContinueTime(cursor.getLong(offset + 18));
+        entity.setFenceId(cursor.getLong(offset + 19));
+        entity.setImportPoint(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
      }
     @Override
+package com.cnlive.moudle.pedometer.sql.entity;
+
+/**
+ * 上传失败列表
+ *
+ * @author ShinnyYang
+ */
+public class FailedEntity {
+    private String uuid;//主键
+    private String uid;//用户id
+    private String streetTitle;//赛道标题
+    private boolean isPause;//是否暂停
+    private String isFinish;//是否完成
+    private String time;//用时
+    private String speed;//配速
+    private String step;//步数
+    private String startPoint;//开始地点
+    private String endPoint;//结束地点
+    private long streetTraceStartTime;//赛道开始时间
+    private long streetTraceEndTime;//赛道结束时间
+    private String entityName;//实体名称
+    private long userStartTime;//用户开始时间
+    private long userEndTime;//用户结束时间
+    private String importPoint;//关键点
+    private String streetId;//赛事id
+
+}
@@ -22,11 +22,18 @@ public class UserStepEntity {
     private int pauseCount;//暂停次数
     private long userPauseTimeStamp;//暂停时间戳
     private long chronometerBase;//计时器设置基础时间
+    private long queryTraceStartTime;//从服务器获取的开始时间呢
+    private long queryTraceEndTime;//从服务器获取的结束时间呢
+    private String queryEntityName;//从服务器获取的运营人员的实体名称
+    private long continueTime;//继续运动时间
+    private long fenceId;//围栏id
+    private String importPoint;//关键点
-    @Generated(hash = 562353866)
+
+    @Generated(hash = 24427970)
     public UserStepEntity(String userId, String date, String stepCount, long pauseTimeStamp, long recordTime, double caloriesCount, String serverTraceData,
             String startPoint, String endPoint, long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp,
-            long chronometerBase) {
+            long chronometerBase, long queryTraceStartTime, long queryTraceEndTime, String queryEntityName, long continueTime, long fenceId, String importPoint) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -42,6 +49,12 @@ public class UserStepEntity {
         this.pauseCount = pauseCount;
         this.userPauseTimeStamp = userPauseTimeStamp;
         this.chronometerBase = chronometerBase;
+        this.queryTraceStartTime = queryTraceStartTime;
+        this.queryTraceEndTime = queryTraceEndTime;
+        this.queryEntityName = queryEntityName;
+        this.continueTime = continueTime;
+        this.fenceId = fenceId;
+        this.importPoint = importPoint;
     }
     @Generated(hash = 273857141)
@@ -168,5 +181,53 @@ public class UserStepEntity {
         this.chronometerBase = chronometerBase;
     }
+    public long getQueryTraceStartTime() {
+        return this.queryTraceStartTime;
+    }
+
+    public void setQueryTraceStartTime(long queryTraceStartTime) {
+        this.queryTraceStartTime = queryTraceStartTime;
+    }
+
+    public long getQueryTraceEndTime() {
+        return this.queryTraceEndTime;
+    }
+
+    public void setQueryTraceEndTime(long queryTraceEndTime) {
+        this.queryTraceEndTime = queryTraceEndTime;
+    }
+
+    public String getQueryEntityName() {
+        return this.queryEntityName;
+    }
+
+    public void setQueryEntityName(String queryEntityName) {
+        this.queryEntityName = queryEntityName;
+    }
+
+    public long getContinueTime() {
+        return this.continueTime;
+    }
+
+    public void setContinueTime(long continueTime) {
+        this.continueTime = continueTime;
+    }
+
+    public long getFenceId() {
+        return this.fenceId;
+    }
+
+    public void setFenceId(long fenceId) {
+        this.fenceId = fenceId;
+    }
+
+    public String getImportPoint() {
+        return this.importPoint;
+    }
+
+    public void setImportPoint(String importPoint) {
+        this.importPoint = importPoint;
+    }
+
 }
@@ -13,6 +13,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.Toast;
@@ -20,6 +21,7 @@ import android.widget.Toast;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
+import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -32,6 +34,9 @@ import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
+import java.io.Serializable;
+import java.util.List;
+
 import static android.app.Notification.EXTRA_CHANNEL_ID;
 import static android.provider.Settings.EXTRA_APP_PACKAGE;
@@ -40,12 +45,15 @@ import static android.provider.Settings.EXTRA_APP_PACKAGE;
  */
 @Route(path = "/moudle_pedometer/InterestActivity")
 public class PedometerMainActivity extends QMUIFragmentActivity {
-    private static final String TAG = "CollPedometerMainActivity";
+    private static final String TAG = "PedometerMainActivity";
     private NotificationManagerCompat notificationManagerCompat;
     private boolean isOpen;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
     private RunMainFragment fragment;
+    private String startPointAdd;
+    private String endPointAdd;
+    private List<LatLng> importStreetPoints;
     @Override
     protected int getContextViewId() {
@@ -55,8 +63,9 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        setContentView(R.layout.activity_pedometer_main);
-
+        startPointAdd = getIntent().getExtras().getString("startPointAdd");
+        endPointAdd = getIntent().getExtras().getString("endPointAdd");
+        importStreetPoints = (List<LatLng>) getIntent().getExtras().getSerializable("importStreetPoints");
     }
@@ -119,31 +128,13 @@ public class PedometerMainActivity 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();
-//
         getPermissionsWithTip();
     }
-    private void addFragment() {
-        fragment = new RunMainFragment();
+    private void addFragment(String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
+        fragment = RunMainFragment.newInstance(startPointAdd, endPointAdd, importStreetPoints);
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
@@ -174,7 +165,9 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
                             Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
                         } else {
                             if (getCurrentFragment() == null) {
-                                addFragment();
+                                if (!TextUtils.isEmpty(startPointAdd) && !TextUtils.isEmpty(endPointAdd) && importStreetPoints != null) {
+                                    addFragment(startPointAdd, endPointAdd, importStreetPoints);
+                                }
                             }
                         }
                     }
@@ -220,8 +213,11 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
         return;
     }
-    public static void startActivity(Activity activity) {
+    public static void startActivity(Activity activity, String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
         Intent intent = new Intent(activity, PedometerMainActivity.class);
+        intent.putExtra("startPointAdd", startPointAdd);
+        intent.putExtra("endPointAdd", endPointAdd);
+        intent.putExtra("importStreetPoints", (Serializable) importStreetPoints);
         activity.startActivity(intent);
     }
 }
 package com.cnlive.moudle.pedometer.ui.activity;
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.BottomSheetDialog;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.Toast;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.mapapi.CoordType;
@@ -23,7 +29,10 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
+import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
 import java.util.ArrayList;
@@ -37,14 +46,15 @@ import java.util.List;
 @Route(path = "/moudle_pedometer/CollRunRaceDetailActivity")
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
+    private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
-    public static void startActivity(Activity activity, String eventId,String userId,String userIcon,String userName,String userPhone) {
+    public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName, String userPhone) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
         intent.putExtra("eventId", eventId);
-        intent.putExtra("userId",userId);
-        intent.putExtra("userIcon",userIcon);
-        intent.putExtra("userName",userName);
-        intent.putExtra("userPhone",userPhone);
+        intent.putExtra("userId", userId);
+        intent.putExtra("userIcon", userIcon);
+        intent.putExtra("userName", userName);
+        intent.putExtra("userPhone", userPhone);
         CommonInfo.setStreetId(activity, eventId);
         activity.startActivity(intent);
     }
@@ -58,25 +68,29 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if(getIntent().getStringExtra("userId") != null){
-            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
-            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
-            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
-            CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
+        if (getIntent().getStringExtra("userId") != null) {
+            CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
         }
         //判断用户是否结束运动
 //        boolean isRunStep = CommonInfo.getIsRunStepService(this);
 //        //没有找到相关记录
 //        if (!isRunStep) {
-            fragment = new RunRaceDetailFragment();
+        fragment = new RunRaceDetailFragment();
 //        }
 //        //找到记录
 //        else {
 //            fragment = new RunMainFragment();
 //        }
-        if (fragment != null) {
-            addFragment(fragment);
-        }
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        getPermissionsWithTip();
     }
     private void addFragment(QMUIFragment fragment) {
@@ -89,10 +103,72 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if (getCurrentFragment()!=null) {
+        if (getCurrentFragment() != null) {
             if (getCurrentFragment() instanceof RunMainFragment) {
                 return;
             }
         }
     }
+
+    /**
+     * 一次申请一组权限（使用拒绝弹框）点击事件
+     */
+    public void getPermissionsWithTip() {
+        mPermissionsUtils
+                .setPermissionsListener(new PermissionsListener() {
+                    @Override
+                    public void onDenied(String[] deniedPermissions) {
+                        getPermissionsWithTip();
+                    }
+
+                    @Override
+                    public void onGranted() {
+                        //判断GPS是否开启
+                        if (!MyMapUtil.isOPenGps(getApplicationContext())) {
+                            //开启GPS
+                            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                            startActivityForResult(intent, 10);
+                            Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
+                        } else {
+                            if (getCurrentFragment() == null) {
+                                if (fragment != null) {
+                                    addFragment(fragment);
+                                }
+                            }
+                        }
+                    }
+                })
+                .withActivity(RunRaceDetailActivity.this)
+                .getPermissions(RunRaceDetailActivity.this
+                        , 100
+                        , Manifest.permission.INTERNET
+                        , Manifest.permission.READ_EXTERNAL_STORAGE
+                        , Manifest.permission.WRITE_EXTERNAL_STORAGE
+                        , Manifest.permission.ACCESS_FINE_LOCATION
+                        , Manifest.permission.ACCESS_COARSE_LOCATION
+                );
+//                .getPermissionsWithTips(MainActivity.this
+//                        ,100
+//                        , new String[]{"人家要录音","我们需要读取你的信息，磨磨唧唧的","我要上网","我要读内存卡","我要看日历","我要定位"}
+//                        , Manifest.permission.RECORD_AUDIO
+//                        , Manifest.permission.READ_SMS
+//                        , Manifest.permission.INTERNET
+//                        , Manifest.permission.READ_EXTERNAL_STORAGE
+//                        , Manifest.permission.READ_CALENDAR
+//                        , Manifest.permission.ACCESS_FINE_LOCATION);
+    }
+
+    /**
+     * 权限回调
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
+    }
 }
@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
@@ -16,6 +17,7 @@ import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
 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.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunMainBinding;
@@ -25,9 +27,25 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import java.io.Serializable;
+import java.util.List;
+
 public class RunMainFragment extends QMUIFragment<RunMainFragmentView, RunMainFragmentPresenter, FragmentRunMainBinding> {
     private final String TAG = "CollRunMainFragment";
     private String userId = "yangshuai";
+    private String startPointAdd;
+    private String endPointAdd;
+    private List<LatLng> importStreetPoints;
+
+    public static RunMainFragment newInstance(String startPointAdd, String endPointAdd, List<LatLng> importStreetPoints) {
+        Bundle bundle = new Bundle();
+        bundle.putString("startPointAdd", startPointAdd);
+        bundle.putString("endPointAdd", endPointAdd);
+        bundle.putSerializable("importStreetPoints", (Serializable) importStreetPoints);
+        RunMainFragment fragment = new RunMainFragment();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
@@ -35,6 +53,26 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         QMUIStatusBarHelper.setStatusBarDarkMode(getActivity());
         StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
         EventBus.getDefault().register(this);
+        if (getArguments() != null) {
+            startPointAdd = getArguments().getString("startPointAdd");
+            endPointAdd = getArguments().getString("endPointAdd");
+            importStreetPoints = (List<LatLng>) getArguments().getSerializable("importStreetPoints");
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
+            if (userStepEntity != null) {
+                if (!TextUtils.isEmpty(startPointAdd) && !TextUtils.isEmpty(endPointAdd)) {
+                    userStepEntity.setStartPoint(startPointAdd);
+                    userStepEntity.setEndPoint(endPointAdd);
+                    //更新数据
+                    StepUtil.updateStepData(getActivity(), userStepEntity);
+                }
+                //获取数据库中的重要点
+                String importStr = userStepEntity.getImportPoint();
+                if (TextUtils.isEmpty(importStr) && importStreetPoints != null) {
+                    //设置重要点
+                    StepUtil.setImportPoints(getActivity(), CommonInfo.getUserId(getActivity()), GsonUtil.GsonString(importStreetPoints));
+                }
+            }
+        }
         if (getMvpView() != null) {
             new Handler().postDelayed(new Runnable() {
                 @Override
@@ -3,31 +3,20 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.widget.FrameLayout;
-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;
 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
@@ -37,8 +26,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import java.util.ArrayList;
-import java.util.List;
 import static android.content.Context.SENSOR_SERVICE;
@@ -48,7 +35,7 @@ import static android.content.Context.SENSOR_SERVICE;
  * @author ShinnyYang
  */
 public class RunRaceDetailFragment extends QMUIFragment<RunRaceDetailFragmentView, RunRaceDetailFragmentPresenter, FragmentRunRaceDetailBinding> {
-    private static final String TAG = "CollRunRaceDetailFragment";
+    private static final String TAG = "RunRaceFragment";
     private SensorManager mSensorManager;
     @Override
@@ -78,8 +65,9 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
             getMvpView().initMap();
         }
         if (getPresenter() != null) {
-            if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity())))
+            if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
                 getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
+            }
         }
     }
@@ -189,8 +177,9 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         //启动鹰眼成功
         if (messageEvent.getMessageType() == Constant.START_TRACE_GATHER_SUCCESS) {
             if (getMvpView() != null) {
+                Log.e(TAG, "跳转: " + getMvpView().importStreetPoints.size());
                 QMUITipDialogUtil.dismessDialog();
-                PedometerMainActivity.startActivity(getActivity());
+                PedometerMainActivity.startActivity(getActivity(), binding.includeStreet.tvStartAddr.getText().toString(), binding.includeStreet.tvEndAddr.getText().toString(), getMvpView().importStreetPoints);
             }
         }
         //启动鹰眼失败
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.view.View;
@@ -9,6 +10,8 @@ import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
@@ -45,9 +48,6 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        StepUtil.clearRunData(getActivity(), CommonInfo.getUserId(getActivity()));
-        //todo测试用
-        CommonInfo.reset(getActivity());
         if (getArguments() != null) {
             runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
             if (runningFinishBean != null) {
@@ -56,6 +56,20 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
                 }
             }
         }
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
+        if (getMvpView() != null && userStepEntity != null) {
+            QMUITipDialogUtil.loadingDialog(getContext(), "正在获取轨迹信息,请稍后", false);
+            getPresenter().getServerStreetTrace(getActivity(), userStepEntity);
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    getPresenter().queryHistoryTrace(getActivity(), userStepEntity, runningFinishBean);
+                }
+            },2000);
+//             StepUtil.clearRunData(context, CommonInfo.getUserId(context));
+//                    CommonInfo.reset(context);
+        }
+
     }
     /**
@@ -23,11 +23,13 @@ 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.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunningMapBinding;
@@ -47,7 +49,7 @@ import static android.content.Context.SENSOR_SERVICE;
  * @author ShinnyYang
  */
 public class RunningMapFragment extends QMUIFragment<RunningMapFragmentView, RunningMapFragmentPresenter, FragmentRunningMapBinding> {
-    private static final String TAG = "CollRunningMapFragment";
+    private static final String TAG = "RunningMapFragment";
     private RunningMapBean runningMapBean;
     private SensorManager mSensorManager;
     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}]";
@@ -96,45 +98,33 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         mVibrator = (Vibrator) getActivity().getSystemService(Service.VIBRATOR_SERVICE);
         //初始化提示框
         initTipDialog();
-        List<LatLng> trackPoints = GsonUtil.jsonToList(test, LatLng.class);
-
+        getMvpView().initView();
         if (getArguments() != null) {
             runningMapBean = (RunningMapBean) getArguments().getSerializable("runningMapBean");
         }
-        if (getMvpView() != null) {
-            getMvpView().initView(trackPoints);
-            if (runningMapBean != null) {
-                getMvpView().updateChronometer(runningMapBean);
-            }
+        if (runningMapBean != null) {
+            getMvpView().updateChronometer(runningMapBean);
         }
-        //开始进行历史轨迹查询
-        if (getPresenter() != null && !TextUtils.isEmpty(StepService.entityName)) {
-            long stepStartTime = 0;
-//                    CommonInfo.getStepStartTime(getActivity());
-            Log.e(TAG, "onViewCreated: 时间"+stepStartTime );
-            long startTime = 0;
-//            if (stepStartTime != 0) {
-//                startTime = stepStartTime;
-//            } else {
-                startTime = (int) (System.currentTimeMillis() / 1000 -12);
-//            }
-            long current = TimeUtil.getNowTimeStamp();
-//            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);
+        UserStepEntity userStepEntity = StepUtil.getUserStepData(getActivity(), CommonInfo.getUserId(getActivity()));
+        if (getMvpView() != null && userStepEntity != null) {
+            //查询运营人员踩得轨迹
+            getPresenter().getServerStreetTrace(getActivity(), userStepEntity);
+
+            //开始查询
+            getPresenter().queryHistoryTrace(getActivity(), userStepEntity);
         }
-        List<com.baidu.trace.model.LatLng> fenceLatLngs = new ArrayList<>();
-        for (LatLng latLng : trackPoints) {
-            com.baidu.trace.model.LatLng tempLatLng = new com.baidu.trace.model.LatLng(latLng.latitude, latLng.longitude);
-            fenceLatLngs.add(tempLatLng);
-        }
+//        List<com.baidu.trace.model.LatLng> fenceLatLngs = new ArrayList<>();
+//        for (LatLng latLng : trackPoints) {
+//            com.baidu.trace.model.LatLng tempLatLng = new com.baidu.trace.model.LatLng(latLng.latitude, latLng.longitude);
+//            fenceLatLngs.add(tempLatLng);
+//        }
 //        getPresenter().createFence(getActivity(), fenceLatLngs);
     }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -232,6 +222,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             tipDialog.setCanceledOnTouchOutside(false);
         }
     }
+
     /**
      * 屏蔽边缘返回
      * 杨帅
+package com.cnlive.moudle.pedometer.upload;
+
+import android.content.Context;
+import android.media.MediaMetadataRetriever;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.libs.base.logic.Config;
+import com.cnlive.libs.base.logic.Event;
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.util.ShareReleaseInfoUtil;
+import com.cnlive.libs.base.util.StringUtils;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.FeedBackInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.StorageInfoData;
+import com.cnlive.moudle.pedometer.net.bean.upload.UploadAuthData;
+import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceMoment;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.cnlive.libs.base.logic.Config.ERROR_DEF;
+
+/**
+ * Created by xiansong on 2018/2/6.
+ */
+
+public class UploadLogic {
+    private static final String TEST_OBJECT_KEY = "802/wjj/video/%s/%s/%s.%s";
+    private static final String RELEASE_OBJECT_KEY = "769/wjj/video/%s/%s/%s.%s";
+    private static final String TEST_OBJECT_PIC__KEY = "802/img/%s/%s.%s";
+    private static final String RELEASE_OBJECT_PIC__KEY = "769/img/%s/%s.%s";
+    private static final String TEST_SEVEN = "http://wjjtest.ys2.cnliveimg.com/";
+    private static final String RELEASE_SEVEN = "https://wjj.ys2.cnliveimg.com/";
+    private static final String SEVEN = AppConfig.isDebug() ? TEST_SEVEN : RELEASE_SEVEN;
+    private static final String OBJECT_KEY = AppConfig.isDebug() ? TEST_OBJECT_KEY : RELEASE_OBJECT_KEY;
+    private static final String OBJECT_PIC_KEY = AppConfig.isDebug() ? TEST_OBJECT_PIC__KEY : RELEASE_OBJECT_PIC__KEY;
+    private static final String TEST_VIDEO_NAME = "802_%s_%s_%s_%s";
+    private static final String RELEASE_VIDEO_NAME = "769_%s_%s_%s_%s";
+    private static final String VIDEO_NAME = AppConfig.isDebug() ? TEST_VIDEO_NAME : RELEASE_VIDEO_NAME;
+    private static final String TAG = "UploadLogic";
+    private static String src;
+
+
+    private static String isHorizontalScreen(String videoPath) {
+        if (TextUtils.isEmpty(videoPath)) {
+            return "0";
+        }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            MediaMetadataRetriever retr = new MediaMetadataRetriever();
+            retr.setDataSource(videoPath);
+            String r = retr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
+            if (TextUtils.isEmpty(r)) {
+                return "0";
+            }
+            return (r.equals("90") || r.equals("270")) ? "0" : "1";
+        }
+        return "0";
+    }
+
+    /*public static void uploadVideoInfo(Context context, String userId, String text, String address, String videoPath, Event<BaseInfo> event,int gotype) {
+        uploadVideoInfo(context, userId, text, address, videoPath, event,gotype);
+    }*/
+
+
+    public static void uploadPicInfo(Context context, String userId, String text, String address, List<String> picPath, ArrayList width, ArrayList height, Event<BaseInfo> event, String gopath, String videotype) {
+
+        uploadPicInfo(context, userId, "moment", text, address, picPath, width, height, event, gopath, videotype);
+    }
+
+    /**
+     * 文件上传到七牛(webview 帮助反馈在用)
+     *
+     * @param context
+     * @param picPath
+     * @param width
+     * @param height
+     * @param event
+     */
+    public static void uploadPic(Context context, boolean isZip, List<String> picPath, ArrayList width, ArrayList height, Event<List<FeedBackInfo>> event) {
+        Logic.create()
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
+                )
+                .action((BaseInfo<UploadAuthData> data, DataCallback<Map<String, Object>> callback) ->
+                        isZip ? UploadProvider.zipFiles(context, picPath, (code, message, imgs) -> {
+                            Map map = new HashMap();
+                            map.put("image", imgs);
+                            map.put("tocken", data.getData().getToken());
+                            if (event.active) callback.callback(code, "", map);
+                        }) : Logic.process(() -> {
+                            Map map = new HashMap();
+                            map.put("image", picPath);
+                            map.put("tocken", data.getData().getToken());
+                            return map;
+                        }, callback))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    UploadProvider.doUploadPic(context, (List<String>) map.get("image"), (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data, DataCallback<List<FeedBackInfo>> callback) ->
+                        Logic.process(() -> {
+                            List<FeedBackInfo> list = new ArrayList<>();
+                            for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                FeedBackInfo info = new FeedBackInfo();
+                                info.setImageUrl(SEVEN + ((ArrayList) data).get(i));
+                                info.setImageWidth((Long) width.get(i));
+                                info.setImageHeight((Long) height.get(i));
+                                list.add(info);
+                            }
+                            return list;
+                        }, callback))
+                .start(event);
+    }
+
+    public static void uploadPicInfo(Context context, String userId, String type, String text, String address, List<String> picPath, ArrayList width, ArrayList height, Event<BaseInfo> event, String gopath, String videotype) {
+        Logic.create()
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
+                )
+                .action((data, callback) -> UploadProvider.zipFiles(context, picPath, (code, message, imgs) -> {
+                    Map map = new HashMap();
+                    map.put("image", imgs);
+                    map.put("tocken", ((BaseInfo<UploadAuthData>) data).getData().getToken());
+                    if (event.active) {
+                        callback.callback(code, "", map);
+                    }
+                }))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    UploadProvider.doUploadPic(context, (List<String>) map.get("image"), (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data, DataCallback<Map<String, Object>> callback) ->
+                        Logic.process(() -> {
+                            JSONArray jsonArray = new JSONArray();
+                            for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                JSONObject picobj = new JSONObject();
+                                int index = Integer.parseInt(data.get(i).substring(8, 9));
+                                try {
+                                    picobj.put("imageUrl", SEVEN + ((ArrayList) data).get(i));
+                                    picobj.put("imageWidth", width.get(i));
+                                    picobj.put("imageHeight", height.get(i));
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                try {
+                                    jsonArray.put(index, picobj);
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            if (jsonArray.length() == ((ArrayList) data).size()) {
+                                Map<String, Object> requestData = new HashMap<>();
+                                requestData.put("appId", AppConfig.getAppId());
+                                requestData.put("sid", userId);
+                                requestData.put("text", StringUtils.encode(text));
+                                requestData.put("address", address);
+                                requestData.put("type", "1");
+                                requestData.put("picArray", jsonArray);
+                                return requestData;
+                            } else {
+                                return null;
+                            }
+                        }, callback))
+                .action((Map<String, Object> data, DataCallback<BaseInfo> callback) ->
+                        SubscriptionRequest.service(ApiServiceMoment.class, service -> service.releaseMomentNe(gopath, data))
+                                .subscribe(context, callback))
+
+                /*  ApiRequest.service(ApiServiceMoment.class, service -> gotype == 2 ?
+                          service.releaseMomentNew(data) : service.releaseWitness(data))
+                          .subscribe(context, callback))*/
+                .start(event);
+    }
+
+
+    /**
+     * 张楠上传地图信息用
+     */
+    public static void uploadAddressPicInfo(Context context, List<String> picPath, Event<String> event) {
+        Logic.create()
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
+                )
+                .action((data, callback) -> UploadProvider.zipFiles(context, picPath, (code, message, imgs) -> {
+                    Map map = new HashMap();
+                    map.put("image", imgs);
+                    map.put("tocken", ((BaseInfo<UploadAuthData>) data).getData().getToken());
+                    if (event.active) {
+                        callback.callback(code, "", map);
+                    }
+                }))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    UploadProvider.doUploadPic(context, (List<String>) map.get("image"), (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data, DataCallback<String> callback) ->
+                        Logic.process(() -> {
+                            String addressImageUrl = SEVEN + ((ArrayList) data).get(0);
+                            return addressImageUrl;
+                        }, callback))
+
+                .start(event);
+    }
+
+    public static void uploadSnowPicInfo(Context context, String userId, String text, String address, ArrayList picPath, ArrayList width, ArrayList height, Event<BaseInfo> event, String path, String videotype) {
+        //统计
+        //Probe.probeUploadVideo();
+
+        Logic.create()
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback))
+                .action((BaseInfo<UploadAuthData> data, DataCallback<Map<String, Object>> callback) -> UploadProvider.zipFiles(context, (List<String>) picPath, (code, message, imgs) -> {
+                    Map map = new HashMap();
+                    map.put("image", imgs);
+                    map.put("tocken", data.getData().getToken());
+                    if (event.active) callback.callback(code, "", map);
+                }))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    UploadProvider.doUploadPic(context, (List<String>) map.get("image"), (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data, DataCallback<Map<String, Object>> callback) ->
+                        Logic.process(() -> {
+                            JSONArray jsonArray = new JSONArray();
+                            for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                JSONObject picobj = new JSONObject();
+                                int index = Integer.parseInt(data.get(i).substring(8, 9));
+                                try {
+                                    picobj.put("imageUrl", SEVEN + ((ArrayList) data).get(i));
+                                    picobj.put("imageWidth", width.get(i));
+                                    picobj.put("imageHeight", height.get(i));
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                try {
+                                    jsonArray.put(index, picobj);
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            if (jsonArray.length() == ((ArrayList) data).size()) {
+                                Log.e("werwwwwwwwwwwww123", jsonArray.toString() + "       " + AppConfig.getAppId() + "     " + userId);
+                                Map<String, Object> requestData = new HashMap<>();
+                                requestData.put("appId", AppConfig.getAppId());
+                                requestData.put("sid", userId);
+                                requestData.put("text", StringUtils.encode(text));
+                                requestData.put("address", address);
+                                requestData.put("type", "1");
+                                requestData.put("picArray", jsonArray);
+                                return requestData;
+                            } else {
+                                return null;
+                            }
+//                            return null;
+                        }, callback))
+                .action((Map<String, Object> data, DataCallback<BaseInfo> callback) ->
+                        SubscriptionRequest.service(ApiServiceMoment.class, service -> service.releaseMomentNe(path, data))
+                                .subscribe(context, callback))
+                .start(event);
+    }
+
+    private static class SendMoment {
+        private String appId = AppConfig.getAppId();
+        private String text;
+        private String sid;
+        private String type;
+        private String address;
+        private String debug;
+        private String ver;
+        private String plat;
+        private String tagId;
+        private String tagName;
+
+        public SendMoment(String type, String sid, String text, String address, String ver, String plat, String tagId, String tagName) {
+            this.sid = sid;
+            this.text = StringUtils.encode(text);
+            this.address = address;
+            this.debug = AppConfig.isDebug() ? "0" : "";
+            this.type = type;
+            this.ver = ver;
+            this.plat = plat;
+            this.tagId = tagId;
+            this.tagName = tagName;
+        }
+    }
+
+    private static class SendImage {
+        private String imageUrl;
+        private Long imageWidth;
+        private Long imageHeight;
+
+
+        public SendImage(String imageUrl, Long imageWidth, Long imageHeight) {
+            this.imageUrl = imageUrl;
+            this.imageWidth = imageWidth;
+            this.imageHeight = imageHeight;
+        }
+    }
+
+    private static String getPath(String cachePath) {
+        String path = Environment.getExternalStorageDirectory() + cachePath;
+        File file = new File(path);
+        if (file.mkdirs()) {
+            return path;
+        }
+        return path;
+    }
+
+    public static void uploadInfo(Context context, String sid, String text, String address,
+                                  String key, List<String> imageFiles, ShareReleaseInfoUtil.ShareConfig shareConfig,
+                                  Event<BaseInfo> event, String gopath, String videotype) {
+
+        Logic.create(imageFiles)
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
+                )
+                .action((BaseInfo<UploadAuthData> data, DataCallback<Map<String, Object>> callback) ->
+                        Logic.process(() -> {
+                            Map map = new HashMap();
+                            File file = new File(getPath("/strike/cache/") + "share.jpg");
+                            if (file.exists()) {
+                                src = getPath("/strike/cache/") + "share.jpg";
+                            } else {
+                                src = getPath("/strike/cache/") + "sharefirst.jpg";
+                            }
+                            map.put("image", src);
+                            map.put("tocken", data.getData().getToken());
+                            return map;
+                        }, callback))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    ArrayList<String> objects = new ArrayList<>();
+                    objects.add(map.get("image") + "");
+                    UploadProvider.doUploadPic(context, objects, (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data1, DataCallback<String> callback) ->
+                        UploadProvider.uploadInfo(context, sid, text, address, key, null, shareConfig, gopath, SEVEN + ((ArrayList) data1).get(0),
+                                (progress) -> {
+                                    if (!event.active) {
+                                        return;
+                                    }
+                                    event.onProgress(progress);
+                                },
+                                (code, message, data) -> {
+                                    if (!event.active) {
+                                        return;
+                                    }
+
+                                    event.onState(Config.STATE_IDLE);
+                                    if (code == 0) {
+                                        event.onSuccess(data);
+                                    } else {
+                                        event.onFailure(code, message);
+                                    }
+                                })
+                )
+                .start(event);
+    }
+
+
+    public static void uploadHomeInfo(Context context, String sid, String text, String address,
+                                      String key, List<String> imageFiles, ShareReleaseInfoUtil.ShareConfig shareConfig,
+                                      Event<BaseInfo> event, String gopath, String videotype) {
+        Logic.create(imageFiles)
+                .action((List<String> data, DataCallback<List<String>> callback) ->
+                        UploadProvider.zipFiles(context, data, callback))
+                .action((List<String> list, DataCallback<String> callback) ->
+                        UploadProvider.uploadInfo(context, sid, text, address, key, list, shareConfig, gopath, videotype,
+                                (progress) -> {
+                                    if (!event.active) {
+                                        return;
+                                    }
+                                    event.onProgress(progress);
+                                },
+                                (code, message, data) -> {
+                                    if (!event.active) {
+                                        return;
+                                    }
+
+                                    event.onState(Config.STATE_IDLE);
+                                    if (code == 0) {
+                                        event.onSuccess(data);
+                                    } else {
+                                        event.onFailure(code, message);
+                                    }
+                                })
+                )
+                .start(event);
+    }
+
+
+    private static void onError(String tag, int stateCode, int code, String message, Event event) {
+        if (event.active) {
+            event.onState(Config.STATE_IDLE);
+            if (code == -3) {
+                event.onFailure(code, message);
+            } else {
+                event.onFailure(stateCode, message);
+            }
+        }
+        Log.d(TAG, String.format(ERROR_DEF, tag, stateCode, code, message));
+    }
+
+    /**
+     * Im收藏的时候图片单张上传的方法
+     *
+     * @param context
+     * @param isZip
+     * @param picPath
+     * @param event
+     */
+    public static void uploadonePic(Context context, boolean isZip, List<String> picPath, Event<List<FeedBackInfo>> event) {
+
+        Logic.create()
+                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+                        UploadProvider.getStorageInfo(context, callback))
+                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
+                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
+                )
+                .action((BaseInfo<UploadAuthData> data, DataCallback<Map<String, Object>> callback) ->
+                        isZip ? UploadProvider.zipFiles(context, picPath, (code, message, imgs) -> {
+                            Map map = new HashMap();
+                            map.put("image", imgs);
+                            map.put("tocken", data.getData().getToken());
+                            if (event.active) callback.callback(code, "", map);
+                        }) : Logic.process(() -> {
+                            Map map = new HashMap();
+                            map.put("image", picPath);
+                            map.put("tocken", data.getData().getToken());
+                            return map;
+                        }, callback))
+                .action((Map<String, Object> map, DataCallback<ArrayList<String>> callback) -> {
+                    UploadProvider.doUploadPic(context, (List<String>) map.get("image"), (String) (map.get("tocken")), callback,
+                            progress -> {
+                                if (event.active) {
+                                    event.onProgress(progress);
+                                }
+                            });
+                    return null;
+                })
+                .action((ArrayList<String> data, DataCallback<List<FeedBackInfo>> callback) ->
+                        Logic.process(() -> {
+                            List<FeedBackInfo> list = new ArrayList<>();
+                            for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                FeedBackInfo info = new FeedBackInfo();
+                                info.setImageUrl(SEVEN + ((ArrayList) data).get(i));
+                                list.add(info);
+                            }
+                            return list;
+                        }, callback))
+                .start(event);
+
+    }
+
+}
+package com.cnlive.moudle.pedometer.upload;
+
+import android.app.Activity;
+import android.content.Context;
+import android.media.MediaMetadataRetriever;
+import android.os.Build;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.libs.base.logic.Config;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.ProgressCallback;
+import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.libs.base.util.ShareReleaseInfoUtil;
+import com.cnlive.libs.base.util.StringUtils;
+import com.cnlive.libs.data.network.Subscriber;
+import com.cnlive.libs.data.network.body.CountingRequestBody;
+import com.cnlive.libs.data.network.util.SignUtil;
+import com.cnlive.libs.upload.listener.CNPutObjectResponseListener;
+import com.cnlive.libs.upload.model.UploadError;
+import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
+import com.cnlive.libs.upload.services.CNPutObjectRequest;
+import com.cnlive.libs.upload.upload.CNUpload;
+import com.cnlive.libs.upload.upload.callback.OnInitListener;
+import com.cnlive.media.picker.utils.FileTypeUtil;
+import com.cnlive.moudle.pedometer.net.ApiSubscriber;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.StorageInfoData;
+import com.cnlive.moudle.pedometer.net.bean.upload.UploadAuthData;
+import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceMoment;
+import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceOpen;
+import com.cnlive.moudle.pedometer.utils.FileUtil;
+import com.cnlive.moudle.pedometer.utils.IDUtils;
+import com.cnlive.moudle.pedometer.utils.MD5;
+import com.qiniu.android.http.ResponseInfo;
+import com.qiniu.android.storage.UpCompletionHandler;
+import com.qiniu.android.storage.UpProgressHandler;
+import com.qiniu.android.storage.UploadManager;
+import com.qiniu.android.storage.UploadOptions;
+import com.qiniu.pili.droid.shortvideo.PLShortVideoTranscoder;
+import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener;
+
+import org.apache.http.Header;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import retrofit2.adapter.rxjava2.Result;
+import top.zibin.luban.CompressionPredicate;
+import top.zibin.luban.Luban;
+import top.zibin.luban.OnCompressListener;
+//import org.apache.http.Header;
+import static com.cnlive.libs.base.logic.Config.ERROR_UPLOAD;
+import static com.cnlive.libs.base.logic.Config.SUCCESS;
+
+
+/**
+ * Created by xiansong on 2018/2/1.
+ */
+
+public class UploadProvider {
+
+    private static final String TAG = "UploadProvider";
+    private static final String TEST_OBJECT_PIC__KEY = "802/img/%s/%s/%s.%s";
+    private static final String RELEASE_OBJECT_PIC__KEY = "769/img/%s/%s/%s.%s";
+    private static final String OBJECT_PIC_KEY = AppConfig.isDebug() ? TEST_OBJECT_PIC__KEY : RELEASE_OBJECT_PIC__KEY;
+    private static final String TYPE_IMAGE_PATH = "/strike/image/";
+    private static final String TYPE_VIDEO_PATH = "/strike/cache/";
+
+
+    public static void initUpload(Context context, DataCallback<CNUpload> callback) {
+        if (callback == null) return;
+        //实例化上传
+        CNUpload cnUpload = new CNUpload(context);
+        //初始化上传
+        cnUpload.initCNUpload(new OnInitListener() {
+            @Override
+            public void onError(String s, String s1) {
+                int errorCode = -1;
+                try {
+                    errorCode = Integer.valueOf(s);
+                } catch (Exception e) {
+                    Log.e(TAG, "initUpload error code is string. ");
+                } finally {
+                    callback.callback(errorCode, s1, null);
+                }
+            }
+
+            @Override
+            public void onSuccess(String s) {
+                callback.callback(0, s, cnUpload);
+            }
+        });
+    }
+
+    /**
+     * @param context
+     * @param callback
+     * @return
+     */
+    public static Disposable uploadAuth(Context context, String bucketName, DataCallback<BaseInfo<UploadAuthData>> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("verb", "POST");
+        map.put("md5", "");
+        map.put("bucket", bucketName);
+        map.put("type", "");
+        map.put("res", "");
+        map.put("headers", "");
+        map.put("date", "");
+        map.put("storageType", "2");
+        Subscriber<BaseInfo<UploadAuthData>> subscriber = new Subscriber<BaseInfo<UploadAuthData>>(context, ApiSubscriber.subscriberBuild) {
+            @Override
+            public void onCompleted(String s, String s1, BaseInfo<UploadAuthData> uploadAuthDataBaseInfo) {
+                if (callback == null) {
+                    return;
+                }
+                callback.callback(SUCCESS, "", uploadAuthDataBaseInfo);
+            }
+
+            @Override
+            public void onError(String s, String s1) {
+                if (callback == null) {
+                    return;
+                }
+                int errorCode = -1;
+                try {
+                    errorCode = Integer.valueOf(s);
+                } catch (Exception ignored) {
+                } finally {
+                    callback.callback(errorCode, s1, null);
+                }
+            }
+        };
+        Observable<Result<BaseInfo<UploadAuthData>>> observable = SubscriptionRequest.service(ApiServiceOpen.class).getUploadAuthForApp(map);
+        return SubscriptionRequest.subscribe(observable, subscriber);
+    }
+
+    /**
+     * 获取存储信息
+     *
+     * @param context
+     * @param callback
+     * @return
+     */
+    public static Disposable getStorageInfo(Context context, DataCallback<BaseInfo<List<StorageInfoData>>> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("storageType", "2");
+        map.put("state", "1");
+        map.put("contentType", "1");
+//        map.put("profile", AppConfig.isDebug() ? "2" : "1");//暂时不传这个参数
+        Subscriber<BaseInfo<List<StorageInfoData>>> subscriber = new Subscriber<BaseInfo<List<StorageInfoData>>>(context, ApiSubscriber.subscriberBuild) {
+            @Override
+            public void onCompleted(String code, String message, BaseInfo<List<StorageInfoData>> data) {
+                if (callback == null) {
+                    return;
+                }
+                if (data.getData().size() > 0 || data.getData() != null) {
+                    callback.callback(SUCCESS, "", data);
+                } else {
+                    callback.callback(-1, "storage info null", null);
+                }
+            }
+
+            @Override
+            public void onError(String code, String message) {
+                if (callback == null) {
+                    return;
+                }
+                int errorCode = -1;
+                try {
+                    errorCode = Integer.valueOf(code);
+                } catch (Exception ignored) {
+                } finally {
+                    callback.callback(errorCode, message, null);
+                }
+            }
+        };
+        Observable<Result<BaseInfo<List<StorageInfoData>>>> observable = SubscriptionRequest.service(ApiServiceOpen.class).getStorageInfo(map);
+        return SubscriptionRequest.subscribe(observable, subscriber);
+    }
+
+    //    /**
+//     * 视频发布 - 视讯云数据同步接口
+//     *
+//     * @param context
+//     * @param sid
+//     * @param text
+//     * @param address
+//     * @param key
+//     * @param callback
+//     * @return
+//     */
+//    public static Disposable uploadInfo(Context context, String sid, String text, String address, String key, DataCallback<BaseInfo> callback) {
+//        svInputMamForAPP
+//    }
+    public static Disposable zipFiles(Context context, List<String> imageFiles, DataCallback<List<String>> callback) {
+        if (imageFiles == null || imageFiles.size() == 0) {
+            callback.callback(0, "", imageFiles);
+        } else {
+            List<String> files = new ArrayList<>();
+            for (int i = 0; i < imageFiles.size(); i++) {
+                if ("gif".equals(FileTypeUtil.getFileType(imageFiles.get(i)))) {
+                    files.add(imageFiles.get(i));
+                    if (files.size() == imageFiles.size()) {
+                        callback.callback(0, "", files);
+                    }
+                } else {
+                    Luban.with(context)
+                            .load(imageFiles.get(i))
+                            .ignoreBy(500)
+                            .setTargetDir(getPath(TYPE_IMAGE_PATH))
+                            .filter(new CompressionPredicate() {
+                                @Override
+                                public boolean apply(String path) {
+                                    return !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif"));
+                                }
+                            })
+                            .setCompressListener(new OnCompressListener() {
+                                @Override
+                                public void onStart() {
+                                    // TODO 压缩开始前调用，可以在方法内启动 loading UI
+                                }
+
+                                @Override
+                                public void onSuccess(File file) {
+                                    // TODO 压缩成功后调用，返回压缩后的图片文件
+                                    files.add(file.getPath());
+                                    if (files.size() == imageFiles.size()) {
+                                        callback.callback(0, "", files);
+                                    }
+                                }
+
+                                @Override
+                                public void onError(Throwable e) {
+                                    Log.e(TAG, "onError: 失败"+e.getMessage() );
+                                    // TODO 当压缩过程出现问题时调用
+                                    AlertUtil.showDeftToast(context, "图片压缩失败，请重新上传");
+                                }
+                            }).launch();
+                }
+            }
+        }
+        return null;
+    }
+
+    public static boolean isHUAWEI() {
+        String manufacturer = Build.MANUFACTURER;
+        if ("huawei".equalsIgnoreCase(manufacturer)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public static Disposable zipVideo(Context context, String path, boolean compressed, DataCallback<String> callback) {
+        boolean huawei = isHUAWEI();
+        if (TextUtils.isEmpty(path) || compressed) {
+            callback.callback(Config.FAIL, "", path);
+        } else {
+            try {
+                //  String outPath = getPath(TYPE_VIDEO_PATH) + MD5Utils.getFileMD5(new File(path)) + ".mp4";
+                // String outPath = getPath(TYPE_VIDEO_PATH) + MD5.getFileMD5(new File(path)) + ".mp4";
+                compressVideoResouce(context, path, callback);
+                //    TranscoderUtil.doTranscode(context, path, outPath, callback);
+            } catch (Exception e) {
+                callback.callback(0, "", path);
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 压缩视频
+     *
+     * @param mContext
+     * @param filepath
+     */
+    public static void compressVideoResouce(Context mContext, String filepath, DataCallback<String> callback) {
+        if (TextUtils.isEmpty(filepath)) {
+            AlertUtil.showDeftToast(mContext, "请先选择转码文件！");
+            return;
+        }
+        //PLShortVideoTranscoder初始化，三个参数，第一个context，第二个要压缩文件的路径，第三个视频压缩后输出的路径
+        PLShortVideoTranscoder mShortVideoTranscoder = new PLShortVideoTranscoder(mContext, filepath, getPath(TYPE_VIDEO_PATH) + MD5.getFileMD5(new File(filepath)) + ".mp4");
+        MediaMetadataRetriever retr = new MediaMetadataRetriever();
+        retr.setDataSource(filepath);
+        String height = retr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT); // 视频高度
+        String width = retr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH); // 视频宽度
+        String rotation = retr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); // 视频旋转方向
+        int transcodingBitrateLevel = 7;//我这里选择的4000*1000压缩，这里可以自己选择合适的压缩比例
+        mShortVideoTranscoder.transcode(Integer.parseInt(width), Integer.parseInt(height), getEncodingBitrateLevel(transcodingBitrateLevel), new PLVideoSaveListener() {
+            @Override
+            public void onSaveVideoSuccess(String s) {
+                if (callback != null) {
+                    callback.callback(Config.SUCCESS, "success", s);
+                }
+            }
+
+            @Override
+            public void onSaveVideoFailed(final int errorCode) {
+                if (callback != null) {
+                    callback.callback(Config.FAIL, "", filepath);
+                }
+            }
+
+            @Override
+            public void onSaveVideoCanceled() {
+//                LogUtil.e("onSaveVideoCanceled");
+            }
+
+            @Override
+            public void onProgressUpdate(float percentage) {
+//                LogUtil.e("onProgressUpdate==========" + percentage);
+            }
+        });
+    }
+
+    /**
+     * 设置压缩质量
+     *
+     * @param position
+     * @return
+     */
+    private static int getEncodingBitrateLevel(int position) {
+        return ENCODING_BITRATE_LEVEL_ARRAY[position];
+    }
+
+    /**
+     * 选的越高文件质量越大，质量越好
+     */
+    public static final int[] ENCODING_BITRATE_LEVEL_ARRAY = {
+            500 * 1000,
+            800 * 1000,
+            1000 * 1000,
+            1200 * 1000,
+            1600 * 1000,
+            2000 * 1000,
+            2500 * 1000,
+            4000 * 1000,
+            8000 * 1000,
+    };
+
+
+    private static String getPath(String cachePath) {
+        String path = Environment.getExternalStorageDirectory() + cachePath;
+        File file = new File(path);
+        if (file.mkdirs()) {
+            return path;
+        }
+        return path;
+    }
+
+    public static Disposable uploadInfo(Context context, String sid, String text, String address,
+                                        String key, List<String> imageFiles, ShareReleaseInfoUtil.ShareConfig shareConfig, String gopath, String videotype,
+                                        ProgressCallback progressCallback, DataCallback<BaseInfo> callback) {
+        Map<String, String> map = new HashMap<>();
+
+        //  if (imageFiles != null && imageFiles.size() > 0) map.put("type", "1");
+        if (!TextUtils.isEmpty(key)) {
+            map.put("type", "2");
+        } else if (shareConfig != null) {
+            map.put("type", "3");
+        } else {
+            map.put("type", "0");
+        }
+        map.put("appId", AppConfig.getAppId());
+        map.put("sid", sid);
+        map.put("text", StringUtils.encode(text));
+        if (!TextUtils.isEmpty(key)) {
+            map.put("key", key);
+        }
+        //if (!TextUtils.isEmpty(address)) map.put("address", StringUtils.encode(address));
+        if (!TextUtils.isEmpty(address)) {
+            map.put("address", address);
+        }
+        if (shareConfig != null) {
+            map.put("title", shareConfig.getTitle() == null ? "" : StringUtils.encode(shareConfig.getTitle()));
+            map.put("icon", videotype.startsWith("http") ? videotype : shareConfig.getImage());
+            // map.put("icon",shareConfig.getImage().contains("/favicon.ico") || shareConfig.getImage().contains("toutiao") ? shareConfig.getImage() : videotype.startsWith("http") ? videotype : shareConfig.getImage());
+            map.put("url", shareConfig.getUrl());
+            map.put("desc", shareConfig.getSubTitle() == null ? "" : StringUtils.encode(shareConfig.getSubTitle()));
+            map.put("shareType", "3");
+            map.put("shareExtInfo", "");
+        }
+
+        Subscriber<BaseInfo> subscriber = new Subscriber<BaseInfo>(context, ApiSubscriber.subscriberBuild) {
+            @Override
+            public void onCompleted(String s, String s1, BaseInfo darenApplyModel) {
+                if (callback == null) {
+                    return;
+                }
+                callback.callback(SUCCESS, "", darenApplyModel);
+            }
+
+            @Override
+            public void onError(String code, String message) {
+                if (callback == null) {
+                    return;
+                }
+                int errorCode = -1;
+                try {
+                    errorCode = Integer.valueOf(code);
+                } catch (Exception ignored) {
+                } finally {
+                    callback.callback(errorCode, message, null);
+                }
+            }
+
+        };
+
+        return SignUtil.getRequestBodySignMapObservable(map).subscribe(requestBodyMap -> {
+            ApiServiceMoment service = SubscriptionRequest.service(ApiServiceMoment.class);
+            SubscriptionRequest.subscribe(service.releaseMomentText(gopath, map), subscriber);
+        });
+    }
+
+
+
+    private static List<MultipartBody.Part> getImageParams(List<String> imageFiles, ProgressCallback callback) {
+        List<MultipartBody.Part> imageParams = new ArrayList<>();
+
+        if (imageFiles != null) {
+            for (String path : imageFiles) {
+                File file = new File(path);
+                RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                int index = imageFiles.indexOf(path);
+                int size = imageFiles.size();
+                CountingRequestBody countingRequestBody = new CountingRequestBody(requestBody, (byteWrited, contentLength, done) -> {
+                    float p = (float) index / (float) size + (float) byteWrited / (float) contentLength / (float) size;
+                    if (callback != null) {
+                        callback.onProgress((int) (p * 100));
+                    }
+                });
+                imageParams.add(MultipartBody.Part.createFormData("Image" + (imageFiles.indexOf(path) + 1), file.getName(), countingRequestBody));
+            }
+        }
+        return imageParams;
+    }
+
+    /**
+     * 单块上传
+     *
+     * @param file 自定义文件
+     */
+    public static void doUpload(CNUpload cnUpload, File file, String objectKey, DataCallback<Integer> callback, ProgressCallback progressCallback) {
+        CNPutObjectRequest request = new CNPutObjectRequest(objectKey, file);
+        //Bucket权限管理
+        request.setCannedACL(CNCannedAccessControlList.PublicRead);
+        //设置上传的文件的内容类型
+        request.setContentType("video/mp4");
+
+        cnUpload.putObject(request, new CNPutObjectResponseListener() {
+            /**
+             * 上传失败
+             * @param code Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param message 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
+            @Override
+            public void onTaskFailure(int code, UploadError uploadError, Header[] headers, String message, Throwable throwable) {
+                callback.callback(code, message, ERROR_UPLOAD);
+            }
+
+            /**
+             * 上传成功
+             * @param code Http请求返回的状态码
+             * @param headers Http请求响应报头
+             */
+            @Override
+            public void onTaskSuccess(int code, Header[] headers) {
+                callback.callback(0, "", SUCCESS);
+            }
+
+            /**
+             * 上传开始
+             */
+            @Override
+            public void onTaskStart() {
+            }
+
+            /**
+             * 上传结束 包括上传成功结束与上传失败结束
+             */
+            @Override
+            public void onTaskFinish() {
+            }
+
+            /**
+             * 上传取消
+             * 目前无法取消上传操作~!!!
+             */
+            @Override
+            public void onTaskCancel() {
+            }
+
+            /**
+             * 上传进度
+             * @param progress 返回上传进度
+             */
+            @Override
+            public void onTaskProgress(double progress) {
+                progressCallback.onProgress(progress);
+            }
+        });
+    }
+
+    public static void doUpload(Context context, File file, String objectKey, String uploadToken, DataCallback<Integer> callback, ProgressCallback progressCallback) {
+        UploadManager uploadManager = new UploadManager();
+        uploadManager.put(file, objectKey, uploadToken, new UpCompletionHandler() {
+            @Override
+            public void complete(String key, ResponseInfo info, JSONObject response) {
+                ((Activity) context).runOnUiThread(() -> {
+                    if (info.isOK()) {
+                        callback.callback(0, "", SUCCESS);
+                    } else {
+                        callback.callback(info.statusCode, info.error, ERROR_UPLOAD);
+                    }
+                });
+            }
+        }, new UploadOptions(null, null, false, new UpProgressHandler() {
+            @Override
+            public void progress(String key, double percent) {
+                progressCallback.onProgress(percent);
+            }
+        }, null));
+    }
+
+
+    public static void doUploadPic(Context context, List<String> file, String uploadToken, DataCallback<ArrayList<String>> callback, ProgressCallback progressCallback) {
+        ArrayList<String> netpiclist = new ArrayList<>();
+        UploadManager uploadManager = new UploadManager();
+        //正式环境：769/img/2018/01/29/"时间戳".jpg
+        //测试环境：802/img/2018/01/29/"时间戳".jpg
+        for (int i = 0; i < file.size(); i++) {
+            Date date = new Date();
+            String date1 = StringUtils.formatDate(date, "yyyy/MM/dd");
+            String id = IDUtils.createID();
+            String extName = FileUtil.getExtensionName((String) file.get(0));
+            String objectKey = String.format(OBJECT_PIC_KEY, i, date1, id, extName);
+            uploadManager.put(new File(file.get(i)), objectKey, uploadToken, new UpCompletionHandler() {
+                @Override
+                public void complete(String key, ResponseInfo info, JSONObject response) {
+                    ((Activity) context).runOnUiThread(() -> {
+
+                        if (info.isOK()) {
+                            try {
+                                netpiclist.add((String) info.response.get("key"));
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                            if (netpiclist.size() == file.size()) {
+                                callback.callback(0, "", netpiclist);
+                            }
+                        } else {
+                            callback.callback(info.statusCode, info.error, null);
+                        }
+                    });
+                }
+            }, new UploadOptions(null, null, false, new UpProgressHandler() {
+                @Override
+                public void progress(String key, double percent) {
+                    progressCallback.onProgress(percent);
+                }
+            }, null));
+        }
+    }
+
+
+
+    private static RequestBody getRequestString(String value) {
+        RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
+        return requestString;
+    }
+}
+package com.cnlive.moudle.pedometer.upload.utils;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+
+/**
+ * Created by xiansong on 2017/9/20.
+ */
+
+public class FileUtil {
+    /**
+     * Java文件操作 获取文件扩展名
+     */
+    public static String getExtensionName(String filename) {
+        if ((filename != null) && (filename.length() > 0)) {
+            int dot = filename.lastIndexOf('.');
+            if ((dot > -1) && (dot < (filename.length() - 1))) {
+                return filename.substring(dot + 1);
+            }
+        }
+        return "";
+    }
+
+
+    public static String getExternalStorageDirctory(Context context, String folderName) {
+        File storageDir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName() + File.separator);
+        File folderDir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName() + File.separator + folderName + File.separator);
+        if (!storageDir.exists()) storageDir.mkdirs();
+        if (!folderDir.exists()) folderDir.mkdirs();
+        return Environment.getExternalStorageDirectory() + File.separator +
+                context.getPackageName() + File.separator +
+                folderName + File.separator;
+    }
+
+    /**
+     * 拷贝Logo 到 SD卡
+     *
+     * @param context
+     * @param filename
+     */
+    public static String copyAssetsFile(Context context, String folderName, String filename) {
+        String uri = getExternalStorageDirctory(context, folderName) + filename;
+        if (!new File(uri).exists()) {
+            try {
+                InputStream in = context.getAssets().open(filename);
+                OutputStream out = new FileOutputStream(uri);
+                byte[] buffer = new byte[1024];
+                int read;
+                while ((read = in.read(buffer)) != -1) out.write(buffer, 0, read);
+                in.close();
+                out.flush();
+                out.close();
+            } catch (Exception e) {
+                Log.e("tag", e.getMessage());
+            }
+        }
+        return uri;
+    }
+
+    /**
+     * 转换 content:// uri
+     *
+     * @param imageFile
+     * @return
+     */
+    public static Uri getImageContentUri(Context context, File imageFile) {
+        String filePath = imageFile.getAbsolutePath();
+        Cursor cursor = context.getContentResolver().query(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                new String[]{MediaStore.Images.Media._ID},
+                MediaStore.Images.Media.DATA + "=? ",
+                new String[]{filePath}, null);
+
+        if (cursor != null && cursor.moveToFirst()) {
+            int id = cursor.getInt(cursor
+                    .getColumnIndex(MediaStore.MediaColumns._ID));
+            Uri baseUri = Uri.parse("content://media/external/images/media");
+            return Uri.withAppendedPath(baseUri, "" + id);
+        } else {
+            if (imageFile.exists()) {
+                ContentValues values = new ContentValues();
+                values.put(MediaStore.Images.Media.DATA, filePath);
+                return context.getContentResolver().insert(
+                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    /**
+     * 复制单个文件
+     * @param oldPath String 原文件路径 如：c:/fqf.txt
+     * @param newPath String 复制后路径 如：f:/fqf.txt
+     * @return boolean
+     */
+    public static void copyFile(String oldPath, String newPath) {
+        try {
+            int bytesum = 0;
+            int byteread = 0;
+            File oldfile = new File(oldPath);
+            if (oldfile.exists()) { //文件存在时
+                InputStream inStream = new FileInputStream(oldPath); //读入原文件
+                FileOutputStream fs = new FileOutputStream(newPath);
+                byte[] buffer = new byte[1444];
+                int length;
+                while ( (byteread = inStream.read(buffer)) != -1) {
+                    bytesum += byteread; //字节数 文件大小
+                    System.out.println(bytesum);
+                    fs.write(buffer, 0, byteread);
+                }
+                inStream.close();
+            }
+        }
+        catch (Exception e) {
+            System.out.println("复制单个文件操作出错");
+            e.printStackTrace();
+
+        }
+
+    }
+
+    public static  String isExistDir(String saveDir) throws IOException {
+        File downloadFile = new File(saveDir);
+        if (!downloadFile.mkdirs()) {
+            downloadFile.createNewFile();
+        }
+        String savePath = downloadFile.getAbsolutePath();
+        return savePath;
+    }
+
+    public static String getRootPath(Context context,String filePath) {
+        File cacheRootFile = !isExternalStorageWritable() ? context.getFilesDir() : context.getExternalCacheDir();
+        return cacheRootFile.getAbsolutePath()+ File.separator+filePath+File.separator;
+    }
+
+
+    public static boolean isExternalStorageWritable() {
+        String state = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED.equals(state)) {
+            return true;
+        }
+        return false;
+    }
+
+    /*
+     * 保存bitmap到本地
+     * */
+    public static String saveBitmap(Context context, Bitmap mBitmap) {
+        String savePath;
+        File filePic;
+        savePath = context.getCacheDir().getAbsolutePath();
+        try {
+            filePic = new File(savePath + UUID.randomUUID().toString() + ".jpg");
+            if (!filePic.exists()) {
+                filePic.getParentFile().mkdirs();
+                filePic.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(filePic);
+            mBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+
+        return filePic.getAbsolutePath();
+    }
+}
+package com.cnlive.moudle.pedometer.upload.utils;
+
+public class IDUtils {
+    private static byte[] lock = new byte[0];  
+  
+    // 位数，默认是8位  
+    private final static long w = 100000000;  
+  
+    public static String createID() {  
+        long r = 0;  
+        synchronized (lock) {  
+            r = (long) ((Math.random() + 1) * w);  
+        }  
+  
+        return System.currentTimeMillis() + String.valueOf(r).substring(1);  
+    }  
+}  
 \ No newline at end of file
+package com.cnlive.moudle.pedometer.upload.utils;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Author by Yuansiwen.com, Date on 2018/11/29.
+ * PS: Not easy to write code, please indicate.
+ */
+public class MD5 extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+        File file = new File("/mnt/sdcard/123.txt");
+        Log.e("MD5", getFileMD5(file));
+    }
+
+    /**
+     * 获取单个文件的MD5值！
+
+     * @param file
+     * @return
+     */
+
+    public static String getFileMD5(File file) {
+        if (!file.isFile()) {
+            return null;
+        }
+        MessageDigest digest = null;
+        FileInputStream in = null;
+        byte buffer[] = new byte[1024];
+        int len;
+        try {
+            digest = MessageDigest.getInstance("MD5");
+            in = new FileInputStream(file);
+            while ((len = in.read(buffer, 0, 1024)) != -1) {
+                digest.update(buffer, 0, len);
+            }
+            in.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        BigInteger bigInt = new BigInteger(1, digest.digest());
+        return bigInt.toString(16);
+    }
+
+    /**
+     * 获取文件夹中文件的MD5值
+     *
+     * @param file
+     * @param listChild
+     *            ;true递归子目录中的文件
+     * @return
+     */
+    public static Map<String, String> getDirMD5(File file, boolean listChild) {
+        if (!file.isDirectory()) {
+            return null;
+        }
+        Map<String, String> map = new HashMap<String, String>();
+        String md5;
+        File files[] = file.listFiles();
+        for (int i = 0; i < files.length; i++) {
+            File f = files[i];
+            if (f.isDirectory() && listChild) {
+                map.putAll(getDirMD5(f, listChild));
+            } else {
+                md5 = getFileMD5(f);
+                if (md5 != null) {
+                    map.put(f.getPath(), md5);
+                }
+            }
+        }
+        return map;
+    }
+
+}
+
+package com.cnlive.moudle.pedometer.upload.utils;
+
+/**
+ * Created by xiansong on 2018/3/28.
+ */
+
+import android.support.annotation.NonNull;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * Created by Lynn on 6/28/2017.
+ */
+
+public class MD5Utils {
+
+    private static final char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * Get MD5 of a file (lower case)
+     *
+     * @return empty string if I/O error when get MD5
+     */
+    @NonNull
+    public static String getFileMD5(@NonNull File file) {
+
+        FileInputStream in = null;
+        try {
+            in = new FileInputStream(file);
+            FileChannel ch = in.getChannel();
+            return MD5(ch.map(FileChannel.MapMode.READ_ONLY, 0, file.length()));
+        } catch (FileNotFoundException e) {
+            return "";
+        } catch (IOException e) {
+            return "";
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // 关闭流产生的错误一般都可以忽略
+                }
+            }
+        }
+
+    }
+
+    /**
+     * MD5校验字符串
+     *
+     * @param s String to be MD5
+     * @return 'null' if cannot get MessageDigest
+     */
+    @NonNull
+    public static String getStringMD5(@NonNull String s) {
+        MessageDigest mdInst;
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            mdInst = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return "";
+        }
+
+        byte[] btInput = s.getBytes();
+        // 使用指定的字节更新摘要
+        mdInst.update(btInput);
+        // 获得密文
+        byte[] md = mdInst.digest();
+        // 把密文转换成十六进制的字符串形式
+        int length = md.length;
+        char str[] = new char[length * 2];
+        int k = 0;
+        for (byte b : md) {
+            str[k++] = hexDigits[b >>> 4 & 0xf];
+            str[k++] = hexDigits[b & 0xf];
+        }
+        return new String(str);
+    }
+
+    @NonNull
+    private static String getSubStr(@NonNull String str, int subNu, char replace) {
+        int length = str.length();
+        if (length > subNu) {
+            str = str.substring(length - subNu, length);
+        } else if (length < subNu) {
+            // NOTE: padding字符填充在字符串的右侧，和服务器的算法是一致的
+            str += createPaddingString(subNu - length, replace);
+        }
+        return str;
+    }
+
+    @NonNull
+    private static String createPaddingString(int n, char pad) {
+        if (n <= 0) {
+            return "";
+        }
+
+        char[] paddingArray = new char[n];
+        Arrays.fill(paddingArray, pad);
+        return new String(paddingArray);
+    }
+
+    /**
+     * 计算MD5校验
+     *
+     * @param buffer
+     * @return 空串，如果无法获得 MessageDigest实例
+     */
+    @NonNull
+    private static String MD5(ByteBuffer buffer) {
+        String s = "";
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(buffer);
+            byte tmp[] = md.digest(); // MD5 的计算结果是一个 128 位的长整数，
+            // 用字节表示就是 16 个字节
+            char str[] = new char[16 * 2]; // 每个字节用 16 进制表示的话，使用两个字符，
+            // 所以表示成 16 进制需要 32 个字符
+            int k = 0; // 表示转换结果中对应的字符位置
+            for (int i = 0; i < 16; i++) { // 从第一个字节开始，对 MD5 的每一个字节
+                // 转换成 16 进制字符的转换
+                byte byte0 = tmp[i]; // 取第 i 个字节
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf]; // 取字节中高 4 位的数字转换, >>>,
+                // 逻辑右移，将符号位一起右移
+                str[k++] = hexDigits[byte0 & 0xf]; // 取字节中低 4 位的数字转换
+            }
+            s = new String(str); // 换后的结果转换为字符串
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
+}
+
+package com.cnlive.moudle.pedometer.utils;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+
+/**
+ * Created by xiansong on 2017/9/20.
+ */
+
+public class FileUtil {
+    /**
+     * Java文件操作 获取文件扩展名
+     */
+    public static String getExtensionName(String filename) {
+        if ((filename != null) && (filename.length() > 0)) {
+            int dot = filename.lastIndexOf('.');
+            if ((dot > -1) && (dot < (filename.length() - 1))) {
+                return filename.substring(dot + 1);
+            }
+        }
+        return "";
+    }
+
+
+    public static String getExternalStorageDirctory(Context context, String folderName) {
+        File storageDir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName() + File.separator);
+        File folderDir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName() + File.separator + folderName + File.separator);
+        if (!storageDir.exists()) storageDir.mkdirs();
+        if (!folderDir.exists()) folderDir.mkdirs();
+        return Environment.getExternalStorageDirectory() + File.separator +
+                context.getPackageName() + File.separator +
+                folderName + File.separator;
+    }
+
+    /**
+     * 拷贝Logo 到 SD卡
+     *
+     * @param context
+     * @param filename
+     */
+    public static String copyAssetsFile(Context context, String folderName, String filename) {
+        String uri = getExternalStorageDirctory(context, folderName) + filename;
+        if (!new File(uri).exists()) {
+            try {
+                InputStream in = context.getAssets().open(filename);
+                OutputStream out = new FileOutputStream(uri);
+                byte[] buffer = new byte[1024];
+                int read;
+                while ((read = in.read(buffer)) != -1) out.write(buffer, 0, read);
+                in.close();
+                out.flush();
+                out.close();
+            } catch (Exception e) {
+                Log.e("tag", e.getMessage());
+            }
+        }
+        return uri;
+    }
+
+    /**
+     * 转换 content:// uri
+     *
+     * @param imageFile
+     * @return
+     */
+    public static Uri getImageContentUri(Context context, File imageFile) {
+        String filePath = imageFile.getAbsolutePath();
+        Cursor cursor = context.getContentResolver().query(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                new String[]{MediaStore.Images.Media._ID},
+                MediaStore.Images.Media.DATA + "=? ",
+                new String[]{filePath}, null);
+
+        if (cursor != null && cursor.moveToFirst()) {
+            int id = cursor.getInt(cursor
+                    .getColumnIndex(MediaStore.MediaColumns._ID));
+            Uri baseUri = Uri.parse("content://media/external/images/media");
+            return Uri.withAppendedPath(baseUri, "" + id);
+        } else {
+            if (imageFile.exists()) {
+                ContentValues values = new ContentValues();
+                values.put(MediaStore.Images.Media.DATA, filePath);
+                return context.getContentResolver().insert(
+                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    /**
+     * 复制单个文件
+     * @param oldPath String 原文件路径 如：c:/fqf.txt
+     * @param newPath String 复制后路径 如：f:/fqf.txt
+     * @return boolean
+     */
+    public static void copyFile(String oldPath, String newPath) {
+        try {
+            int bytesum = 0;
+            int byteread = 0;
+            File oldfile = new File(oldPath);
+            if (oldfile.exists()) { //文件存在时
+                InputStream inStream = new FileInputStream(oldPath); //读入原文件
+                FileOutputStream fs = new FileOutputStream(newPath);
+                byte[] buffer = new byte[1444];
+                int length;
+                while ( (byteread = inStream.read(buffer)) != -1) {
+                    bytesum += byteread; //字节数 文件大小
+                    System.out.println(bytesum);
+                    fs.write(buffer, 0, byteread);
+                }
+                inStream.close();
+            }
+        }
+        catch (Exception e) {
+            System.out.println("复制单个文件操作出错");
+            e.printStackTrace();
+
+        }
+
+    }
+
+    public static  String isExistDir(String saveDir) throws IOException {
+        File downloadFile = new File(saveDir);
+        if (!downloadFile.mkdirs()) {
+            downloadFile.createNewFile();
+        }
+        String savePath = downloadFile.getAbsolutePath();
+        return savePath;
+    }
+
+    public static String getRootPath(Context context,String filePath) {
+        File cacheRootFile = !isExternalStorageWritable() ? context.getFilesDir() : context.getExternalCacheDir();
+        return cacheRootFile.getAbsolutePath()+ File.separator+filePath+File.separator;
+    }
+
+
+    public static boolean isExternalStorageWritable() {
+        String state = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED.equals(state)) {
+            return true;
+        }
+        return false;
+    }
+
+    /*
+     * 保存bitmap到本地
+     * */
+    public static String saveBitmap(Context context, Bitmap mBitmap) {
+        String savePath;
+        File filePic;
+        savePath = context.getCacheDir().getAbsolutePath();
+        try {
+            filePic = new File(savePath + UUID.randomUUID().toString() + ".jpg");
+            if (!filePic.exists()) {
+                filePic.getParentFile().mkdirs();
+                filePic.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(filePic);
+            mBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+
+        return filePic.getAbsolutePath();
+    }
+}
+package com.cnlive.moudle.pedometer.utils;
+
+public class IDUtils {
+    private static byte[] lock = new byte[0];  
+  
+    // 位数，默认是8位  
+    private final static long w = 100000000;  
+  
+    public static String createID() {  
+        long r = 0;  
+        synchronized (lock) {  
+            r = (long) ((Math.random() + 1) * w);  
+        }  
+  
+        return System.currentTimeMillis() + String.valueOf(r).substring(1);  
+    }  
+}  
 \ No newline at end of file
+package com.cnlive.moudle.pedometer.utils;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Author by Yuansiwen.com, Date on 2018/11/29.
+ * PS: Not easy to write code, please indicate.
+ */
+public class MD5 extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+        File file = new File("/mnt/sdcard/123.txt");
+        Log.e("MD5", getFileMD5(file));
+    }
+
+    /**
+     * 获取单个文件的MD5值！
+
+     * @param file
+     * @return
+     */
+
+    public static String getFileMD5(File file) {
+        if (!file.isFile()) {
+            return null;
+        }
+        MessageDigest digest = null;
+        FileInputStream in = null;
+        byte buffer[] = new byte[1024];
+        int len;
+        try {
+            digest = MessageDigest.getInstance("MD5");
+            in = new FileInputStream(file);
+            while ((len = in.read(buffer, 0, 1024)) != -1) {
+                digest.update(buffer, 0, len);
+            }
+            in.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        BigInteger bigInt = new BigInteger(1, digest.digest());
+        return bigInt.toString(16);
+    }
+
+    /**
+     * 获取文件夹中文件的MD5值
+     *
+     * @param file
+     * @param listChild
+     *            ;true递归子目录中的文件
+     * @return
+     */
+    public static Map<String, String> getDirMD5(File file, boolean listChild) {
+        if (!file.isDirectory()) {
+            return null;
+        }
+        Map<String, String> map = new HashMap<String, String>();
+        String md5;
+        File files[] = file.listFiles();
+        for (int i = 0; i < files.length; i++) {
+            File f = files[i];
+            if (f.isDirectory() && listChild) {
+                map.putAll(getDirMD5(f, listChild));
+            } else {
+                md5 = getFileMD5(f);
+                if (md5 != null) {
+                    map.put(f.getPath(), md5);
+                }
+            }
+        }
+        return map;
+    }
+
+}
+
+package com.cnlive.moudle.pedometer.utils;
+
+/**
+ * Created by xiansong on 2018/3/28.
+ */
+
+import android.support.annotation.NonNull;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * Created by Lynn on 6/28/2017.
+ */
+
+public class MD5Utils {
+
+    private static final char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * Get MD5 of a file (lower case)
+     *
+     * @return empty string if I/O error when get MD5
+     */
+    @NonNull
+    public static String getFileMD5(@NonNull File file) {
+
+        FileInputStream in = null;
+        try {
+            in = new FileInputStream(file);
+            FileChannel ch = in.getChannel();
+            return MD5(ch.map(FileChannel.MapMode.READ_ONLY, 0, file.length()));
+        } catch (FileNotFoundException e) {
+            return "";
+        } catch (IOException e) {
+            return "";
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // 关闭流产生的错误一般都可以忽略
+                }
+            }
+        }
+
+    }
+
+    /**
+     * MD5校验字符串
+     *
+     * @param s String to be MD5
+     * @return 'null' if cannot get MessageDigest
+     */
+    @NonNull
+    public static String getStringMD5(@NonNull String s) {
+        MessageDigest mdInst;
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            mdInst = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return "";
+        }
+
+        byte[] btInput = s.getBytes();
+        // 使用指定的字节更新摘要
+        mdInst.update(btInput);
+        // 获得密文
+        byte[] md = mdInst.digest();
+        // 把密文转换成十六进制的字符串形式
+        int length = md.length;
+        char str[] = new char[length * 2];
+        int k = 0;
+        for (byte b : md) {
+            str[k++] = hexDigits[b >>> 4 & 0xf];
+            str[k++] = hexDigits[b & 0xf];
+        }
+        return new String(str);
+    }
+
+    @NonNull
+    private static String getSubStr(@NonNull String str, int subNu, char replace) {
+        int length = str.length();
+        if (length > subNu) {
+            str = str.substring(length - subNu, length);
+        } else if (length < subNu) {
+            // NOTE: padding字符填充在字符串的右侧，和服务器的算法是一致的
+            str += createPaddingString(subNu - length, replace);
+        }
+        return str;
+    }
+
+    @NonNull
+    private static String createPaddingString(int n, char pad) {
+        if (n <= 0) {
+            return "";
+        }
+
+        char[] paddingArray = new char[n];
+        Arrays.fill(paddingArray, pad);
+        return new String(paddingArray);
+    }
+
+    /**
+     * 计算MD5校验
+     *
+     * @param buffer
+     * @return 空串，如果无法获得 MessageDigest实例
+     */
+    @NonNull
+    private static String MD5(ByteBuffer buffer) {
+        String s = "";
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(buffer);
+            byte tmp[] = md.digest(); // MD5 的计算结果是一个 128 位的长整数，
+            // 用字节表示就是 16 个字节
+            char str[] = new char[16 * 2]; // 每个字节用 16 进制表示的话，使用两个字符，
+            // 所以表示成 16 进制需要 32 个字符
+            int k = 0; // 表示转换结果中对应的字符位置
+            for (int i = 0; i < 16; i++) { // 从第一个字节开始，对 MD5 的每一个字节
+                // 转换成 16 进制字符的转换
+                byte byte0 = tmp[i]; // 取第 i 个字节
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf]; // 取字节中高 4 位的数字转换, >>>,
+                // 逻辑右移，将符号位一起右移
+                str[k++] = hexDigits[byte0 & 0xf]; // 取字节中低 4 位的数字转换
+            }
+            s = new String(str); // 换后的结果转换为字符串
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
+}
+