ckplayer-plus 1.0.0 → 1.0.1

package/dist/ckplayer.js

@@ -139,7 +139,7 @@
 		autoPlug:true//未指定 plug 时，根据视频地址后缀自动选择 hls.js / flv.js / mpegts.js
 	};
 	// 打包时替换为真实版本；用于 bundler 下 getPath 失效时的 CDN 回退
-	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.0/dist/';
+	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.1/dist/';
 	function ckplayerEmbed(videoObj){
 		/*
 		 * rightMenu
@@ -764,12 +764,14 @@
 				if(valType(vars['seek'])=='number' && vars['seek']>0){
 					seekTime=vars['seek'];
 				}
-				if(valType(vars['seek'])=='string' && vars['seek']=='cookie' && cookieName){
+				else if(valType(vars['seek'])=='string' && vars['seek']=='cookie' && cookieName){
 					var cke=player.cookie(cookieName);
 					if(cke){
 						seekTime=cke['time'];
 					}
-					
+				}
+				else if(valType(vars['seek'])=='string' && vars['seek']!=='' && !isNaN(parseFloat(vars['seek']))){
+					seekTime=parseFloat(vars['seek']);
 				}
 			}
 		},
@@ -816,6 +818,9 @@
 					hls = new Hls();
 					hls.loadSource(url);
 					hls.attachMedia(video);
+					hls.on(Hls.Events.MANIFEST_PARSED, function(){
+						applyPendingSeek();
+					});
 					hls.on(Hls.Events.ERROR, function(event, data){
 						var code=9;
 						var message=language['error']['loadingFailed'];
@@ -1582,6 +1587,29 @@
 				}
 			}
 		},
+		/*
+		 * applyPendingSeek
+		 * 功能：在媒体就绪后应用挂起的 seekTime
+		*/
+		applyPendingSeek=function(){
+			if(!seekTime || !video){
+				return;
+			}
+			if(!isUndefined(vars['live']) && ((valType(vars['live'])=='boolean' && vars['live']) || valType(vars['live'])=='number')){
+				return;
+			}
+			var t=seekTime;
+			var dur=duration || video.duration || 0;
+			if(dur && isFinite(dur) && dur>0 && t>=dur){
+				t=Math.max(0,dur-0.3);
+			}
+			seekTime=0;
+			try{
+				video.currentTime=t;
+			}catch(event){
+				seekTime=t;
+			}
+		},
 		/*
 		 * loadedMetaData
 		 * 功能：获取元数据后执行的函数
@@ -1633,6 +1661,7 @@
 			canPlay:function(){
 				C['loading'].hide();
 				eventTarget('canplay');
+				applyPendingSeek();
 			},
 			loadedData:function(){
 				eventTarget('loadeddata');
@@ -1662,6 +1691,7 @@
 				if(CT.videoWidth || CT.videoHeight || duration){
 					loadedMetaData();
 				}
+				applyPendingSeek();
 				var len = 0;
 				if(!isUndefined(this.buffered)){
 					len=this.buffered.length;
@@ -1719,6 +1749,7 @@
 					if(CT.videoWidth || CT.videoHeight || duration){
 						loadedMetaData();
 					}
+					applyPendingSeek();
 				}
 				oldTime=playTime;
 				playTime=this.currentTime;
@@ -1939,9 +1970,8 @@
 						}
 					}
 				}
-				if(seekTime && (isUndefined(vars['live']) || (!isUndefined(vars['live']) && valType(vars['live'])=='boolean' && !vars['live'])) && seekTime<parseInt(duration*100)*0.01){//如果默认需要跳转，则进行seek
-					player.seek(seekTime);
-					seekTime=0;
+				if(seekTime && (isUndefined(vars['live']) || (!isUndefined(vars['live']) && valType(vars['live'])=='boolean' && !vars['live']))){//如果默认需要跳转，则进行seek
+					applyPendingSeek();
 				}			
 			},
 			pause:function(){
@@ -2797,52 +2827,78 @@
 			/*
 			 * seek
 			 * 功能：监听跳转/执行跳转操作
-			 * @fn为函数时则监听视频跳转动作，@fn为数字时执行跳转操作
+			 * @fn为函数时则监听视频跳转动作，@fn为数字（或数字字符串）时执行跳转操作
 			*/
 			seek:function(fn){
 				if(!isUndefined(fn)){
 					if(valType(fn)=='function'){
 						newEvent.addEventListener('seek',fn);
 					}
-					if(valType(fn)=='number' && video){
-						switch(vars['timeScheduleAdjust']){
-							case 0://禁止拖动
-								message(language['timeScheduleAdjust']['prohibit']);
-								return;
-								break;
-							case 1://可以拖动
-								break;
-							case 2://只能前进（向右拖动
-								if(fn<oldTime){
-									message(language['timeScheduleAdjust']['prohibitBackOff']);
-									return;
-								}
-								break;
-							case 3://是只能后退
-								if(fn>oldTime){
-									message(language['timeScheduleAdjust']['prohibitForward']);
-									return;
-								}
-								break;
-							case 4://只能前进但能回到第一次拖动时的位置
-								if(fn<firstSeekTime){
-									waitingMessage=false;
-									video.currentTime=firstSeekTime;
-									message(language['timeScheduleAdjust']['prohibitLookBack']);
-									return;
-								}
-								break;
-							case 5://看过的地方可以随意拖动
-								if(fn>maxSeeTime){
-									waitingMessage=false;
-									video.currentTime=maxSeeTime;
-									message(language['timeScheduleAdjust']['prohibitForwardNotViewed']);
-									return;
-								}
-								break;
+					else{
+						var target=null;
+						if(valType(fn)=='number' && !isNaN(fn)){
+							target=fn;
+						}
+						else if(valType(fn)=='string' && fn!=='' && fn!=='cookie' && !isNaN(parseFloat(fn))){
+							target=parseFloat(fn);
+						}
+						if(target!==null && video){
+							switch(vars['timeScheduleAdjust']){
+								case 0://禁止拖动
+									message(language['timeScheduleAdjust']['prohibit']);
+									return player;
+								case 1://可以拖动
+									break;
+								case 2://只能前进（向右拖动
+									if(target<oldTime){
+										message(language['timeScheduleAdjust']['prohibitBackOff']);
+										return player;
+									}
+									break;
+								case 3://是只能后退
+									if(target>oldTime){
+										message(language['timeScheduleAdjust']['prohibitForward']);
+										return player;
+									}
+									break;
+								case 4://只能前进但能回到第一次拖动时的位置
+									if(target<firstSeekTime){
+										waitingMessage=false;
+										try{video.currentTime=firstSeekTime;}catch(event){}
+										message(language['timeScheduleAdjust']['prohibitLookBack']);
+										return player;
+									}
+									break;
+								case 5://看过的地方可以随意拖动
+									if(target>maxSeeTime){
+										waitingMessage=false;
+										try{video.currentTime=maxSeeTime;}catch(event){}
+										message(language['timeScheduleAdjust']['prohibitForwardNotViewed']);
+										return player;
+									}
+									break;
+							}
+							pSliderMouseDown=false;
+							// 媒体未就绪时先记录，待 canplay/时长就绪后再应用
+							var ready=video.readyState>=2 || (duration && isFinite(duration) && duration>0);
+							if(!ready){
+								seekTime=target;
+								try{video.currentTime=target;}catch(event){}
+								return player;
+							}
+							if(duration && isFinite(duration) && duration>0 && target>duration){
+								target=Math.max(0,duration-0.3);
+							}
+							if(target<0){
+								target=0;
+							}
+							try{
+								video.currentTime=target;
+								seekTime=0;
+							}catch(event){
+								seekTime=target;
+							}
 						}
-						pSliderMouseDown=false;
-						video.currentTime=fn;
 					}
 				}
 				return player;