1 优化电源白名单与GPS权限在安卓6.0以下的判断逻辑

2 修改赛事详情页各项权限被用户拒绝后的处理逻辑 3 用户赛事详情页及路径工具详情页增加二级标题显示 4 修改用户赛事详情页以及路径工具中的赛事详情页为网页图文展示方式 5 实现卡路里相关数据计算 6 优化起点终点相同时,点击开始会提示结束弹框的问题 7 修复当字体调到最大时,赛事结束页UI显示异常问题 8 修复部分机型在赛事结束页中相关提示标签遮挡问题 9 修复在无网络切换到有网时,赛事详情页小概率消失问题

1 优化电源白名单与GPS权限在安卓6.0以下的判断逻辑
2 修改赛事详情页各项权限被用户拒绝后的处理逻辑 3 用户赛事详情页及路径工具详情页增加二级标题显示 4 修改用户赛事详情页以及路径工具中的赛事详情页为网页图文展示方式 5 实现卡路里相关数据计算 6 优化起点终点相同时,点击开始会提示结束弹框的问题 7 修复当字体调到最大时,赛事结束页UI显示异常问题 8 修复部分机型在赛事结束页中相关提示标签遮挡问题 9 修复在无网络切换到有网时,赛事详情页小概率消失问题
杨帅
1 parent 85acdb87
Showing 54 changed files with 1959 additions and 162 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
app/src/main/res/layout/activity_main.xml
build.gradle
moudle_pedometer/build.gradle
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/service/CalorieService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/utils/CalorieUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.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/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/MyRecordInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunLineInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
@@ -2,6 +2,7 @@ package com.example.modulepedometer;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.View;
@@ -13,11 +14,13 @@ import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
 import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
 import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
 import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.calorie.service.CalorieService;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
@@ -54,6 +57,13 @@ public class MainActivity extends AppCompatActivity {
             }
         });
+        findViewById(R.id.tool3).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, CalorieService.class);
+                ContextCompat.startForegroundService(MainActivity.this, intent);            }
+        });
+
 //        MyMapUtil.getGeoCoderResult(new LatLng(39.934805, 116.308686), new MyMapUtil.GeoCodeResult() {
 //            @Override
 //            public void success(String address) {
@@ -27,4 +27,11 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:text="我的记录" />
+
+    <Button
+        android:id="@+id/tool3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="卡路里" />
 </LinearLayout>
 \ No newline at end of file
@@ -44,8 +44,8 @@ task clean(type: Delete) {
 ext {
     def versionMajor = 1
-    def versionMinor = 0
-    def versionPatch = 0
+    def versionMinor = 6
+    def versionPatch = 1
     def versionBuild = 0
     // module依赖库公共版本号
     versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
@@ -106,4 +106,6 @@ ext {
     //视频库
     libVideoQiniu = '1.0.6'
     libMediaPicker = '1.5.1'
+    //loading动画
+    avi='2.1.3'
 }
@@ -111,7 +111,7 @@ dependencies {
     implementation project(':library_baidumap')
     //加载动画
-    implementation 'com.wang.avi:library:2.1.3'
+    implementation "com.wang.avi:library:$rootProject.avi"
     implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
     //七牛上传
     implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
@@ -253,6 +253,14 @@
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
+        <!--************************************************卡路里**********************************************-->
+
+        <service
+            android:name="com.cnlive.moudle.calorie.service.CalorieService"
+            android:enabled="true"
+            android:exported="true"
+            android:priority="1000"
+            android:process=":alive" />
     </application>
 </manifest>
 \ No newline at end of file
+package com.cnlive.moudle.calorie.service;
+
+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.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Binder;
+import android.os.Build;
+import android.os.CountDownTimer;
+import android.os.Handler;
+import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.Trace;
+import com.baidu.trace.api.track.LatestPoint;
+import com.baidu.trace.api.track.LatestPointResponse;
+import com.baidu.trace.api.track.OnTrackListener;
+import com.baidu.trace.model.LocationMode;
+import com.baidu.trace.model.OnTraceListener;
+import com.baidu.trace.model.PushMessage;
+import com.baidu.trace.model.StatusCodes;
+import com.cnlive.moudle.calorie.utils.CalorieUtil;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
+import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.model.step.StepCount;
+import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
+import com.cnlive.moudle.pedometer.sql.db.DbCore;
+import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
+import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.utils.ServiceUtils;
+import com.example.moudle_pedometer.R;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 计算卡路里
+ *
+ * @author ShinnyYang
+ */
+public class CalorieService extends Service implements SensorEventListener {
+
+    private String TAG = "CalorieService";
+    /**
+     * 通知栏相关
+     */
+    private String CHANNEL_ONE_ID = "com.cnlive.calorie";
+    private String CHANNEL_ONE_NAME = "calorie";
+    private NotificationManager mNM;
+    private Notification notification = null;
+    private RemoteViews remoteViews;
+    /**
+     * 默认为30秒进行一次存储
+     */
+    private static int duration = 30 * 1000;
+    /**
+     * 当前的日期
+     */
+    private static String CURRENT_DATE = "";
+    /**
+     * 传感器管理对象
+     */
+    private SensorManager sensorManager;
+    /**
+     * 广播接受者
+     */
+    private BroadcastReceiver mBatInfoReceiver;
+    /**
+     * 保存记步计时器
+     */
+    private static TimeCount time;
+    /**
+     * 当前所走的步数
+     */
+    private int CURRENT_STEP = 0;
+    /**
+     * 计步传感器类型  Sensor.TYPE_STEP_COUNTER或者Sensor.TYPE_STEP_DETECTOR
+     */
+    private static int stepSensorType = -1;
+    /**
+     * 每次第一次启动记步服务时是否从系统中获取了已有的步数记录
+     */
+    private boolean hasRecord = false;
+    /**
+     * 系统中获取到的已有的步数
+     */
+    private int hasStepCount = 0;
+    /**
+     * 上一次的步数
+     */
+    private int previousStepCount = 0;
+    /**
+     * 加速度传感器中获取的步数
+     */
+    private StepCount mStepCount;
+    /**
+     * IBinder对象，向Activity传递数据的桥梁
+     */
+    private CalorieService.StepBinder stepBinder = new CalorieService.StepBinder();
+    private String userId;
+    private final int NOTIFICATION_ID = 106;
+    private boolean isStartForeground = false;
+
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        init();
+//        initBroadcastReceiver();
+//        if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.CollKeepLiveService")) {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//                startForegroundService(new Intent(getApplicationContext(), CollKeepLiveService.class));
+//            } else {
+//                startService(new Intent(getApplicationContext(), CollKeepLiveService.class));
+//            }
+//        }
+        showStartForegroundNotification();
+    }
+
+    private static int retryIndex = 0;
+
+    private void initTrace() {
+        Log.e(TAG, "initTrace: ");
+
+
+    }
+
+
+    @SuppressLint("WrongConstant")
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this);
+        }
+        userId = CommonInfo.getUserId(getApplicationContext());
+        if (userId != null && !TextUtils.isEmpty(userId)) {
+            //初始化数据库
+            initTodayData(userId);
+            initTrace();
+            //显示计步通知
+            showStartForegroundNotification();
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    startStepDetector();
+                }
+            }).start();
+            startTimeCount();
+        } else {
+            EventBus.getDefault().post(new MessageEvent(Constant.START_TRACE_GATHER_FAIL, ""));
+        }
+
+        flags = START_STICKY;
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    private void init() {
+        if (null == mNM) {
+            mNM = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        }
+    }
+
+
+    private void showStartForegroundNotification() {
+        if (null == remoteViews) {
+            remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
+        }
+        NotificationChannel channel = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            channel = new NotificationChannel(CHANNEL_ONE_ID, CHANNEL_ONE_NAME,
+                    NotificationManager.IMPORTANCE_HIGH);
+            channel.enableLights(false);
+            channel.setSound(null, null);
+            channel.enableVibration(false);
+            channel.setVibrationPattern(new long[]{0});
+            channel.setSound(null, null);
+            mNM.createNotificationChannel(channel);
+        }
+
+
+//        Intent notificationIntent = new Intent(this, CollRunningMapActivity.class);
+        notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
+//                .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setCustomContentView(remoteViews)
+                .setContentTitle(getResources().getString(R.string.app_name))
+                .setContentText(getResources().getString(R.string.step_service_tip))
+                .setCategory(Notification.CATEGORY_SERVICE)
+                .setSound(null)
+                .setWhen(System.currentTimeMillis())
+                .build();
+        //设置步数
+        remoteViews.setTextViewText(R.id.tv_step_count, CURRENT_STEP + "");
+        remoteViews.setTextViewText(R.id.tv_calorie, CalorieUtil.getCalorie(CURRENT_STEP) + "");
+        //设置卡路里
+        startForeground(NOTIFICATION_ID, notification);
+        isStartForeground = true;
+
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+
+//        return stepBinder;
+        return null;
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (isStartForeground) {
+            //取消前台进程
+            stopForeground(true);
+        }
+        if (mBatInfoReceiver != null) {
+            unregisterReceiver(mBatInfoReceiver);
+        }
+        if (EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this);
+        }
+        hasStepCount = 0;
+        hasRecord = false;
+        CURRENT_STEP = 0;
+        previousStepCount = 0;
+        if (sensorManager != null) {
+            sensorManager.unregisterListener(CalorieService.this);
+            sensorManager = null;
+        }
+        stepSensorType = -1;
+        time = null;
+    }
+
+    //接收事件
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    public void Event(MessageEvent messageEvent) {
+//        //暂停计步
+//        if (messageEvent.getMessageType() == Constant.SERVICE_STEP_COUNT_PAUSE) {
+//            pauseFlag = true;
+//        }
+//        //继续计步
+//        else if (messageEvent.getMessageType() == Constant.SERVICE_STEP_COUNT_CONTINUE) {
+//            pauseFlag = false;
+//        }
+
+        //更新锁屏步数
+        if (messageEvent.getMessageType() == Constant.COLL_SERVICE_STEP_COUNT_ONRESUME) {
+            updateNotification();
+        }
+
+    }
+
+    /**
+     * 发送重启广播
+     */
+    private void sendRestartBroadCast() {
+        Intent intent = new Intent(" com.cnlive.moudle.pedometer.receivers.MyReceiver");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            intent.setComponent(new ComponentName(getPackageName(), " com.cnlive.moudle.pedometer.receivers.MyReceiver"));//高版本Android发送广播需要加这句
+        }
+        sendBroadcast(intent);
+    }
+
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int i) {
+
+    }
+
+    /**
+     * @获取默认的pendingIntent,为了防止2.3及以下版本报错
+     * @flags属性: 在顶部常驻:Notification.FLAG_ONGOING_EVENT
+     * 点击去除： Notification.FLAG_AUTO_CANCEL
+     */
+    public PendingIntent getDefalutIntent(int flags) {
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 1, new Intent(), flags);
+        return pendingIntent;
+    }
+
+    /**
+     * 获取当天日期
+     *
+     * @return
+     */
+    private String getTodayDate() {
+        Date date = new Date(System.currentTimeMillis());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    /**
+     * 初始化当天的步数
+     */
+    private void initTodayData(String userId) {
+        CURRENT_DATE = getTodayDate();
+        if (userId == null || CURRENT_DATE == null) {
+            return;
+        }
+        //获取当天的数据，用于展示 CURRENT_DATE
+        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, getTodayDate());
+        if (null == calorieEntity) {
+            CURRENT_STEP = 0;
+        } else {
+            if (calorieEntity.getStep() != null && !TextUtils.isEmpty(calorieEntity.getStep())) {
+                CURRENT_STEP = Integer.parseInt(calorieEntity.getStep());
+            }
+        }
+//        Log.e(TAG, "initTodayData: 初始化当前步数" + CURRENT_STEP);
+        if (mStepCount != null) {
+            mStepCount.setSteps(CURRENT_STEP);
+        }
+        updateNotification();
+    }
+
+    private void updateNotification() {
+        save();
+        showStartForegroundNotification();
+//        Log.e(TAG, "updateNotification: 当前步数:" + CURRENT_STEP);
+        EventBus.getDefault().post(new MessageEvent(Constant.COLL_SERVICE_STEP_COUNT_UPDATE, CURRENT_STEP));
+//        remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
+//        NotificationChannel channel = null;
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+//            channel = new NotificationChannel(CHANNEL_ONE_ID, CHANNEL_ONE_NAME,
+//                    NotificationManager.IMPORTANCE_HIGH);
+//            channel.enableLights(false);
+//            channel.setSound(null, null);
+//            channel.enableVibration(false);
+//            channel.setVibrationPattern(new long[]{0});
+//            channel.setSound(null, null);
+//            mNM.createNotificationChannel(channel);
+//        }
+//        Intent notificationIntent = new Intent(this, CollPedometerMainActivity.class);
+//        notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
+//                .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
+//                .setSmallIcon(R.mipmap.ic_launcher)
+//                .setCustomContentView(remoteViews)
+//                .setSound(null)
+//                .setCategory(Notification.CATEGORY_SERVICE)
+//                .setWhen(System.currentTimeMillis())
+//                .build();
+//        remoteViews.setTextViewText(R.id.tv_step_count, CURRENT_STEP + "");
+//        remoteViews.setChronometer(R.id.ch, aa, null, true);
+//
+//        mNM.notify(1, notification);
+    }
+
+
+//    private void updateNotification(long i) {
+//        remoteViews = new RemoteViews(getPackageName(), R.layout.custom_step_notification);
+//        NotificationChannel channel = null;
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+//            channel = new NotificationChannel(CHANNEL_ONE_ID, CHANNEL_ONE_NAME,
+//                    NotificationManager.IMPORTANCE_HIGH);
+//            channel.enableLights(false);
+//            channel.setSound(null, null);
+////            channel.setLightColor(getColor(R.color.colorPrimary));
+//            channel.enableVibration(false);
+//            channel.setVibrationPattern(new long[]{0});
+//            channel.setSound(null, null);
+//            mNM.createNotificationChannel(channel);
+//        }
+//
+//        Intent notificationIntent = new Intent(this, CollPedometerMainActivity.class);
+//        notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
+//                .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
+//                .setSmallIcon(R.mipmap.ic_launcher)
+////                .setContentText("前台服务正在运行")
+////                .setContentTitle("标题")
+//                .setCustomContentView(remoteViews)
+//                .setSound(null)
+//                .setWhen(System.currentTimeMillis())
+//                .build();
+//        remoteViews.setTextViewText(R.id.tv_time, getFormatHMS(i));
+//        remoteViews.setTextViewText(R.id.tv_step_count, CURRENT_STEP + "");
+//        mNM.notify(1, notification);
+//    }
+
+    /**
+     * 注册广播
+     */
+    private void initBroadcastReceiver() {
+        final IntentFilter filter = new IntentFilter();
+        // 屏幕灭屏广播
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
+        //关机广播
+        filter.addAction(Intent.ACTION_SHUTDOWN);
+        // 屏幕亮屏广播
+        filter.addAction(Intent.ACTION_SCREEN_ON);
+        // 屏幕解锁广播
+//        filter.addAction(Intent.ACTION_USER_PRESENT);
+        // 当长按电源键弹出“关机”对话或者锁屏时系统会发出这个广播
+        // example：有时候会用到系统对话框，权限可能很高，会覆盖在锁屏界面或者“关机”对话框之上，
+        // 所以监听这个广播，当收到时就隐藏自己的对话，如点击pad右下角部分弹出的对话框
+        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        //监听日期变化
+        filter.addAction(Intent.ACTION_DATE_CHANGED);
+        filter.addAction(Intent.ACTION_TIME_CHANGED);
+        filter.addAction(Intent.ACTION_TIME_TICK);
+        filter.addAction("close.CollStepService");
+        mBatInfoReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(final Context context, final Intent intent) {
+                String action = intent.getAction();
+                if (Intent.ACTION_SCREEN_ON.equals(action)) {
+                    startStepDetector();
+                    Log.d(TAG, "screen on");
+                } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
+                    startStepDetector();
+                    Log.d(TAG, "screen off");
+                    //改为60秒一存储
+                    duration = 60000;
+                } else if (Intent.ACTION_USER_PRESENT.equals(action)) {
+                    Log.d(TAG, "screen unlock");
+                    save();
+                    //改为30秒一存储
+                    duration = 30000;
+                } else if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {
+                    Log.i(TAG, " receive Intent.ACTION_CLOSE_SYSTEM_DIALOGS");
+                    //保存一次
+                    save();
+                } else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) {
+                    Log.i(TAG, " receive ACTION_SHUTDOWN");
+                    save();
+                } else if (Intent.ACTION_DATE_CHANGED.equals(action)) {//日期变化步数重置为0
+//                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
+                    save();
+                    isNewDay();
+                } else if (Intent.ACTION_TIME_CHANGED.equals(action)) {
+                    //时间变化步数重置为0
+//                    isCall();
+                    save();
+                    isNewDay();
+                } else if (Intent.ACTION_TIME_TICK.equals(action)) {//日期变化步数重置为0
+//                    isCall();
+//                    Logger.d("重置步数" + StepDcretor.CURRENT_STEP);
+                    save();
+                    isNewDay();
+                } else if ("close.CollStepService".equals(action)) {
+                    Log.e("关闭StepService", "关闭");
+                    onDestroy();
+                    stopSelf();
+                }
+            }
+        };
+        registerReceiver(mBatInfoReceiver, filter);
+    }
+
+    /**
+     * 获取当前步数
+     *
+     * @return
+     */
+    public int getStepCount() {
+        return CURRENT_STEP;
+    }
+
+    /**
+     * 监听晚上0点变化初始化数据
+     */
+    private void isNewDay() {
+        String time = "00:00";
+        CalorieEntity calorieEntity = new CalorieEntity();
+        calorieEntity.setUuid(CalorieUtil.getUUID());
+        calorieEntity.setUserId(userId);
+        calorieEntity.setCurrentDate(getTodayDate());
+        CalorieUtil.insertData(getApplicationContext(), calorieEntity);
+        if (time.equals(new SimpleDateFormat("HH:mm").format(new Date())) || !CURRENT_DATE.equals(getTodayDate())) {
+            initTodayData(userId);
+        }
+    }
+
+//    /**
+//     * 监听时间变化提醒用户锻炼
+//     */
+//    private void isCall() {
+//        String time = this.getSharedPreferences("share_date", Context.MODE_MULTI_PROCESS).getString("achieveTime", "21:00");
+//        String plan = this.getSharedPreferences("share_date", Context.MODE_MULTI_PROCESS).getString("planWalk_QTY", "7000");
+//        String remind = this.getSharedPreferences("share_date", Context.MODE_MULTI_PROCESS).getString("remind", "1");
+//        Logger.d("time=" + time + "\n" +
+//                "new SimpleDateFormat(\"HH: mm\").format(new Date()))=" + new SimpleDateFormat("HH:mm").format(new Date()));
+//        if (("1".equals(remind)) &&
+//                (CURRENT_STEP < Integer.parseInt(plan)) &&
+//                (time.equals(new SimpleDateFormat("HH:mm").format(new Date())))
+//        ) {
+//            remindNotify();
+//        }
+//
+//    }
+    /**
+     * 提醒锻炼通知栏
+     */
+//    private void remindNotify() {
+//
+//        //设置点击跳转
+//        Intent hangIntent = new Intent(this, MainActivity.class);
+//        PendingIntent hangPendingIntent = PendingIntent.getActivity(this, 0, hangIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+//
+//        String plan = this.getSharedPreferences("share_date", Context.MODE_MULTI_PROCESS).getString("planWalk_QTY", "7000");
+//        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(this);
+//        mBuilder.setContentTitle("今日步数" + CURRENT_STEP + " 步")
+//                .setContentText("距离目标还差" + (Integer.valueOf(plan) - CURRENT_STEP) + "步，加油！")
+//                .setContentIntent(hangPendingIntent)
+//                .setTicker(getResources().getString(R.string.app_name) + "提醒您开始锻炼了")//通知首次出现在通知栏，带上升动画效果的
+//                .setWhen(System.currentTimeMillis())//通知产生的时间，会在通知信息里显示
+//                .setPriority(Notification.PRIORITY_DEFAULT)//设置该通知优先级
+//                .setAutoCancel(true)//设置这个标志当用户单击面板就可以让通知将自动取消
+//                .setOngoing(false)//ture，设置他为一个正在进行的通知。他们通常是用来表示一个后台任务,用户积极参与(如播放音乐)或以某种方式正在等待,因此占用设备(如一个文件下载,同步操作,主动网络连接)
+//                .setDefaults(Notification.DEFAULT_VIBRATE | Notification.DEFAULT_SOUND)//向通知添加声音、闪灯和振动效果的最简单、最一致的方式是使用当前的用户默认设置，使用defaults属性，可以组合：
+//                //Notification.DEFAULT_ALL  Notification.DEFAULT_SOUND 添加声音 // requires VIBRATE permission
+//                .setSmallIcon(R.mipmap.logo);
+//        NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+//        mNotificationManager.notify(notify_remind_id, mBuilder.build());
+//    }
+
+    /**
+     * 获取传感器实例
+     */
+    private void startStepDetector() {
+        if (sensorManager != null) {
+            sensorManager = null;
+        }
+        // 获取传感器管理器的实例
+        sensorManager = (SensorManager) this
+                .getSystemService(SENSOR_SERVICE);
+        //android4.4以后可以使用计步传感器
+        int VERSION_CODES = Build.VERSION.SDK_INT;
+        if (VERSION_CODES >= 19) {
+            sensorManager.unregisterListener(CalorieService.this);
+            //注册传感器,传感器监听器的注册导致传感器电源又重新开启
+            addCountStepListener();
+        } else {
+            addBasePedometerListener();
+        }
+    }
+
+    /**
+     * 停止传感器
+     */
+    private void stopStepDetector() {
+        if (sensorManager != null) {
+            sensorManager = null;
+        }
+        // 获取传感器管理器的实例
+        sensorManager = (SensorManager) this
+                .getSystemService(SENSOR_SERVICE);
+        //android4.4以后可以使用计步传感器
+        sensorManager.unregisterListener(CalorieService.this);
+    }
+
+    /**
+     * 添加传感器监听
+     * 1. TYPE_STEP_COUNTER API的解释说返回从开机被激活后统计的步数，当重启手机后该数据归零，
+     * 该传感器是一个硬件传感器所以它是低功耗的。
+     * 为了能持续的计步，请不要反注册事件，就算手机处于休眠状态它依然会计步。
+     * 当激活的时候依然会上报步数。该sensor适合在长时间的计步需求。
+     * <p>
+     * 2.TYPE_STEP_DETECTOR翻译过来就是走路检测，
+     * API文档也确实是这样说的，该sensor只用来监监测走步，每次返回数字1.0。
+     * 如果需要长事件的计步请使用TYPE_STEP_COUNTER。
+     */
+    private void addCountStepListener() {
+        Sensor countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER);
+        Sensor detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR);
+        if (countSensor != null) {
+            stepSensorType = Sensor.TYPE_STEP_COUNTER;
+            Log.v(TAG, "Sensor.TYPE_STEP_COUNTER");
+            sensorManager.registerListener(CalorieService.this, countSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        } else if (detectorSensor != null) {
+            stepSensorType = Sensor.TYPE_STEP_DETECTOR;
+            Log.v(TAG, "Sensor.TYPE_STEP_DETECTOR");
+            sensorManager.registerListener(CalorieService.this, detectorSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        } else {
+            Log.v(TAG, "Count sensor not available!");
+            addBasePedometerListener();
+        }
+    }
+
+    /**
+     * 通过加速度传感器来记步
+     */
+    private void addBasePedometerListener() {
+        mStepCount = new StepCount();
+        mStepCount.setSteps(CURRENT_STEP);
+        // 获得传感器的类型，这里获得的类型是加速度传感器
+        // 此方法用来注册，只有注册过才会生效，参数：SensorEventListener的实例，Sensor的实例，更新速率
+        Sensor sensor = sensorManager
+                .getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        boolean isAvailable = sensorManager.registerListener(mStepCount.getStepDetector(), sensor,
+                SensorManager.SENSOR_DELAY_UI);
+        mStepCount.initListener(new StepValuePassListener() {
+            @Override
+            public void stepChanged(int steps) {
+                CURRENT_STEP = steps;
+                updateNotification();
+            }
+        });
+        if (isAvailable) {
+            Log.e(TAG, "加速度传感器可以使用");
+        } else {
+            Log.e(TAG, "加速度传感器无法使用");
+        }
+    }
+
+    /**
+     * 传感器监听回调
+     * 记步的关键代码
+     * 1. TYPE_STEP_COUNTER API的解释说返回从开机被激活后统计的步数，当重启手机后该数据归零，
+     * 该传感器是一个硬件传感器所以它是低功耗的。
+     * 为了能持续的计步，请不要反注册事件，就算手机处于休眠状态它依然会计步。
+     * 当激活的时候依然会上报步数。该sensor适合在长时间的计步需求。
+     * <p>
+     * 2.TYPE_STEP_DETECTOR翻译过来就是走路检测，
+     * API文档也确实是这样说的，该sensor只用来监监测走步，每次返回数字1.0。
+     * 如果需要长事件的计步请使用TYPE_STEP_COUNTER。
+     *
+     * @param event
+     */
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        //没有暂停
+        if (stepSensorType == Sensor.TYPE_STEP_COUNTER) {
+            //获取当前传感器返回的临时步数
+            int tempStep = (int) event.values[0];
+//            Log.e(TAG, "onSensorChanged: 第一次,tempStep:" + tempStep + "lastStep:" + lastStep + ",previousStepCount" + previousStepCount + ",CURRENT_STEP" + CURRENT_STEP);
+            //首次如果没有获取手机系统中已有的步数则获取一次系统中APP还未开始记步的步数
+            if (!hasRecord) {
+                hasRecord = true;
+                hasStepCount = tempStep;
+                previousStepCount = 0;
+            } else {
+                //获取APP打开到现在的总步数=本次系统回调的总步数-APP打开之前已有的步数
+//                    Log.e(TAG, "tempStep: " + tempStep + ",hasStepCount:" + hasStepCount);
+                int thisStepCount = tempStep - hasStepCount;
+//                    Log.e(TAG, "onSensorChanged: thisStepCount" + thisStepCount);
+                //本次有效步数=（APP打开后所记录的总步数-上一次APP打开后所记录的总步数）
+                int thisStep = thisStepCount - previousStepCount;
+                //记录最后一次APP打开到现在的总步数
+                previousStepCount = thisStepCount;
+//                    Log.e(TAG, "onSensorChanged: CURRENT_STEP" + CURRENT_STEP);
+                if (CURRENT_STEP < 0) {
+                    CURRENT_STEP = -CURRENT_STEP;
+                }
+                //总步数=现有的步数+本次有效步数
+                CURRENT_STEP += (thisStep);
+            }
+        } else if (stepSensorType == Sensor.TYPE_STEP_DETECTOR) {
+            if (event.values[0] == 1.0) {
+                CURRENT_STEP++;
+            }
+        }
+        //如果没有暂停就更新计步器
+        updateNotification();
+
+    }
+
+    /**
+     * 保存记步数据
+     */
+    private void save() {
+        int tempStep = CURRENT_STEP;
+        CalorieEntity calorieEntity = CalorieUtil.getUserCalorieData(getApplicationContext(), userId, getTodayDate());
+        if (null == calorieEntity) {
+            calorieEntity = new CalorieEntity();
+            calorieEntity.setUserId(userId);
+            calorieEntity.setStep(tempStep + "");
+            CalorieUtil.insertData(getApplicationContext(), calorieEntity);
+        } else {
+            calorieEntity.setStep(tempStep + "");
+            CalorieUtil.updateData(getApplicationContext(), calorieEntity);
+        }
+    }
+
+
+    /**
+     * 保存记步数据
+     */
+    class TimeCount extends CountDownTimer {
+        public TimeCount(long millisInFuture, long countDownInterval) {
+            super(millisInFuture, countDownInterval);
+        }
+
+        @Override
+        public void onFinish() {
+            // 如果计时器正常结束，则开始计步
+            if (null != time) {
+                time.cancel();
+                save();
+                startTimeCount();
+            }
+        }
+
+        @Override
+        public void onTick(long millisUntilFinished) {
+
+        }
+
+    }
+
+    /**
+     * 根据行走步数,计算大概行走具体
+     * 单位:公里
+     * 1步的距离大概是60厘米。
+     * 1万多步，距离大概就是600000厘米，即6000米（6公里）
+     *
+     * @param step
+     * @return
+     */
+    private double getWalkDistance(long step) {
+        double result = step * 60.0 / 100.0 / 1000.0;
+        return result;
+    }
+
+    /**
+     * 开始保存记步数据
+     */
+    private void startTimeCount() {
+        if (time == null) {
+            time = new TimeCount(duration, 1000);
+        }
+        time.start();
+    }
+
+    /**
+     * 向Activity传递数据的纽带
+     */
+    public class StepBinder extends Binder {
+
+        /**
+         * 获取当前service对象
+         *
+         * @return CollStepService
+         */
+        public CalorieService getService() {
+            return CalorieService.this;
+        }
+    }
+
+    /**
+     * 根据毫秒返回时分秒
+     *
+     * @param time
+     * @return
+     */
+    public String getFormatHMS(long time) {
+        time = time / 1000;//总秒数
+        int s = (int) (time % 60);//秒
+        int m = (int) (time / 60) % 60;//分
+        int h = (int) (time / 3600) % 60;//小时
+        return String.format("%02d:%02d:%02d", h, m, s);
+    }
+
+
+}
+package com.cnlive.moudle.calorie.utils;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.db.DbCore;
+import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 卡路里相关
+ *
+ * @author ShinnyYang
+ */
+public class CalorieUtil {
+    private static final String TAG = "CalorieUtil";
+    private static final String dbName = "Step.db";
+
+    public static String getUUID() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    public synchronized static void updateData(Context context, CalorieEntity calorieEntity) {
+        try {
+            if (null != calorieEntity) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCalorieEntityDao().update(calorieEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "initDataBase: " + e.toString());
+        }
+
+    }
+
+    public synchronized static void insertData(Context context, CalorieEntity calorieEntity) {
+        try {
+            if (null != calorieEntity) {
+                DbCore.init(context, dbName);
+                DbCore.getDaoSession().getCalorieEntityDao().insert(calorieEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "initDataBase: " + e.toString());
+        }
+
+    }
+
+    public synchronized static void initDataBase(Context context, String uid, String currentDate) {
+        try {
+            if (null == getUserCalorieData(context, uid, currentDate)) {
+                DbCore.init(context, dbName);
+                CalorieEntity calorieEntity = new CalorieEntity();
+                calorieEntity.setUuid(getUUID());
+                calorieEntity.setUserId(uid);
+                calorieEntity.setCurrentDate(getTodayDate());
+                DbCore.getDaoSession().getCalorieEntityDao().insert(calorieEntity);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "initDataBase: " + e.toString());
+        }
+
+    }
+
+    /**
+     * 获取用户数据
+     *
+     * @param context
+     * @param uid
+     * @return
+     */
+    public synchronized static CalorieEntity getUserCalorieData(Context context, String uid, String currentDate) {
+        try {
+            if (!TextUtils.isEmpty(uid)) {
+                DbCore.init(context, dbName);
+                List<CalorieEntity> list = DbCore.getDaoSession().getCalorieEntityDao().queryBuilder().where(CalorieEntityDao.Properties.UserId.eq(uid), CalorieEntityDao.Properties.CurrentDate.eq(currentDate)).list();
+                if (list != null && list.size() > 0) {
+                    return list.get(0);
+                } else {
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "getUserCalorieData: " + e.toString());
+            return null;
+        }
+
+    }
+
+    /**
+     * 获取当天日期
+     *
+     * @return
+     */
+    public static String getTodayDate() {
+        Date date = new Date(System.currentTimeMillis());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    /**
+     * 根据行走步数,计算大概行走具体
+     * 单位:公里
+     * 1步的距离大概是60厘米。
+     * 1万多步，距离大概就是600000厘米，即6000米（6公里）
+     *
+     * @param step
+     * @return
+     */
+    public static double getWalkDistanceKM(double step) {
+        double result = step * 60.0 / 100.0 / 1000.0;
+        result = Double.parseDouble(String.format("%1.2f", result));
+        return result;
+    }
+
+    public static double getCalorie(double step) {
+//        体重（kg）* 距离（km）* 运动系数（k）
+//        健走：k=0.8214
+//
+//跑步：k=1.036
+//
+//自行车：k=0.6142
+//
+//轮滑、溜冰：k=0.518
+//
+//室外滑雪：k=0.888
+        double result =60 * getWalkDistanceKM(step) * 1.036;
+        result = Double.parseDouble(String.format("%1.2f", result));
+        return result;
+    }
+}
@@ -7,10 +7,14 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 import android.widget.Toast;
 import com.baidu.location.BDAbstractLocationListener;
@@ -54,6 +58,7 @@ import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.moudle.pedometer.utils.WebViewUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -98,6 +103,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     private float initZoom = 0;
     private final float INIT_MAP_OVERLOOK = -40f;//地图倾斜角度
     private final float DEFAULT_MAP_AUTO_ZOOM = -0.8f;//根据点位,自动缩放的比例
+    public WebView webView;
     public CollRunRaceDetailFragmentView(CollRunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -107,6 +113,30 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         return fragment == null ? null : fragment.getActivity();
     }
+    public void initWebView(String html) {
+        if (null == webView) {
+            webView = new WebView(getContext());
+            WebSettings webSettings = webView.getSettings();
+            if (Build.VERSION.SDK_INT >= 21) {
+                webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+            }
+            // 设置支持javascript脚本
+            webSettings.setJavaScriptEnabled(true);
+            // 设置此属性，可任意比例缩放
+            webSettings.setUseWideViewPort(true);
+            // 设置不出现缩放工具
+            webSettings.setBuiltInZoomControls(false);
+            // 设置不可以缩放
+            webSettings.setSupportZoom(false);
+            webSettings.setDisplayZoomControls(false);
+            //自适应屏幕
+            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);
+            // 自适应 屏幕大小界面
+            webSettings.setLoadWithOverviewMode(true);
+        }
+        WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
+        fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
+    }
     public void initView(RunRaceDetailInfo runRaceDetailInfo, String uid) {
         queryResultPoints = new ArrayList<>();
@@ -116,6 +146,13 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (null == mClient) {
             mClient = new LBSTraceClient(getContext());
         }
+        if (null != runRaceDetailInfo) {
+            if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
+                initWebView(runRaceDetailInfo.getNewDescription());
+            } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+                initWebView(runRaceDetailInfo.getDescription());
+            }
+        }
         CollCommonInfo.setUserId(getContext(), uid);
         this.runRaceDetailInfo = runRaceDetailInfo;
         //显示地图
@@ -175,31 +212,50 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
         }
-
+        //设置二级标题
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+            fragment.binding.includeStreet.tvSecondTitle.setVisibility(View.VISIBLE);
+            fragment.binding.includeStreet.tvSecondTitle.setText(runRaceDetailInfo.getE_subtitle());
+        }
         //判断是否显示绑定轨迹按钮
         if (runRaceDetailInfo.isTrackButton()) {
             //显示
             fragment.binding.rlScrollViewAddTrace.setVisibility(View.VISIBLE);
             fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
 //        //根据标题行数,自动调整卡片大小
-            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                @Override
-                public boolean onPreDraw() {
-                    int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
-                    int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
-                    if (line > 1) {
-                        int avgHeight = height / line;//平局高度
-                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140) + avgHeight * (line - 1));
-
-                    }
-                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-                    return false;
-                }
-            });
+//            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+//                @Override
+//                public boolean onPreDraw() {
+//                    int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
+//                    int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
+//                    if (line > 1) {
+//                        int avgHeight = height / line;//平局高度
+//                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140) + avgHeight * (line - 1));
+//
+//                    }
+//                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+//                    return false;
+//                }
+//            });
+            //显示底部滑动卡片
+            fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            fragment.binding.scrollView.scrollTo(0, 0);
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 170));
+            } else {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
+            }
         } else {
             //不显示
             fragment.binding.rlScrollViewAddTrace.setVisibility(View.GONE);
-            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 100));
+            //显示底部滑动卡片
+            fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            fragment.binding.scrollView.scrollTo(0, 0);
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 130));
+            } else {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 100));
+            }
 //        //根据标题行数,自动调整卡片大小
             fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
                 @Override
@@ -290,9 +346,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         }
         //设置路线介绍
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
-        }
+//        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+//            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+//        }
         //添加轨迹按钮点击事件
         fragment.binding.rlScrollViewAddTrace.setOnClickListener(new View.OnClickListener() {
@@ -630,6 +686,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (mMapView != null) {
             mMapView.onResume();
         }
+        if (null != webView) {
+            webView.onResume();
+        }
     }
     public void onPause() {
@@ -639,6 +698,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (mMapView != null) {
             mMapView.onPause();
         }
+        if (null != webView) {
+            webView.onPause();
+        }
     }
     public void onDestroy() {
@@ -652,6 +714,15 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (mLocClient != null) {
             mLocClient.stop();
         }
+        try {
+            if (null != webView) {
+                if (webView.getParent() != null) {
+                    ((ViewGroup) webView.getParent()).removeView(webView);
+                }
+                webView.destroy();
+            }
+        } catch (Exception e) {
+        }
     }
     /**
@@ -669,7 +740,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位误差为:" + (int)location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "当前定位误差为:" + (int) location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
@@ -44,6 +44,13 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
     @Override
     public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
         myViewHolder.line_name.setText(list.get(i).getTitle());
+        if (!TextUtils.isEmpty(list.get(i).getE_subtitle())) {
+            myViewHolder.tv_second_title.setVisibility(View.VISIBLE);
+            myViewHolder.tv_second_title.setText(list.get(i).getE_subtitle());
+        } else {
+            myViewHolder.tv_second_title.setVisibility(View.GONE);
+
+        }
         myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
         if (!TextUtils.isEmpty(list.get(i).getMileage())) {
             myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
@@ -84,6 +91,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
         TextView line_address;
         TextView add_path;
         TextView path_list;
+        TextView tv_second_title;
         RelativeLayout item_ly;
         public MyViewHolder(@NonNull View itemView) {
@@ -94,6 +102,8 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
             add_path = itemView.findViewById(R.id.add_path);
             path_list = itemView.findViewById(R.id.path_list);
             item_ly = itemView.findViewById(R.id.item_ly);
+            tv_second_title = itemView.findViewById(R.id.tv_second_title);
+
         }
     }
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -197,6 +198,18 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
         if (messageEvent.getMessageType() == Constant.UPDATA_COLL_BIND_TRACE_LIST) {
             if (getMvpView() != null) {
                 getMvpView().resetMap();
+                if (null != getMvpView()) {
+                    try {
+                        if (null != getMvpView().webView) {
+                            if (getMvpView().webView.getParent() != null) {
+                                ((ViewGroup) getMvpView().webView.getParent()).removeView(getMvpView().webView);
+                            }
+                            getMvpView().webView.destroy();
+                            getMvpView().webView = null;
+                        }
+                    } catch (Exception e) {
+                    }
+                }
                 getPresenter().getRunRaceDetailInfo(getActivity(), CollCommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "1");
             }
         }
@@ -4,10 +4,14 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 import android.widget.LinearLayout;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -41,6 +45,7 @@ import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.moudle.pedometer.utils.WebViewUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -56,6 +61,7 @@ public class OnGoingFragmentView implements MvpView {
     private UiSettings mUiSettings;
     public RunRaceDetailInfo runRaceDetailInfo;
     private LBSTraceClient mClient = null;
+    private WebView webView;
     public OnGoingFragmentView(OnGoingFragment fragment) {
         this.fragment = fragment;
@@ -65,12 +71,44 @@ public class OnGoingFragmentView implements MvpView {
         return fragment == null ? null : fragment.getActivity();
     }
+    public void initWebView(String html) {
+        if (null == webView) {
+            webView = new WebView(getContext());
+            WebSettings webSettings = webView.getSettings();
+            if (Build.VERSION.SDK_INT >= 21) {
+                webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+            }
+            // 设置支持javascript脚本
+            webSettings.setJavaScriptEnabled(true);
+            // 设置此属性，可任意比例缩放
+            webSettings.setUseWideViewPort(true);
+            // 设置不出现缩放工具
+            webSettings.setBuiltInZoomControls(false);
+            // 设置不可以缩放
+            webSettings.setSupportZoom(false);
+            webSettings.setDisplayZoomControls(false);
+            //自适应屏幕
+            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);
+            // 自适应 屏幕大小界面
+            webSettings.setLoadWithOverviewMode(true);
+        }
+        WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
+        fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
+    }
+
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
         if (fragment.getActivity() == null) {
             return;
         }
         this.runRaceDetailInfo = runRaceDetailInfo;
+        if (null != runRaceDetailInfo) {
+            if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
+                initWebView(runRaceDetailInfo.getNewDescription());
+            } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+                initWebView(runRaceDetailInfo.getDescription());
+            }
+        }
         //轨迹开始时间
         long startTime = 0;
         //轨迹结束时间
@@ -212,33 +250,45 @@ public class OnGoingFragmentView implements MvpView {
                 //设置围栏ID
                 CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
             }
-            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
+            //显示底部滑动卡片
+            fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 169));
+            } else {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
+            }
             //设置标题
             if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
                 fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
                 //根据标题行数,自动调整卡片大小
-                fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                    @Override
-                    public boolean onPreDraw() {
-                        int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
-                        int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
-                        if (line > 1) {
-                            int avgHeight = height / line;//平局高度
-                            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140) + avgHeight * (line - 1));
-
-                        }
-                        fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-                        return false;
-                    }
-                });
+//                fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+//                    @Override
+//                    public boolean onPreDraw() {
+//                        int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
+//                        int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
+//                        if (line > 1) {
+//                            int avgHeight = height / line;//平局高度
+//                            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140) + avgHeight * (line - 1));
+//
+//                        }
+//                        fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+//                        return false;
+//                    }
+//                });
 //                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+
+            }
+            //设置二级标题
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+                fragment.binding.includeStreet.tvSecondTitle.setVisibility(View.VISIBLE);
+                fragment.binding.includeStreet.tvSecondTitle.setText(runRaceDetailInfo.getE_subtitle());
             }
             //设置活动地点
             if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
                 fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
                 //设置活动距离
                 if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
-                    fragment.binding.includeStreet.tvAddress.append("\t\t" + runRaceDetailInfo.getMileage()+"公里");
+                    fragment.binding.includeStreet.tvAddress.append("\t\t" + runRaceDetailInfo.getMileage() + "公里");
                 }
             }
@@ -330,9 +380,9 @@ public class OnGoingFragmentView implements MvpView {
             }
             //设置路线描述
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-                fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
-            }
+//            if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+//                fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+//            }
             //设置路线介绍的图片
             if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
                 //设置路线图
@@ -444,4 +494,43 @@ public class OnGoingFragmentView implements MvpView {
         fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
     }
+    public void onResume() {
+        if (getContext() == null) {
+            return;
+        }
+        if (mMapView != null) {
+            mMapView.onResume();
+        }
+        if (null != webView) {
+            webView.onResume();
+        }
+
+    }
+
+    public void onPause() {
+        if (mMapView != null) {
+            mMapView.onPause();
+        }
+        if (null != webView) {
+            webView.onPause();
+        }
+    }
+
+    public void onDestroy() {
+        if (mMapView != null) {
+            mMapView.onDestroy();
+            mMapView = null;
+        }
+        try {
+            if (null != webView) {
+                if (webView.getParent() != null) {
+                    ((ViewGroup) webView.getParent()).removeView(webView);
+                }
+                webView.destroy();
+                webView = null;
+            }
+        } catch (Exception e) {
+        }
+    }
+
 }
 \ No newline at end of file
@@ -796,12 +796,14 @@ public class RunMainFragmentView implements MvpView {
                     if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
                         endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
                     }
-                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                }
+            }
+            if (null != userStepEntity) {
+                if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                    return;
+                } else {
+                    if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
                         return;
-                    } else {
-                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
-                            return;
-                        }
                     }
                 }
             }
@@ -8,12 +8,18 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.os.Build;
 import android.os.SystemClock;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 import android.widget.Toast;
@@ -63,6 +69,7 @@ import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.moudle.pedometer.utils.WebViewUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -121,7 +128,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private final String BTN_START_RACE = "5";//立即开始
     private final String BTN_END_RACE = "6";//赛事已结束
     private final String BTN_CONTINUE_RACE = "7";//继续运动
-
+    public WebView webView;
+    private boolean isLoadWeb = false;
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -131,11 +139,42 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         return fragment == null ? null : fragment.getActivity();
     }
+    public void initWebView(String html) {
+        if (null == webView) {
+            webView = new WebView(getContext());
+            WebSettings webSettings = webView.getSettings();
+            if (Build.VERSION.SDK_INT >= 21) {
+                webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+            }
+            // 设置支持javascript脚本
+            webSettings.setJavaScriptEnabled(true);
+            // 设置此属性，可任意比例缩放
+            webSettings.setUseWideViewPort(true);
+            // 设置不出现缩放工具
+            webSettings.setBuiltInZoomControls(false);
+            // 设置不可以缩放
+            webSettings.setSupportZoom(false);
+            webSettings.setDisplayZoomControls(false);
+            //自适应屏幕
+            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+            // 自适应 屏幕大小界面
+            webSettings.setLoadWithOverviewMode(true);
+        }
+        WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
+        fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
+    }
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
         if (fragment.getActivity() == null) {
             return;
         }
+        if (null != runRaceDetailInfo) {
+            if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
+                initWebView(runRaceDetailInfo.getNewDescription());
+            } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+                initWebView(runRaceDetailInfo.getDescription());
+            }
+        }
         queryResultPoints = new ArrayList<>();
         this.runRaceDetailInfo = runRaceDetailInfo;
         //轨迹开始时间
@@ -173,12 +212,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //显示地图
         fragment.binding.mapView.setVisibility(View.VISIBLE);
-        //显示底部滑动卡片
-//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
         //隐藏空视图
         fragment.binding.emptyLayout.setVisibility(View.GONE);
         //显示立即报名按钮
 //        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
+
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.6f);
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -188,6 +226,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
+                Log.e(TAG, "onPanelSlide: ");
                 //设置顶层卡片特效
                 if (slideOffset > 0.7) {
                     double alpha = (255 / (1 - 0.6)) * (slideOffset - 0.6);
@@ -233,6 +272,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+                Log.e(TAG, "onPanelStateChanged: ");
+
                 if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
                     fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.INVISIBLE);
                 }
@@ -324,31 +365,46 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
-            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                @Override
-                public boolean onPreDraw() {
-                    Log.e(TAG, "initView: " + fragment.binding.includeStreet.tvRaceTitle.getLineCount());
-                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-                    return false;
-                }
-            });
-            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
-            //根据标题行数,自动调整卡片大小
-            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-                @Override
-                public boolean onPreDraw() {
-                    int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
-                    int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
-                    if (line > 1) {
-                        int avgHeight = height / line;//平局高度
-                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181) + avgHeight * (line - 1));
+//            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+//                @Override
+//                public boolean onPreDraw() {
+//                    Log.e(TAG, "initView: " + fragment.binding.includeStreet.tvRaceTitle.getLineCount());
+//                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+//                    return false;
+//                }
+//            });
+            //显示底部滑动卡片
+            fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            fragment.binding.scrollView.scrollTo(0, 0);
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 210));
+            } else {
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
+            }
+//            //根据标题行数,自动调整卡片大小
+//            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+//                @Override
+//                public boolean onPreDraw() {
+//                    int line = fragment.binding.includeStreet.tvRaceTitle.getLineCount();
+//                    int height = fragment.binding.includeStreet.tvRaceTitle.getHeight();
+//                    if (line > 1) {
+//                        int avgHeight = height / line;//平局高度
+//                        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181) + avgHeight * (line - 1));
+//                    }
+//                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+//                    //显示底部滑动卡片
+//                    fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+//                    fragment.binding.scrollView.scrollTo(0,0);
+//                    return false;
+//                }
+//            });
-                    }
-                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-                    return false;
-                }
-            });
+        }
+        //设置二级标题
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+            fragment.binding.includeStreet.tvSecondTitle.setVisibility(View.VISIBLE);
+            fragment.binding.includeStreet.tvSecondTitle.setText(runRaceDetailInfo.getE_subtitle());
         }
         //设置活动地点
         if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
@@ -455,9 +511,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //设置路线描述
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
-        }
+//        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+//            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+//        }
         //设置路线介绍的图片
         if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
             //设置路线图
@@ -641,6 +697,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 } else if (BTN_END_RACE.equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
                     return;
                 }
+
+//                if (fragment.binding.slidingLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
+//                    fragment.binding.scrollView.scrollTo(0, 0);
+//                }
+
             }
         });
         //查看全部成绩点击事件
@@ -1077,6 +1138,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (mMapView != null) {
             mMapView.onResume();
         }
+        if (null != webView) {
+            webView.onResume();
+        }
         //todo 防止停止后,再次开始,无法获取到赛道的轨迹
         if (runRaceDetailInfo != null) {
             if (runRaceDetailInfo.getFenceId() != null && !TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
@@ -1184,6 +1248,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (mMapView != null) {
             mMapView.onPause();
         }
+        if (null != webView) {
+            webView.onPause();
+        }
     }
     public void onDestroy() {
@@ -1194,6 +1261,16 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (mLocClient != null) {
             mLocClient.stop();
         }
+        try {
+            if (null != webView) {
+                if (webView.getParent() != null) {
+                    ((ViewGroup) webView.getParent()).removeView(webView);
+                }
+                webView.destroy();
+                webView = null;
+            }
+        } catch (Exception e) {
+        }
     }
     /**
@@ -1388,4 +1465,32 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //        }
     }
+//    private class MyWebViewClient extends WebViewClient {
+//        @Override
+//        public void onPageFinished(WebView view, String url) {
+//            super.onPageFinished(view, url);
+//            int w = View.MeasureSpec.makeMeasureSpec(0,
+//                    View.MeasureSpec.UNSPECIFIED);
+//            int h = View.MeasureSpec.makeMeasureSpec(0,
+//                    View.MeasureSpec.UNSPECIFIED);
+//            // 重新测量
+//            view.measure(w, h);
+//
+//            String js = "javascript:(function(){" +
+//                    "var images = document.getElementsByTagName(\"img\");" +
+//                    "var imageUrls = new Array(); " +
+//                    "for(var i=0; i<images.length; i++) {" +
+//                    "   imageUrls[i] = images[i].src; " +
+//                    "   images[i].pos = i; " +
+//                    "   images[i].onclick = function(){" +
+//                    "       window.injectedObject.openImage(this.src, this.pos);" +
+//                    "   }" +
+//                    "}" +
+//                    "window.injectedObject.setImageUrls(imageUrls);  " +
+//                    "})()";
+//
+//            webView.loadUrl(js);
+//        }
+//    }
+
 }
@@ -383,16 +383,19 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
                     if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
                         endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
                     }
-                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+
+                }
+            }
+
+            if (null != userStepEntity) {
+                if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                    return;
+                } else {
+                    if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
                         return;
-                    } else {
-                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
-                            return;
-                        }
                     }
                 }
             }
-
             //开始比较
             if (null != endLatLng) {
                 LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
@@ -44,4 +44,5 @@ public class Constant {
     public static final int FENCE_DENOISE = 20;//围栏去噪精度
     public static final int TAKE_POINT_MAX_SIZE = 100;//最大打点数量
     public static final int COLL_GEORESULT_RADIUS = 20;//打点逆地理半径
+    public static final int WEBVIEW_FONT_SIZE = 40;//webview显示的网页文字大小
 }
@@ -102,6 +102,15 @@ public class MyRecordInfo {
         private String title;
         private String day;
         private List<String> faceUrl;
+        private String e_subtitle;
+
+        public String getE_subtitle() {
+            return e_subtitle;
+        }
+
+        public void setE_subtitle(String e_subtitle) {
+            this.e_subtitle = e_subtitle;
+        }
         public String getAddress() {
             return address;
@@ -103,6 +103,15 @@ public class RunLineInfo {
         private String title;
         private String mileage;
         private List<String> faceUrl;
+        private String e_subtitle;
+
+        public String getE_subtitle() {
+            return e_subtitle;
+        }
+
+        public void setE_subtitle(String e_subtitle) {
+            this.e_subtitle = e_subtitle;
+        }
         public String getAddress() {
             return address;
@@ -92,6 +92,24 @@ public class RunRaceDetailInfo implements Serializable {
     private boolean endState;//活动是否结束(true 结束 false 未结束 )
     private String collStartLatLng;//运营打的点
     private String collStartLntLngName;//运营打点名称
+    private String e_subtitle;
+    private String newDescription;
+
+    public String getE_subtitle() {
+        return e_subtitle;
+    }
+
+    public void setE_subtitle(String e_subtitle) {
+        this.e_subtitle = e_subtitle;
+    }
+
+    public String getNewDescription() {
+        return newDescription;
+    }
+
+    public void setNewDescription(String newDescription) {
+        this.newDescription = newDescription;
+    }
     public String getEventState() {
         return eventState;
@@ -1288,16 +1288,18 @@ public class StepService extends Service implements SensorEventListener {
                     if (!TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
                         endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
                     }
-                    if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+
+                }
+            }
+            if (null != userStepEntity) {
+                if (null == userStepEntity.getStepCount() || TextUtils.isEmpty(userStepEntity.getStepCount())) {
+                    return;
+                } else {
+                    if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
                         return;
-                    } else {
-                        if (Integer.parseInt(userStepEntity.getStepCount()) <= 100) {
-                            return;
-                        }
                     }
                 }
             }
-
             //开始比较数据
             if (null != endLatLng) {
                 LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
@@ -21,6 +21,7 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
+        CalorieEntityDao.createTable(db, ifNotExists);
         CollFailedEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
         FailedEntityDao.createTable(db, ifNotExists);
@@ -29,6 +30,7 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
+        CalorieEntityDao.dropTable(db, ifExists);
         CollFailedEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
         FailedEntityDao.dropTable(db, ifExists);
@@ -51,6 +53,7 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
+        registerDaoClass(CalorieEntityDao.class);
         registerDaoClass(CollFailedEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(FailedEntityDao.class);
@@ -8,11 +8,13 @@ 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.CalorieEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.sql.dao.CalorieEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollFailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
@@ -27,11 +29,13 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
+    private final DaoConfig calorieEntityDaoConfig;
     private final DaoConfig collFailedEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig failedEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
+    private final CalorieEntityDao calorieEntityDao;
     private final CollFailedEntityDao collFailedEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
     private final FailedEntityDao failedEntityDao;
@@ -41,6 +45,9 @@ public class DaoSession extends AbstractDaoSession {
             daoConfigMap) {
         super(db);
+        calorieEntityDaoConfig = daoConfigMap.get(CalorieEntityDao.class).clone();
+        calorieEntityDaoConfig.initIdentityScope(type);
+
         collFailedEntityDaoConfig = daoConfigMap.get(CollFailedEntityDao.class).clone();
         collFailedEntityDaoConfig.initIdentityScope(type);
@@ -53,11 +60,13 @@ public class DaoSession extends AbstractDaoSession {
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
+        calorieEntityDao = new CalorieEntityDao(calorieEntityDaoConfig, this);
         collFailedEntityDao = new CollFailedEntityDao(collFailedEntityDaoConfig, this);
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
         failedEntityDao = new FailedEntityDao(failedEntityDaoConfig, this);
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        registerDao(CalorieEntity.class, calorieEntityDao);
         registerDao(CollFailedEntity.class, collFailedEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(FailedEntity.class, failedEntityDao);
@@ -65,12 +74,17 @@ public class DaoSession extends AbstractDaoSession {
     }
     public void clear() {
+        calorieEntityDaoConfig.clearIdentityScope();
         collFailedEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
         failedEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
     }
+    public CalorieEntityDao getCalorieEntityDao() {
+        return calorieEntityDao;
+    }
+
     public CollFailedEntityDao getCollFailedEntityDao() {
         return collFailedEntityDao;
     }
+package com.cnlive.moudle.pedometer.sql.entity;
+
+import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Id;
+import org.greenrobot.greendao.annotation.Generated;
+
+@Entity
+public class CalorieEntity {
+    @Id
+    private String uuid;
+    private String userId;
+    private String currentDate;
+    private String step;
+    private String calorie;
+    @Generated(hash = 2026883887)
+    public CalorieEntity(String uuid, String userId, String currentDate,
+            String step, String calorie) {
+        this.uuid = uuid;
+        this.userId = userId;
+        this.currentDate = currentDate;
+        this.step = step;
+        this.calorie = calorie;
+    }
+    @Generated(hash = 1460309768)
+    public CalorieEntity() {
+    }
+    public String getUuid() {
+        return this.uuid;
+    }
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+    public String getUserId() {
+        return this.userId;
+    }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+    public String getCurrentDate() {
+        return this.currentDate;
+    }
+    public void setCurrentDate(String currentDate) {
+        this.currentDate = currentDate;
+    }
+    public String getStep() {
+        return this.step;
+    }
+    public void setStep(String step) {
+        this.step = step;
+    }
+    public String getCalorie() {
+        return this.calorie;
+    }
+    public void setCalorie(String calorie) {
+        this.calorie = calorie;
+    }
+}
@@ -56,6 +56,9 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private String eventId;//赛道id
     private int permissionRequestCount = 0;//权限请求次数
     private SelectDialog selectDialog;
+    private boolean isFirstRequestNotification = true;//是否第一次检查通知权限
+    private boolean isFirstRequestGPS = true;//是否第一次检查GPS
+    private boolean isFirstRequestIgnore = true;//是否第一次设置电池优化白名单
     public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName, String userPhone) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
@@ -131,26 +134,80 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             CommonInfo.setStreetId(this, eventId);
             Log.e("设置全局eventId", "onResume: " + eventId);
         }
+        //链式检查各项权限
+        checkNotification();
+
+
+    }
+
+    private void checkNotification() {
         boolean isOpen = NotificationUtil.isOpenNotification(this);
-        if (isOpen) {
-            //判断GPS是否开启
-            if (!MyMapUtil.isOPenGps(getApplicationContext())) {
-                Toast.makeText(getApplicationContext(), getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
+        //请求通知权限
+        if (isFirstRequestNotification) {
+            isFirstRequestNotification = false;
+            if (!isOpen) {
+                NotificationUtil.goToSettingNo(this);
+            } else {
+                //请求GPS权限
+                checkGPS();
+            }
+
+        } else {
+            if (!isOpen) {
+                finish();
+            } else {
+                //请求GPS权限
+                checkGPS();
+            }
+        }
+    }
+
+    /**
+     * 检查GPS
+     */
+    private void checkGPS() {
+        boolean isOpenGps = MyMapUtil.isOPenGps(getApplicationContext());
+        if (isFirstRequestGPS) {
+            isFirstRequestGPS = false;
+            if (!isOpenGps) {
                 //开启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 {
-                boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
-                if (!isSetBattery) {
-                    CheckUtil.toSetIgnore(this);
-                } else {
-                    getPermissionsWithTip();
-                }
+                checkIgnore();
+            }
+
+        } else {
+            if (!isOpenGps) {
+                finish();
+            } else {
+                checkIgnore();
             }
-        }else {
-            NotificationUtil.goToSettingNo(this);
         }
+    }
+    /**
+     * 检查白名单
+     */
+    private void checkIgnore() {
+        boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
+        if (isFirstRequestIgnore) {
+            isFirstRequestIgnore = false;
+            if (!isSetBattery) {
+                CheckUtil.toSetIgnore(this);
+            } else {
+                //检查权限
+                getPermissionsWithTip();
+            }
+        } else {
+            if (!isSetBattery) {
+                finish();
+            } else {
+                //检查权限
+                getPermissionsWithTip();
+            }
+        }
     }
     /**
@@ -40,7 +40,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         this.clickListener = clickListener;
     }
-    public MyRecordAdapter(List<MyRecordInfo.ListBean> list,String state,Activity context) {
+    public MyRecordAdapter(List<MyRecordInfo.ListBean> list, String state, Activity context) {
         this.list = list;
         this.state = state;
         this.context = context;
@@ -58,15 +58,20 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.my_record_ry.setVisibility(View.VISIBLE);
         myViewHolder.has_report.setVisibility(View.GONE);
         myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
-        myViewHolder.check_raking.setOnClickListener(v -> toRaking(list.get(i).getId()+""));
+        myViewHolder.check_raking.setOnClickListener(v -> toRaking(list.get(i).getId() + ""));
         if (clickListener != null) {
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
         }
-
+        if (!TextUtils.isEmpty(list.get(i).getE_subtitle())) {
+            myViewHolder.tv_second_title.setVisibility(View.VISIBLE);
+            myViewHolder.tv_second_title.setText(list.get(i).getE_subtitle());
+        } else {
+            myViewHolder.tv_second_title.setVisibility(View.GONE);
+        }
         myViewHolder.line_name.setText(list.get(i).getTitle());
         myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
-         if (!TextUtils.isEmpty(list.get(i).getMileage())) {
+        if (!TextUtils.isEmpty(list.get(i).getMileage())) {
             myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
         } else {
             myViewHolder.line_address.setText(list.get(i).getAddress());
@@ -83,41 +88,48 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         } else {
             myViewHolder.join_person.setVisibility(View.GONE);
         }
-        if(state.equals("0")){
+        if (!TextUtils.isEmpty(list.get(i).getE_subtitle())) {
+            myViewHolder.tv_second_title.setVisibility(View.VISIBLE);
+            myViewHolder.tv_second_title.setText(list.get(i).getE_subtitle());
+        } else {
+            myViewHolder.tv_second_title.setVisibility(View.GONE);
+
+        }
+        if (state.equals("0")) {
             myViewHolder.day_num.setVisibility(View.VISIBLE);
             myViewHolder.after_finish.setVisibility(View.GONE);
             myViewHolder.day_num.setText(list.get(i).getDay());
-            if(list.get(i).getDay().contains("开始")){
+            if (list.get(i).getDay().contains("开始")) {
                 myViewHolder.my_record.setVisibility(View.GONE);
                 myViewHolder.check_raking.setVisibility(View.GONE);
-            }else {
+            } else {
                 myViewHolder.my_record.setVisibility(View.VISIBLE);
                 myViewHolder.check_raking.setVisibility(View.VISIBLE);
             }
-        }else {
+        } else {
             myViewHolder.day_num.setVisibility(View.GONE);
             myViewHolder.after_finish.setVisibility(View.VISIBLE);
             myViewHolder.after_finish.setText("已结束");
         }
     }
-    private void startAc(MyRecordInfo.ListBean listBean){
-        CommonInfo.setStreetId(context,listBean.getId()+"");
-        RaceRecordActivity.newInstance(context,listBean.getTitle());
+    private void startAc(MyRecordInfo.ListBean listBean) {
+        CommonInfo.setStreetId(context, listBean.getId() + "");
+        RaceRecordActivity.newInstance(context, listBean.getTitle());
     }
-    private void toRaking(String eventId){
-        String baseWebUrl,title;
-        if(state.equals("0")){
+    private void toRaking(String eventId) {
+        String baseWebUrl, title;
+        if (state.equals("0")) {
             title = "排行榜";
             baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportList.html" : "http://wjjh5.cnlive.com/cnSportList.html";
-        }else {
+        } else {
             title = "总排行榜";
             baseWebUrl = AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportListOver.html" : "http://wjjh5.cnlive.com/cnSportListOver.html";
         }
         ARouter.getInstance().build("/web/WebViewColorActivity")
-                .withString("url", baseWebUrl +"?sid="+CommonInfo.getUserId(context)+"&eventId="+eventId)
-                .withString("title",title)
+                .withString("url", baseWebUrl + "?sid=" + CommonInfo.getUserId(context) + "&eventId=" + eventId)
+                .withString("title", title)
                 .navigation(context);
     }
@@ -140,6 +152,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         TextView people_part;
         TextView day_num;
         TextView after_finish;
+        TextView tv_second_title;
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -155,6 +168,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
             people_part = itemView.findViewById(R.id.people_part);
             day_num = itemView.findViewById(R.id.day_num);
             after_finish = itemView.findViewById(R.id.after_finish);
+            tv_second_title = itemView.findViewById(R.id.tv_second_title);
         }
     }
@@ -58,7 +58,12 @@ public class RunLineAdapter extends RecyclerView.Adapter&lt;RunLineAdapter.MyViewHo
         if (clickListener != null) {
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
         }
-
+        if (!TextUtils.isEmpty(list.get(i).getE_subtitle())) {
+            myViewHolder.tv_second_title.setVisibility(View.VISIBLE);
+            myViewHolder.tv_second_title.setText(list.get(i).getE_subtitle());
+        } else {
+            myViewHolder.tv_second_title.setVisibility(View.GONE);
+        }
         myViewHolder.line_name.setText(list.get(i).getTitle());
         myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
         if (!TextUtils.isEmpty(list.get(i).getMileage())) {
@@ -97,6 +102,7 @@ public class RunLineAdapter extends RecyclerView.Adapter&lt;RunLineAdapter.MyViewHo
         TextView activity_time;
         TextView line_address;
         TextView people_part;
+        TextView tv_second_title;
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -109,6 +115,7 @@ public class RunLineAdapter extends RecyclerView.Adapter&lt;RunLineAdapter.MyViewHo
             activity_time = itemView.findViewById(R.id.activity_time);
             line_address = itemView.findViewById(R.id.line_address);
             people_part = itemView.findViewById(R.id.people_part);
+            tv_second_title = itemView.findViewById(R.id.tv_second_title);
         }
     }
@@ -48,9 +48,9 @@ public class OnGoingFragment extends QMUIFragment&lt;OnGoingFragmentView, OnGoingFr
         if (getMvpView() != null) {
             getMvpView().initMap();
         }
-        if (null!=getArguments()){
-            eventId=getArguments().getString("eventId");
-            if (!TextUtils.isEmpty(eventId)){
+        if (null != getArguments()) {
+            eventId = getArguments().getString("eventId");
+            if (!TextUtils.isEmpty(eventId)) {
                 if (getPresenter() != null) {
                     if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
                         getPresenter().getRunRaceDetailInfo(getActivity(), eventId, CommonInfo.getUserId(getActivity()), "0");
@@ -60,4 +60,28 @@ public class OnGoingFragment extends QMUIFragment&lt;OnGoingFragmentView, OnGoingFr
         }
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (null != getMvpView()) {
+            getMvpView().onResume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (null != getMvpView()) {
+            getMvpView().onPause();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (null != getMvpView()) {
+            getMvpView().onDestroy();
+        }
+    }
 }
@@ -197,7 +197,7 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
                 mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
-                tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
+                tipDialog.setTipMsg("您已偏离路径轨迹\n请您及时回归路径!");
                 tipDialog.show();
             }
         }
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
@@ -209,6 +210,18 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
             }
             if (getMvpView() != null && null != getPresenter()) {
                 if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
+                    if (null != getMvpView()) {
+                        try {
+                            if (null != getMvpView().webView) {
+                                if (getMvpView().webView.getParent() != null) {
+                                    ((ViewGroup) getMvpView().webView.getParent()).removeView(getMvpView().webView);
+                                }
+                                getMvpView().webView.destroy();
+                                getMvpView().webView = null;
+                            }
+                        } catch (Exception e) {
+                        }
+                    }
                     getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
                 }
             }
@@ -200,7 +200,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
                 mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
             }
             if (tipDialog != null) {
-                tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
+                tipDialog.setTipMsg("您已偏离路径轨迹\n请您及时回归路径!");
                 tipDialog.show();
             }
         }
@@ -10,6 +10,7 @@ import android.provider.Settings;
 import android.widget.Toast;
 import com.cnlive.libs.base.util.AlertUtil;
+import com.example.moudle_pedometer.R;
 import static android.content.Context.POWER_SERVICE;
@@ -29,11 +30,12 @@ public class CheckUtil {
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                     boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
                     return hasIgnored;
+                } else {
+                    return true;
                 }
             } else {
                 return true;
             }
-            return false;
         } catch (Exception e) {
             return true;
         }
@@ -46,7 +48,7 @@ public class CheckUtil {
             PackageManager pm = context.getPackageManager();
             if (intent.resolveActivity(pm) != null) {
                 context.startActivity(intent);
-                AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
+                Toast.makeText(context, "为保证功能正常使用,请选择允许加入电池优化白名单!", Toast.LENGTH_LONG).show();
             }
         } catch (Exception e) {
@@ -594,20 +594,25 @@ public class MyMapUtil {
      */
     public static final boolean isOPenGps(final Context context) {
         try {
-            LocationManager locationManager
-                    = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-            // 通过GPS卫星定位，定位级别可以精确到街（通过24颗卫星定位，在室外和空旷的地方定位准确、速度快）
-            boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-            // 通过WLAN或移动网络(3G/2G)确定的位置（也称作AGPS，辅助GPS定位。主要用于在室内或遮盖物（建筑群或茂密的深林等）密集的地方定位）
-            boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-            if (gps) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                LocationManager locationManager
+                        = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                // 通过GPS卫星定位，定位级别可以精确到街（通过24颗卫星定位，在室外和空旷的地方定位准确、速度快）
+                boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+                // 通过WLAN或移动网络(3G/2G)确定的位置（也称作AGPS，辅助GPS定位。主要用于在室内或遮盖物（建筑群或茂密的深林等）密集的地方定位）
+                boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+                if (gps) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
                 return true;
             }
         } catch (Exception e) {
             //异常就返回true
             return true;
         }
-        return false;
     }
     /**
@@ -837,6 +842,10 @@ public class MyMapUtil {
                 polylineOptions = new PolylineOptions().width(10)
                         .color(context.getResources().getColor(lineColor)).points(points);
             }
+            if (polylineOptions != null) {
+                resultOverlays.add(baiduMap.addOverlay(polylineOptions));
+
+            }
             if (endCircleOptions != null) {
                 resultOverlays.add(baiduMap.addOverlay(endCircleOptions));
             }
@@ -850,10 +859,7 @@ public class MyMapUtil {
             if (endOptions != null) {
                 resultOverlays.add(baiduMap.addOverlay(endOptions));
             }
-            if (polylineOptions != null) {
-                resultOverlays.add(baiduMap.addOverlay(polylineOptions));
-            }
             if (resultOverlays != null) {
                 return resultOverlays;
             } else {
@@ -17,14 +17,22 @@ public class NotificationUtil {
     private static NotificationManagerCompat notificationManagerCompat;
     public static boolean isOpenNotification(Activity activity) {
-        //监测通知权限是否打开
-        notificationManagerCompat = NotificationManagerCompat.from(activity);
-        isOpen = notificationManagerCompat.areNotificationsEnabled();
-        return isOpen;
+        try {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                //监测通知权限是否打开
+                notificationManagerCompat = NotificationManagerCompat.from(activity);
+                isOpen = notificationManagerCompat.areNotificationsEnabled();
+                return isOpen;
+            } else {
+                return true;
+            }
+        } catch (Exception e) {
+            return true;
+        }
+
     }
     public static void goToSettingNo(Activity activity) {
-        Toast.makeText(activity, "您尚未开启通知权限,无法进行计步", Toast.LENGTH_LONG).show();
         Intent intent1 = new Intent();
         try {
             // 根据isOpened结果，判断是否需要提醒用户跳转AppInfo页面，去打开App通知权限
@@ -47,6 +55,8 @@ public class NotificationUtil {
             //      // intent.setAction("com.android.settings/.SubSettings");
             //  }
             activity.startActivity(intent1);
+            Toast.makeText(activity, "为保证功能正常使用,请开启通知!", Toast.LENGTH_LONG).show();
+
         } catch (Exception e) {
             //其他低版本或者异常情况，走该节点。进入APP设置界面
             intent1.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+package com.cnlive.moudle.pedometer.utils;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/1/30
+ * <p>
+ * 简介:
+ */
+public class WebPreviewShowImg {
+    public String getImgPath() {
+        return imgPath;
+    }
+
+    public void setImgPath(String imgPath) {
+        this.imgPath = imgPath;
+    }
+
+    public String getPreviewPath() {
+        return previewPath;
+    }
+
+    public void setPreviewPath(String previewPath) {
+        this.previewPath = previewPath;
+    }
+
+    private String imgPath;
+    private String previewPath;
+}
+package com.cnlive.moudle.pedometer.utils;
+
+import android.app.Activity;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
+import com.google.gson.Gson;
+
+import java.util.ArrayList;
+
+/**
+ * WebView中直接将p标签转为html代码
+ *
+ * @author ShinnyYang
+ */
+public class WebViewUtil {
+    private static WebEleClickListener webEleListener;
+    private static Activity context;
+
+    /**
+     * 将<p>标签转为html同时有回调
+     *
+     * @param pData
+     * @param webView
+     * @param webEleClickListener
+     */
+    public static void setPtoHtmlData(String pData, WebView webView, WebEleClickListener webEleClickListener) {
+        if (null != webView) {
+            webEleListener = webEleClickListener;
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
+            // 设置支持javascript脚本
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.addJavascriptInterface(new JsObject(), "injectedObject");
+            webView.setWebViewClient(new WebViewClient() {
+                @Override
+                public void onPageFinished(WebView view, String url) {
+                    super.onPageFinished(view, url);
+                    String js = "javascript:(function(){" +
+                            "var images = document.getElementsByTagName(\"img\");" +
+                            "var imageUrls = new Array(); " +
+                            "for(var i=0; i<images.length; i++) {" +
+                            "   imageUrls[i] = images[i].src; " +
+                            "   images[i].pos = i; " +
+                            "   images[i].onclick = function(){" +
+                            "       window.injectedObject.openImage(this.src, this.pos);" +
+                            "   }" +
+                            "}" +
+                            "window.injectedObject.setImageUrls(imageUrls);  " +
+                            "})()";
+                    webView.loadUrl(js);
+                }
+            });
+            webView.loadDataWithBaseURL(null, html, "text/html", "utf-8", null);
+        }
+    }
+
+    /**
+     * 将<p>标签转为html没有回调,直接跳转
+     *
+     * @param activity
+     * @param pData
+     * @param webView
+     */
+    public static void setPtoHtmlData(Activity activity, String pData, WebView webView) {
+        if (null != webView) {
+            context = activity;
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
+            // 设置支持javascript脚本
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.addJavascriptInterface(new JsObject(), "injectedObject");
+            webView.setWebViewClient(new WebViewClient() {
+                @Override
+                public void onPageFinished(WebView view, String url) {
+                    super.onPageFinished(view, url);
+                    String js = "javascript:(function(){" +
+                            "var images = document.getElementsByTagName(\"img\");" +
+                            "var imageUrls = new Array(); " +
+                            "for(var i=0; i<images.length; i++) {" +
+                            "   imageUrls[i] = images[i].src; " +
+                            "   images[i].pos = i; " +
+                            "   images[i].onclick = function(){" +
+                            "       window.injectedObject.openImage(this.src, this.pos);" +
+                            "   }" +
+                            "}" +
+                            "window.injectedObject.setImageUrls(imageUrls);  " +
+                            "})()";
+                    webView.loadUrl(js);
+                }
+            });
+            webView.loadDataWithBaseURL(null, html, "text/html", "utf-8", null);
+        }
+    }
+
+    /**
+     * 将<p>标签转为html没有回调,直接跳转,可指定文字大小
+     *
+     * @param activity
+     * @param pData
+     * @param webView
+     * @param fontSize 字体大小
+     */
+    public static void setPtoHtmlData(Activity activity, String pData, WebView webView, int fontSize) {
+        if (null != webView) {
+            context = activity;
+
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:" + fontSize + "px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:" + fontSize + "px}</style></head><body>" + pData + "</body></html>";
+            // 设置支持javascript脚本
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.addJavascriptInterface(new JsObject(), "injectedObject");
+            webView.setWebViewClient(new WebViewClient() {
+                @Override
+                public void onPageFinished(WebView view, String url) {
+                    super.onPageFinished(view, url);
+                    int w = View.MeasureSpec.makeMeasureSpec(0,
+                            View.MeasureSpec.UNSPECIFIED);
+                    int h = View.MeasureSpec.makeMeasureSpec(0,
+                            View.MeasureSpec.UNSPECIFIED);
+                    // 重新测量
+                    view.measure(w, h);
+                    String js = "javascript:(function(){" +
+                            "var images = document.getElementsByTagName(\"img\");" +
+                            "var imageUrls = new Array(); " +
+                            "for(var i=0; i<images.length; i++) {" +
+                            "   imageUrls[i] = images[i].src; " +
+                            "   images[i].pos = i; " +
+                            "   images[i].onclick = function(){" +
+                            "       window.injectedObject.openImage(this.src, this.pos);" +
+                            "   }" +
+                            "}" +
+                            "window.injectedObject.setImageUrls(imageUrls);  " +
+                            "})()";
+                    webView.loadUrl(js);
+                }
+
+            });
+            webView.loadDataWithBaseURL(null, html, "text/html", "utf-8", null);
+        }
+    }
+
+    public interface WebEleClickListener {
+        void onImageClick(String src, int pos, String[] mImageUrls);
+    }
+
+
+    private static class JsObject {
+
+        private String[] mImageUrls;
+
+        @JavascriptInterface
+        public void setImageUrls(String[] imageUrls) {
+            this.mImageUrls = imageUrls;
+        }
+
+        @JavascriptInterface
+        public void openImage(String src, int pos) {
+            if (null != webEleListener) {
+                webEleListener.onImageClick(src, pos, this.mImageUrls);
+            }
+            if (null != context) {
+                if (null != src && !TextUtils.isEmpty(src) && null != mImageUrls) {
+                    ArrayList<String> imgs = new ArrayList<>();
+                    for (String imageUrl : mImageUrls) {
+                        imgs.add(imageUrl);
+                    }
+                    if (null != imgs && imgs.size() > 0) {
+                        previewImg(context, src, imgs);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 跳转到图片预览页面
+     *
+     * @param activity
+     * @param showImg
+     * @param imgs
+     */
+    public static void previewImg(Activity activity, String showImg, ArrayList<String> imgs) {
+        Gson gson = new Gson();
+        WebPreviewShowImg imagePreviewShowInfo = new WebPreviewShowImg();
+        imagePreviewShowInfo.setPreviewPath("");
+        imagePreviewShowInfo.setImgPath(showImg);
+        String ss = gson.toJson(imagePreviewShowInfo);
+        ArrayList<String> list = new ArrayList<>();
+        if (imgs != null) {
+            for (int i = 0; i < imgs.size(); i++) {
+                WebPreviewShowImg info = new WebPreviewShowImg();
+                info.setImgPath(imgs.get(i));
+                info.setPreviewPath("");
+                Gson gsonInfo = new Gson();
+                String ins = gsonInfo.toJson(info);
+                list.add(ins);
+            }
+        }
+        ARouter.getInstance().build("/preview/PreviewImageViewActivity")
+                .withString("type", "htmlImg")
+                .withTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+                .withString("collectionType", "moment")
+                .withString("previewUrl", ss)
+                .withStringArrayList("preImgList", list)
+                .withBoolean("isFriend", false)
+                .withBoolean("isHide", false)
+                .withBoolean("isLife", false)
+                .withBoolean("isCollection", false)
+                .navigation(activity);
+    }
+}
@@ -64,16 +64,33 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="10dp"
-                android:text="用时"
+                android:text="卡路里"
                 android:textColor="#707070"
                 android:textSize="14sp" />
-            <Chronometer
-                android:id="@+id/ch"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="#707070"
-                android:textSize="20sp" />
+                android:gravity="bottom">
+
+                <TextView
+                    android:id="@+id/tv_calorie"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:layout_marginLeft="5dp"
+                    android:text="0"
+                    android:textColor="#707070"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="千卡"
+                    android:textColor="#707070"
+                    android:textSize="14sp" />
+            </LinearLayout>
         </LinearLayout>
         <LinearLayout
@@ -11,7 +11,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="bottom"
-            sothree:umanoDragView="@+id/dragView"
+            sothree:umanoDragView="@+id/scrollView"
             sothree:umanoFadeColor="@color/black_20"
             sothree:umanoOverlay="true"
             sothree:umanoParallaxOffset="400dp"
@@ -19,11 +19,23 @@
             android:id="@+id/line_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#333333"
-            android:singleLine="true"
             android:layout_marginRight="25dp"
+            android:singleLine="true"
+            android:textColor="#333333"
             android:textSize="18sp" />
+        <TextView
+            android:id="@+id/tv_second_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="1dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginRight="25dp"
+            android:singleLine="true"
+            android:textColor="@color/text_gray"
+            android:textSize="15sp"
+            android:visibility="gone" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -19,6 +19,18 @@
             android:singleLine="true"
             android:textColor="#333333"
             android:textSize="18sp" />
+        <!--二级标题-->
+        <TextView
+            android:id="@+id/tv_second_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="1dp"
+            android:layout_marginTop="5dp"
+            android:maxLines="1"
+            android:text="--"
+            android:visibility="gone"
+            android:textColor="@color/text_gray"
+            android:textSize="15sp" />
         <LinearLayout
             android:layout_width="match_parent"
@@ -38,8 +50,8 @@
                 android:id="@+id/activity_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
                 android:layout_marginLeft="10dp"
+                android:singleLine="true"
                 android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -63,8 +75,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:textColor="#999999"
                 android:singleLine="true"
+                android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -92,6 +104,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
+                android:layout_marginBottom="5dp"
                 android:layout_toLeftOf="@id/path_list"
                 android:background="@drawable/green_raduis_bg"
                 android:paddingLeft="12dp"
@@ -100,7 +113,6 @@
                 android:paddingBottom="7dp"
                 android:text="添加轨迹"
                 android:textColor="#36C28D"
-                android:layout_marginBottom="5dp"
                 android:textSize="12sp" />
         </RelativeLayout>
@@ -42,6 +42,17 @@
                         android:textColor="@color/text_black"
                         android:textSize="18sp"
                         android:textStyle="bold" />
+                    <!--二级标题-->
+                    <TextView
+                        android:id="@+id/tv_second_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="11dp"
+                        android:layout_marginTop="5dp"
+                        android:text="--"
+                        android:textColor="@color/text_gray"
+                        android:textSize="15sp"
+                        android:visibility="gone" />
                     <!--活动地点-->
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -45,6 +45,17 @@
                         android:textColor="@color/text_black"
                         android:textSize="18sp"
                         android:textStyle="bold" />
+                    <!--二级标题-->
+                    <TextView
+                        android:id="@+id/tv_second_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="11dp"
+                        android:layout_marginTop="5dp"
+                        android:text="--"
+                        android:textColor="@color/text_gray"
+                        android:textSize="15sp"
+                        android:visibility="gone" />
                     <!--活动地点-->
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -446,8 +457,8 @@
                             android:id="@+id/five_join_person"
                             android:layout_width="180dp"
                             android:layout_height="40dp"
-                            android:gravity="right"
                             android:layout_marginRight="10dp"
+                            android:gravity="right"
                             FivePersonIconView:showRightFlag="true" />
@@ -18,16 +18,23 @@
             android:textSize="18sp"
             android:textStyle="bold" />
-        <TextView
-            android:id="@+id/tv_street_introduce"
-            android:layout_width="wrap_content"
+        <!--<TextView-->
+        <!--android:id="@+id/tv_street_introduce"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_marginTop="10dp"-->
+        <!--android:layout_marginRight="10dp"-->
+        <!--android:text="&#45;&#45;"-->
+        <!--android:textColor="@color/text_black"-->
+        <!--android:textSize="15sp" />-->
+
+        <LinearLayout
+            android:id="@+id/ll_webview"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_marginRight="10dp"
-            android:text="--"
-            android:textColor="@color/text_black"
-            android:textSize="15sp" />
-
+            android:descendantFocusability="blocksDescendants"
+            android:orientation="vertical"></LinearLayout>
         <!--地图-->
         <TextView
             android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
     <string name="loc_gps_accuracy_mid">GPS信号质量中等</string>
     <string name="loc_gps_accuracy_good">GPS信号质量好</string>
     <string name="layout_street_active_type">活动类型</string>
-    <string name="open_gps_tip">请开启GPS,将其设置为高精度模式!</string>
+    <string name="open_gps_tip">为确保定位准确性,请开启GPS,将其设置为高精度模式!</string>
     <!---->
     <!--网络请求-->
     <string name="retry">重试</string>