From 39de2c150bca114a8006c54e4ea2042e4fa9e04a Mon Sep 17 00:00:00 2001 From: jinghui Date: Mon, 26 Oct 2026 12:13:07 +0800 Subject: [PATCH] =?UTF-8?q?v-fixed29=EF=BC=9A=E8=8A=82=E7=9B=AE=E5=8D=95(E?= =?UTF-8?q?PG)=E5=8F=B3=E4=BE=A7=E9=9D=A2=E6=9D=BF=E2=80=94=E2=80=94223?= =?UTF-8?q?=E9=A2=91=E9=81=93=E4=BB=8A=E6=97=A5=E8=8A=82=E7=9B=AE=E3=80=81?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E6=AE=B5=E9=AB=98=E4=BA=AE=E3=80=81?= =?UTF-8?q?=E5=88=87=E5=8F=B0=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++ docker-compose.redis.yml | 2 +- patches/live-inject.js | 70 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e96f8..f323ee1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ 格式参考本机发版惯例:按日期分条,`🐛修复` / `✨新功能`。 +## 2026-10-26 → v-fixed29 + +- ✨ **节目单(EPG)**:播放器右上角「📋 节目单」按钮,点击从右侧滑出面板(默认隐藏)——显示当前台今日全部节目(起止时间+名称),当前时段高亮并自动滚动定位;切换频道面板自动刷新;✕ 收起 +- 数据源:公共 XMLTV EPG(223 个港澳台频道今日节目,服务端拉取解析、30 分钟缓存、按北京时间取当日);内置 51 个直播频道名→EPG 名映射表(TVB 全系/凤凰/ViuTV/台湾各台/纬来/爱尔达等),无 EPG 的台(有线/NOW/HOY/港台/澳门系)显示「该台暂无节目单」容错 + ## 2026-10-26 → v-fixed28 - ✨ **播放器右下角悬浮控制**:⏸ 暂停/▶ 播放、🔊/🔇 静音开关两个按钮(36px 圆角半透明毛玻璃,hover 放大),图标随状态实时同步(监听 play/pause/volumechange);按钮点击不触发画面点击开声逻辑 diff --git a/docker-compose.redis.yml b/docker-compose.redis.yml index 07eb2e1..3491bbe 100644 --- a/docker-compose.redis.yml +++ b/docker-compose.redis.yml @@ -3,7 +3,7 @@ version: '3.8' services: # KatelyaTV 应用服务 katelyatv: - image: katelyatv:fixed28 + image: katelyatv:fixed29 container_name: katelyatv ports: - "3030:3000" diff --git a/patches/live-inject.js b/patches/live-inject.js index fe805df..8f36a49 100644 --- a/patches/live-inject.js +++ b/patches/live-inject.js @@ -4,6 +4,31 @@ let _liveVm=null;try{_liveVm=require("vm")}catch(e){} const LIVE_UA="Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Safari/604.1"; const LIVE_HOSTS=/(^|\.)(iptv200\.com|2026016\.xyz)$/; const liveCh={ts:0,list:null},liveLn=new Map(),liveRv=new Map(); +const EPG_MAP={"凤凰卫视中文台":"凤凰中文","凤凰卫视资讯台":"凤凰资讯","TVB翡翠台":"翡翠台","TVB无线新闻台":"无线新闻","TVB明珠台":"明珠台","中视新闻台":"中视新闻","中视HD":"中视","台视HD":"台视","民视HD":"民视","华视HD":"华视","华视新闻台":"华视新闻","非凡新闻":"非凡新闻台","寰宇新闻台":"寰宇新闻","寰宇新闻台湾台":"寰宇新闻","TVBS HD":"TVBS","纬来育乐台":"纬来综合台","緯來體育台":"纬来体育台","爱尔达体育1台":"爱尔达体育1","爱尔达体育2台":"爱尔达体育2","ELEVEN 1(DAZN 1)":"ELTV","ELEVEN 2(DAZN 2)":"ELTV","澳視澳門":"澳門","澳門Macau":"澳門"}; +const liveEpg={ts:0,map:null}; +function liveToday(){const d=new Date(Date.now()+8*3600e3);return d.toISOString().slice(0,10).replace(/-/g,"")} +async function liveEpgAll(){ +if(liveEpg.map&&Date.now()-liveEpg.ts<1800e3)return liveEpg.map; +const x=await liveText("http://epg.51zmt.top:8000/e2.xml.gz",25000); +if(!x||x.indexOf("\s*]*>([^<]+)<\/display-name>/g; +while((m=reC.exec(x)))chm[m[1]]=m[2]; +const today=liveToday(),map={}; +const reP=/]*>\s*(?:]*>([\s\S]*?)<\/title>)?/g; +while((m=reP.exec(x))){ +if(m[1].slice(0,8)!==today)continue; +const nm=chm[m[3]];if(!nm)continue; +(map[nm]=map[nm]||[]).push({s:m[1].slice(8,12),e:m[2].slice(8,12),t:(m[4]||"").replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">")})} +if(!Object.keys(map).length)throw new Error("epg empty"); +liveEpg.map=map;liveEpg.ts=Date.now(); +console.log("[LIVE-EPG] loaded channels="+Object.keys(map).length); +return map} +async function liveEpgFor(name){ +const all=await liveEpgAll(); +const key=EPG_MAP[name]||(all[name]?name:null); +if(!key)return{has:false,list:[]}; +return{has:true,epg_key:key,list:all[key]||[]}} async function liveText(u,ms){const c=new AbortController();const t=setTimeout(()=>c.abort(),ms||15000); try{const r=await fetch(u,{redirect:"follow",signal:c.signal,headers:{"User-Agent":LIVE_UA,"Referer":LIVE_UP+"/"}});return await r.text()}finally{clearTimeout(t)}} function liveRegion(n){if(/澳门|澳門|澳[視视]|澳亚|莲花/.test(n))return"澳门"; @@ -82,6 +107,19 @@ video{width:100%;height:100%;display:block;background:#000} .tip{position:absolute;inset:0;display:flex;align-items:center;justify-content:center;color:#6b7280;font-size:14px;pointer-events:none;background:rgba(0,0,0,.35)} .bigplay{position:absolute;inset:0;display:none;align-items:center;justify-content:center;background:rgba(0,0,0,.45);color:#fff;font-size:64px;cursor:pointer;z-index:5;user-select:none} .pctrl{position:absolute;right:10px;bottom:10px;display:flex;gap:8px;z-index:6} +.epgTab{position:absolute;right:10px;top:10px;z-index:6;border:none;border-radius:8px;background:rgba(0,0,0,.55);color:#fff;font-size:13px;padding:7px 11px;cursor:pointer;backdrop-filter:blur(4px);transition:.15s} +.epgTab:hover{background:rgba(0,0,0,.8)} +.epgPanel{position:absolute;right:0;top:0;bottom:0;width:min(320px,86%);background:rgba(13,16,23,.97);z-index:7;transform:translateX(105%);transition:transform .25s ease;display:flex;flex-direction:column;border-left:1px solid #232936} +.epgPanel.open{transform:translateX(0)} +.epgHead{display:flex;justify-content:space-between;align-items:center;padding:10px 14px;border-bottom:1px solid #1c2230;font-size:14px;font-weight:600;color:#e5e7eb;flex:none} +.epgHead button{background:none;border:none;color:#9ca3af;font-size:20px;cursor:pointer;line-height:1;padding:0 2px} +.epgHead button:hover{color:#fff} +.epgList{flex:1;overflow:auto;padding:4px 0} +.epgRow{display:flex;gap:10px;padding:8px 14px;font-size:13px;color:#9ca3af;border-bottom:1px solid rgba(255,255,255,.03)} +.epgRow .et{flex:none;color:#6b7280;font-variant-numeric:tabular-nums} +.epgRow.now{background:rgba(59,130,246,.14);color:#fff;border-left:3px solid #3b82f6} +.epgRow.now .et{color:#93c5fd} +.epgEmpty{padding:36px 16px;text-align:center;color:#6b7280;font-size:13px} .pctrl button{width:36px;height:36px;border:none;border-radius:8px;background:rgba(0,0,0,.55);color:#fff;font-size:16px;cursor:pointer;line-height:1;transition:.15s;backdrop-filter:blur(4px)} .pctrl button:hover{background:rgba(0,0,0,.8);transform:scale(1.06)} .pctrl button:active{transform:scale(.95)} @@ -104,7 +142,7 @@ select{background:#171b24;color:#e5e7eb;border:1px solid #2a3140;border-radius:6
频道列表 点击切换
加载中…
-
选择频道开始观看
▶
+
选择频道开始观看
▶
节目单
选择频道后查看节目单
未选择
@@ -152,12 +190,37 @@ v.addEventListener('play',syncCtrl); v.addEventListener('pause',syncCtrl); v.addEventListener('volumechange',syncCtrl); syncCtrl(); +var epgTab=document.getElementById('epgTab'),epgPanel=document.getElementById('epgPanel'), + epgTitle=document.getElementById('epgTitle'),epgList=document.getElementById('epgList'), + epgClose=document.getElementById('epgClose'); +var epgOpen=false; +function renderEpg(j){ + if(!j||!j.has||!j.list||!j.list.length){epgList.innerHTML='
该台暂无节目单
';return} + var d=new Date(),hh=String(d.getHours()).padStart(2,'0'),mm=String(d.getMinutes()).padStart(2,'0'),nowHM=hh+mm; + epgList.innerHTML=j.list.map(function(p){ + var isNow=nowHM>=p.s&&nowHM'+p.s.slice(0,2)+':'+p.s.slice(2)+''+p.e.slice(0,2)+':'+p.e.slice(2)+''+p.t+'
' + }).join(''); + var nowRow=epgList.querySelector('.epgRow.now'); + if(nowRow)nowRow.scrollIntoView({block:'center'}); +} +function refreshEpg(){ + if(!curId)return; + var nm=(chs.find(function(c){return String(c.id)===String(curId)})||{}).name||''; + epgTitle.textContent=nm+(nm?' · 节目单':'节目单'); + epgList.innerHTML='
加载中…
'; + fetch(API+'epg&name='+encodeURIComponent(nm)).then(function(r){return r.json()}).then(renderEpg).catch(function(){renderEpg(null)}); +} +epgTab.addEventListener('click',function(e){e.stopPropagation(); + epgOpen=true;epgPanel.classList.add('open');refreshEpg()}); +epgClose.addEventListener('click',function(e){e.stopPropagation(); + epgOpen=false;epgPanel.classList.remove('open')}); function nextLine(){if(sel.options.length&&+sel.value({name:l.name}))})} +if(action==="epg"){const nm=q.get("name")||""; +try{return liveJ(await liveEpgFor(nm))}catch(e){console.log("[LIVE-EPG-ERR]",e&&e.message); +return liveJ({has:false,list:[],err:String(e&&e.message||e)})}} if(action==="m3u8"){const id=(q.get("id")||"").replace(/[^\d]/g,"");const p=Math.max(0,parseInt(q.get("p")||"0",10)||0); if(!id)return liveJ({url:""}); const fu=await liveResolve(id,p);