Merge branch 'hotfix_video' into test6.8.7

@@ -160,14 +160,14 @@ public class UfoLiveService  {
         return null;
     }
 
-	private String getVedioFileUrl(QiniuLiveRecord qiniuLiveRecord) {
+    private String getVedioFileUrl(QiniuLiveRecord qiniuLiveRecord) {
         //http://yhb-img01.qiniudn.com/ufo/live/mp4/9817910304768_1544775266.mp4
         if (qiniuLiveRecord.getVedioFileUrl().startsWith("http")) {
             return qiniuLiveRecord.getVedioFileUrl();
         }
 
-		return QNliveConstants.LIVE_VIDEO_DOMAIN + QNliveConstants.MP4_FILEKEY_PRE + qiniuLiveRecord.getVedioFileUrl();
-	}
+        return QNliveConstants.LIVE_VIDEO_DOMAIN + QNliveConstants.MP4_FILEKEY_PRE + qiniuLiveRecord.getVedioFileUrl();
+    }
 
     // type 为1代表备用     0 代表默认的摄像源
     public String queryM3u8Url(Integer cameraCode, int type) throws PlatformException {
@@ -192,7 +192,7 @@ public class UfoLiveService  {
 
     // 查询当前登录用户默认的摄像头设备
     public Integer queryInitCameraCode(QiniuLiveRecord req) {
-       // UserCameraRecord userCameraRecord = userCameraRecordMapper.selectUserCameraRecord(new UserHelper().getUserId());
+        // UserCameraRecord userCameraRecord = userCameraRecordMapper.selectUserCameraRecord(new UserHelper().getUserId());
 
         String cameraCode = yhValueOperations.get(getRedisKey(req.getPid()));