ckplayer-plus 1.0.0 → 1.0.2

package/dist/ckplayer.css

@@ -87,13 +87,13 @@
 	width: 80px;
 	height: 80px;
     border-radius: 50%;
-    background: url(images/loading.png) no-repeat center center;
+    background: url(./images/loading.png) no-repeat center center;
     background-size: 100% 100%;
     animation: ck-Circle 1.5s linear infinite;
 	-webkit-animation: ck-Circle 1.5s linear infinite
 }
 .ckplayer-ckplayer .ck-main .ck-center-play{
-	background: url(images/play.png) no-repeat 70% center;
+	background: url(./images/play.png) no-repeat 70% center;
 	background-size:60% 60%;
 	border: 8px solid rgba(255,255,255,.3);
 	border-radius: 50%;
@@ -127,7 +127,7 @@
 	height: 120px;
 }
 .ckplayer-ckplayer .ck-main .ck-buffer{
-	background: url(images/buffer.png) no-repeat center center;
+	background: url(./images/buffer.png) no-repeat center center;
 	background-size:100% 100%;
 	border-radius: 50%;
 	width: 60px;
@@ -501,7 +501,7 @@
 /*显示广告时的底部按钮-共用*/
 .ckplayer-ckplayer .ck-main .ck-yytf .ck-yytf-bottom .ck-yytf-btn{
 	background-color: rgba(0,0,0,.6);
-	background-image: url(images/ckplayer.png);
+	background-image: url(./images/ckplayer.png);
 	background-size: auto 100%;
 	border: none;
 	outline: none;
@@ -634,7 +634,7 @@
 	width: 30px;
 	height: 30px;
 	background-color: transparent;
-	background-image: url(images/adclose.png);
+	background-image: url(./images/adclose.png);
 	border: none;
 	outline: none;
 	cursor: pointer;
@@ -691,7 +691,7 @@
 /*按钮公用样式*/
 .ckplayer-ckplayer .ck-main .ck-bar-btn{
 	background-color: transparent;
-	background-image: url(images/ckplayer.48.png);
+	background-image: url(./images/ckplayer.48.png);
 	background-size: auto 100%;
 	border: none;
 	outline: none;
@@ -701,7 +701,7 @@
 	background-repeat: no-repeat ;
 }
 .ckplayer-ckplayer .ck-main.ck-main-full .ck-bar-btn{
-	background-image: url(images/ckplayer.png);
+	background-image: url(./images/ckplayer.png);
 	width: 70px;
 	height: 70px;
 }

package/dist/ckplayer.ixigua.css

@@ -87,13 +87,13 @@
 	width: 80px;
 	height: 80px;
     border-radius: 50%;
-    background: url(images/loading.png) no-repeat center center;
+    background: url(./images/loading.png) no-repeat center center;
     background-size: 100% 100%;
     animation: ck-Circle 1.5s linear infinite;
 	-webkit-animation: ck-Circle 1.5s linear infinite
 }
 .ckplayer-ckplayer .ck-main .ck-center-play{
-	background: url(images/play.png) no-repeat 70% center;
+	background: url(./images/play.png) no-repeat 70% center;
 	background-size:60% 60%;
 	border: 8px solid rgba(255,255,255,.3);
 	border-radius: 50%;
@@ -127,7 +127,7 @@
 	height: 120px;
 }
 .ckplayer-ckplayer .ck-main .ck-buffer{
-	background: url(images/buffer.png) no-repeat center center;
+	background: url(./images/buffer.png) no-repeat center center;
 	background-size:100% 100%;
 	border-radius: 50%;
 	width: 60px;
@@ -501,7 +501,7 @@
 /*显示广告时的底部按钮-共用*/
 .ckplayer-ckplayer .ck-main .ck-yytf .ck-yytf-bottom .ck-yytf-btn{
 	background-color: rgba(0,0,0,.6);
-	background-image: url(images/ckplayer_ixigua.png);
+	background-image: url(./images/ckplayer_ixigua.png);
 	background-size: auto 100%;
 	border: none;
 	outline: none;
@@ -634,7 +634,7 @@
 	width: 30px;
 	height: 30px;
 	background-color: transparent;
-	background-image: url(images/adclose.png);
+	background-image: url(./images/adclose.png);
 	border: none;
 	outline: none;
 	cursor: pointer;
@@ -692,7 +692,7 @@
 /*按钮公用样式*/
 .ckplayer-ckplayer .ck-main .ck-bar-btn{
 	background-color: transparent;
-	background-image: url(images/ckplayer_ixigua.48.png);
+	background-image: url(./images/ckplayer_ixigua.48.png);
 	background-size: auto 100%;
 	border: none;
 	outline: none;
@@ -702,7 +702,7 @@
 	background-repeat: no-repeat ;
 }
 .ckplayer-ckplayer .ck-main.ck-main-full .ck-bar-btn{
-	background-image: url(images/ckplayer_ixigua.png);
+	background-image: url(./images/ckplayer_ixigua.png);
 	width: 70px;
 	height: 70px;
 }

package/dist/ckplayer.js

@@ -136,10 +136,12 @@
 		keyVolume:2,//是否启用键盘控制音量调节，0=不启用，1=启用，2=全屏时才启用
 		errorShow:true,//是否显示错误信息
 		pluginPath:'',//插件与语言包根路径（bundler 下建议配置或设置 window.ckplayerBasePath）
-		autoPlug:true//未指定 plug 时，根据视频地址后缀自动选择 hls.js / flv.js / mpegts.js
+		autoPlug:true,//未指定 plug 时，根据视频地址后缀自动选择 hls.js / flv.js / mpegts.js
+		preferBuiltinPlug:true,//优先加载本包内置插件脚本，避免复用页面上其它版本的全局 Hls/flvjs/mpegts
+		cdnFallback:true// getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
 	};
 	// 打包时替换为真实版本；用于 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.2/dist/';
 	function ckplayerEmbed(videoObj){
 		/*
 		 * rightMenu
@@ -392,7 +394,12 @@
 			if(fromScript && fromScript.indexOf(folder+'/')>-1 && fromScript.indexOf('undefined')===-1){
 				return fromScript;
 			}
+			var allowCdn=!vars || vars['cdnFallback']!==false;
 			var cdn=(typeof window!=='undefined' && window.ckplayerPlusCdn) ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
+			if(!allowCdn || !cdn || cdn.indexOf('1.0.2')>-1){
+				// 避免占位版本或显式关闭 CDN 时请求坏地址；交给相对路径或业务 pluginPath
+				return folder+'/'+file;
+			}
 			if(cdn.slice(-1)!=='/'){
 				cdn+='/';
 			}
@@ -764,12 +771,21 @@
 				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']);
+				}
+				// 与旧版对齐：续播 seek 同步进度水位，避免 timeScheduleAdjust=5 时被打回 0
+				if(seekTime && seekTime>0){
+					maxSeeTime=Math.max(maxSeeTime,seekTime);
+					if(firstSeekTime<0){
+						firstSeekTime=seekTime;
+					}
 				}
 			}
 		},
@@ -816,6 +832,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'];
@@ -844,7 +863,7 @@
 					video.attr('src',url);
 				}
 			};
-			if(typeof Hls!=='undefined' && !isUndefined(Hls)){
+			if(typeof Hls!=='undefined' && !isUndefined(Hls) && !vars['preferBuiltinPlug']){
 				startHls();
 				return;
 			}
@@ -887,7 +906,7 @@
 			        });
 			    }
 			};
-			if(typeof flvjs!=='undefined' && !isUndefined(flvjs)){
+			if(typeof flvjs!=='undefined' && !isUndefined(flvjs) && !vars['preferBuiltinPlug']){
 				startFlv();
 				return;
 			}
@@ -931,7 +950,7 @@
 			        });
 			    }
 			};
-			if(typeof mpegts!=='undefined' && !isUndefined(mpegts)){
+			if(typeof mpegts!=='undefined' && !isUndefined(mpegts) && !vars['preferBuiltinPlug']){
 				startMpegts();
 				return;
 			}
@@ -1582,6 +1601,36 @@
 				}
 			}
 		},
+		/*
+		 * 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);
+			}
+			// 续播水位同步（mode=5 依赖 maxSeeTime）
+			if(t>0){
+				maxSeeTime=Math.max(maxSeeTime,t);
+				if(firstSeekTime<0){
+					firstSeekTime=t;
+				}
+			}
+			seekTime=0;
+			try{
+				video.currentTime=t;
+			}catch(event){
+				seekTime=t;
+			}
+		},
 		/*
 		 * loadedMetaData
 		 * 功能：获取元数据后执行的函数
@@ -1633,6 +1682,7 @@
 			canPlay:function(){
 				C['loading'].hide();
 				eventTarget('canplay');
+				applyPendingSeek();
 			},
 			loadedData:function(){
 				eventTarget('loadeddata');
@@ -1662,6 +1712,7 @@
 				if(CT.videoWidth || CT.videoHeight || duration){
 					loadedMetaData();
 				}
+				applyPendingSeek();
 				var len = 0;
 				if(!isUndefined(this.buffered)){
 					len=this.buffered.length;
@@ -1719,6 +1770,7 @@
 					if(CT.videoWidth || CT.videoHeight || duration){
 						loadedMetaData();
 					}
+					applyPendingSeek();
 				}
 				oldTime=playTime;
 				playTime=this.currentTime;
@@ -1939,9 +1991,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 +2848,98 @@
 			/*
 			 * 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;
+					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){
+							// 续播水位需在 timeScheduleAdjust 校验前同步，否则 mode=5 会把 seek 打回 0
+							if(target>0 && ((seekTime && Math.abs(seekTime-target)<0.5) || (vars['seek'] && parseFloat(vars['seek'])>0 && Math.abs(parseFloat(vars['seek'])-target)<0.5))){
+								maxSeeTime=Math.max(maxSeeTime,target);
+								if(firstSeekTime<0){
+									firstSeekTime=target;
 								}
-								break;
-							case 4://只能前进但能回到第一次拖动时的位置
-								if(fn<firstSeekTime){
-									waitingMessage=false;
-									video.currentTime=firstSeekTime;
-									message(language['timeScheduleAdjust']['prohibitLookBack']);
-									return;
+							}
+							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;
+								if(target>0){
+									maxSeeTime=Math.max(maxSeeTime,target);
+									if(firstSeekTime<0){
+										firstSeekTime=target;
+									}
 								}
-								break;
-							case 5://看过的地方可以随意拖动
-								if(fn>maxSeeTime){
-									waitingMessage=false;
-									video.currentTime=maxSeeTime;
-									message(language['timeScheduleAdjust']['prohibitForwardNotViewed']);
-									return;
+								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;
+							}
+							// API 续播：若水位仍低于目标且目标等于初始化 seek，抬高水位
+							if(vars['timeScheduleAdjust']==5 && target>maxSeeTime && seekTime && Math.abs(seekTime-target)<0.5){
+								maxSeeTime=Math.max(maxSeeTime,target);
+							}
+							try{
+								video.currentTime=target;
+								seekTime=0;
+								if(target>maxSeeTime && vars['timeScheduleAdjust']!=5){
+									maxSeeTime=target;
 								}
-								break;
+							}catch(event){
+								seekTime=target;
+							}
 						}
-						pSliderMouseDown=false;
-						video.currentTime=fn;
 					}
 				}
 				return player;