diff --git a/SrcJuying.js b/SrcJuying.js index 6cde72a2..5e867cef 100644 --- a/SrcJuying.js +++ b/SrcJuying.js @@ -552,8 +552,8 @@ function dianboyiji() { return !it.stop; }); let index = yxdatalist.indexOf(yxdatalist.filter(d => d.type==sourceType && d.name==sourceName )[0]); - let sourceData = yxdatalist[index] || {}; - let selectGroup = sourceData.group || sourceData.type; + let jkdata = yxdatalist[index] || {}; + let selectGroup = jkdata.group || jkdata.type; if(!selectGroup){ sourceName = ''; } @@ -682,7 +682,7 @@ function dianboyiji() { } return 'hikery://empty'; } - },sourceData); + },jkdata); d.push({ title: "搜索", @@ -709,81 +709,85 @@ function dianboyiji() { } } if(sourceName){ - try{ - require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyData.js'); - let objdata = getYiData(sourceData); - let fllists = objdata.fllists; - if(fllists){ - d = d.concat(fllists); - }else if(objdata.error['fl']){ - d.push({ - title: "分类获取失败", - desc: '无法访问或源失效,点击查看网页', - url: getHome(MY_URL) + '#noHistory#', - col_type: 'text_center_1' - }); - } + if(jkdata.type=="drpy"){ + + }else{ + try{ + require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyData.js'); + let objdata = getYiData(jkdata); + let fllists = objdata.fllists; + if(fllists){ + d = d.concat(fllists); + }else if(objdata.error['fl']){ + d.push({ + title: "分类获取失败", + desc: '无法访问或源失效,点击查看网页', + url: getHome(MY_URL) + '#noHistory#', + col_type: 'text_center_1' + }); + } - let vodlists = objdata.vodlists; - if(vodlists && vodlists.length>0){ - vodlists.forEach(list=>{ - let vodname =list.vod_name; - if(vodname){ - vodname = vodname.replace(/<\/?.+?\/?>/g,'').replace(/在线观看/g,'').replace('·','·'); - let voddesc = list.vod_desc || ""; - let vodpic = list.vod_pic; - vodpic = vodpic.replace('/img.php?url=', '').replace('/tu.php?tu=', ''); - vodpic = vodpic.includes('(') ? vodpic.match(/\(\'(.*?)\'\)/)[1] : vodpic; - if(/^\/\//.test(vodpic)){ - vodpic = "https:" + vodpic; - } - if(!/^http|hiker/.test(vodpic)){ - vodpic = getHome(list.vod_url) + '/' + vodpic; - } - - d.push({ - title: vodname, - desc: voddesc.replace(/<\/?.+?\/?>/g,''), - pic_url: vodpic + (/eferer=/.test(vodpic)?"":"@Referer="), - url: /^hiker/.test(list.vod_url)?list.vod_url:list.play?list.play:$("hiker://empty#immersiveTheme##autoCache#").rule(() => { - require(config.依赖); - dianboerji() - }), - col_type: 'movie_3', - extra: { - url: list.vod_url, - pic: vodpic, - pageTitle: vodname, - data: sourceData + let vodlists = objdata.vodlists; + if(vodlists && vodlists.length>0){ + vodlists.forEach(list=>{ + let vodname =list.vod_name; + if(vodname){ + vodname = vodname.replace(/<\/?.+?\/?>/g,'').replace(/在线观看/g,'').replace('·','·'); + let voddesc = list.vod_desc || ""; + let vodpic = list.vod_pic; + vodpic = vodpic.replace('/img.php?url=', '').replace('/tu.php?tu=', ''); + vodpic = vodpic.includes('(') ? vodpic.match(/\(\'(.*?)\'\)/)[1] : vodpic; + if(/^\/\//.test(vodpic)){ + vodpic = "https:" + vodpic; } - }) - } - }) - }else if(objdata.error['vod'] && MY_PAGE==1){ - d.push({ - title: "列表获取失败", - desc: '无法访问或源失效,点击查看网页', - url: MY_URL + '#noHistory#', - col_type: 'text_center_1' - }); - }else if(vodlists && vodlists.length == 0 && MY_PAGE==1){ + if(!/^http|hiker/.test(vodpic)){ + vodpic = getHome(list.vod_url) + '/' + vodpic; + } + + d.push({ + title: vodname, + desc: voddesc.replace(/<\/?.+?\/?>/g,''), + pic_url: vodpic + (/eferer=/.test(vodpic)?"":"@Referer="), + url: /^hiker/.test(list.vod_url)?list.vod_url:list.play?list.play:$("hiker://empty#immersiveTheme##autoCache#").rule(() => { + require(config.依赖); + dianboerji() + }), + col_type: 'movie_3', + extra: { + url: list.vod_url, + pic: vodpic, + pageTitle: vodname, + data: jkdata + } + }) + } + }) + }else if(objdata.error['vod'] && MY_PAGE==1){ + d.push({ + title: "列表获取失败", + desc: '无法访问或源失效,点击查看网页', + url: MY_URL + '#noHistory#', + col_type: 'text_center_1' + }); + }else if(vodlists && vodlists.length == 0 && MY_PAGE==1){ + d.push({ + title: '列表为空', + desc: '点击查看网页', + url: MY_URL + '#noHistory#', + col_type: 'text_center_1' + }); + } + }catch(e){ d.push({ - title: '列表为空', - desc: '点击查看网页', + title: '源接口异常了,请更换', + desc: '调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber, url: MY_URL + '#noHistory#', col_type: 'text_center_1' }); + log(jkdata.name+'>调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber); } - }catch(e){ - d.push({ - title: '源接口异常了,请更换', - desc: '调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber, - url: MY_URL + '#noHistory#', - col_type: 'text_center_1' - }); - log(sourceData.name+'>调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber); } - } + } deleteItemByCls("loading_gif"); setResult(d); }