iotcat
/
Ushio-js
mirror of https://github.com/IoTcat/Ushio-js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aplayer_same_domain

Browse Source
dependabot/npm_and_yarn/minimist-1.2.6
iotcat 3 years ago
parent 21addf7a52
commit 1856701045
6 changed files with 94 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      dist/ushio-footer.js
  2. 2
      dist/ushio-footer.min.js
  3. 16
      dist/ushio-head.js
  4. 2
      dist/ushio-head.min.js
  5. 57
      src/ushio-footer.js
  6. 16
      src/ushio-head.js

57
dist/ushio-footer.js vendored
Unescape View File

@ -393,15 +393,23 @@ session.onload(function(){
}, 3000); }, 3000);
}); });
session.onload(function(){ session.onload(function(){
if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){ function player_ini_pre(){
if(typeof block_aplayer == "undefined" && session.get('aplayer/status') != 'play'){ if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){
setTimeout(function(){player_ini();}, 25000); if(typeof block_aplayer == "undefined" && session.get('aplayer/status') != 'play'){
}else{ setTimeout(function(){player_ini();}, 25000);
player_ini(); }else{
} player_ini();
}
} }
}); }
if(session.LastSyncTime < new Date().valueOf() - 12*1000){
session.onload(player_ini_pre);
}else{
player_ini_pre();
}
}, true);
session.onload(function(){ session.onload(function(){
@ -589,30 +597,37 @@ function player_ini(){
window.aplayers || (window.aplayers = []), window.aplayers || (window.aplayers = []),
window.aplayers.push(a); window.aplayers.push(a);
window.aplayers[0].lrc.hide(); window.aplayers[0].lrc.hide();
adjustSeek();
if(session.get('aplayer/status') == 'play') { if(session.get('aplayer/status') == 'play') {
window.aplayers[0].play(); window.aplayers[0].play();
if(window.aplayers[0].audio.paused) { if(window.aplayers[0].audio.paused) {
window.aplayers[0].notice('Click Here', 5000, 0.8); //window.aplayers[0].notice('Click Here', 20000, 0.8);
if(page.tran.getLang() == 'zh') tips.info({message: "戳左下角继续音乐哦(^_−)☆"}); if(page.tran.getLang() == 'zh') tips.info({timeout: 13000, position:"bottomCenter",message: "<--戳左下角继续音乐哦(^_−)☆"});
else tips.info({message: "Click bottom left conner to continue music (^_−)☆"}); else tips.info({timeout: 13000, position:"bottomCenter",message: "Click bottom left conner to continue music (^_−)☆"});
}; };
} }
window.aplayers[0].on('play', function () { window.aplayers[0].on('play', function () {
session.set('aplayer/status', 'play'); session.onload(function(){
window.aplayers[0].lrc.show(); session.set('aplayer/status', 'play');
if(window.aplayers[0].firstTime === undefined){ });
window.aplayers[0].lrc.show();
adjustSeek(); if(window.aplayers[0].firstTime === undefined){
window.aplayers[0].firstTime = false;
} //adjustSeek();
window.aplayers[0].firstTime = false;
}
}); });
window.aplayers[0].on('pause', function () { window.aplayers[0].on('pause', function () {
session.set('aplayer/status', 'pause'); session.onload(function(){
window.aplayers[0].lrc.hide(); session.set('aplayer/status', 'pause');
});
window.aplayers[0].lrc.hide();
}); });
window.aplayers[0].on('listswitch', function(e){ window.aplayers[0].on('listswitch', function(e){
session.set('aplayer/playing', window.aplayers[0].list.audios[e.index].id); session.onload(function(){
session.set('aplayer/playing', window.aplayers[0].list.audios[e.index].id);
});
}); });
setInterval(function(){ setInterval(function(){
try{ try{

2
dist/ushio-footer.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/ushio-head.js vendored
Unescape View File

@ -39,7 +39,7 @@ if(typeof block_tips == "undefined"){
/* global default page config */ /* global default page config */
var page = { var page = {
version: 'v3.5.1', version: 'v3.5.2',
url: window.location.href, url: window.location.href,
title: 'Lovely Ushio', title: 'Lovely Ushio',
icon: 'https://cdn.yimian.xyz/img/head/head3r.ico', icon: 'https://cdn.yimian.xyz/img/head/head3r.ico',
@ -152,7 +152,15 @@ if(cookie.get('_lang')){
})(); })();
/* session cache */ /* session cache */
var session = {
get: function(s){
return page.session.hasOwnProperty(s) && page.session[s];
}
};
function getCache(){ function getCache(){
let cache = null; let cache = null;
try{ try{
@ -162,6 +170,7 @@ function getCache(){
cache = null; cache = null;
}else{ }else{
if(cache.data.hash){ if(cache.data.hash){
session.LastSyncTime = cache.LastSyncTime;
cache = cache.data; cache = cache.data;
}else{ }else{
throw 'no hash'; throw 'no hash';
@ -176,11 +185,6 @@ function getCache(){
/* session ini */ /* session ini */
var session = {
get: function(s){
return page.session.hasOwnProperty(s) && page.session[s];
}
};
session.onload = function(f, enCache, isFirst){ session.onload = function(f, enCache, isFirst){
if((enCache&&page.cache&&getCache()) || session.status){ if((enCache&&page.cache&&getCache()) || session.status){
if(isFirst == true){ if(isFirst == true){

2
dist/ushio-head.min.js vendored
View File

File diff suppressed because one or more lines are too long

57
src/ushio-footer.js
Unescape View File

@ -393,15 +393,23 @@ session.onload(function(){
}, 3000); }, 3000);
}); });
session.onload(function(){ session.onload(function(){
if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){ function player_ini_pre(){
if(typeof block_aplayer == "undefined" && session.get('aplayer/status') != 'play'){ if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){
setTimeout(function(){player_ini();}, 25000); if(typeof block_aplayer == "undefined" && session.get('aplayer/status') != 'play'){
}else{ setTimeout(function(){player_ini();}, 25000);
player_ini(); }else{
} player_ini();
}
} }
}); }
if(session.LastSyncTime < new Date().valueOf() - 12*1000){
session.onload(player_ini_pre);
}else{
player_ini_pre();
}
}, true);
session.onload(function(){ session.onload(function(){
@ -589,30 +597,37 @@ function player_ini(){
window.aplayers || (window.aplayers = []), window.aplayers || (window.aplayers = []),
window.aplayers.push(a); window.aplayers.push(a);
window.aplayers[0].lrc.hide(); window.aplayers[0].lrc.hide();
adjustSeek();
if(session.get('aplayer/status') == 'play') { if(session.get('aplayer/status') == 'play') {
window.aplayers[0].play(); window.aplayers[0].play();
if(window.aplayers[0].audio.paused) { if(window.aplayers[0].audio.paused) {
window.aplayers[0].notice('Click Here', 5000, 0.8); //window.aplayers[0].notice('Click Here', 20000, 0.8);
if(page.tran.getLang() == 'zh') tips.info({message: "戳左下角继续音乐哦(^_−)☆"}); if(page.tran.getLang() == 'zh') tips.info({timeout: 13000, position:"bottomCenter",message: "<--戳左下角继续音乐哦(^_−)☆"});
else tips.info({message: "Click bottom left conner to continue music (^_−)☆"}); else tips.info({timeout: 13000, position:"bottomCenter",message: "Click bottom left conner to continue music (^_−)☆"});
}; };
} }
window.aplayers[0].on('play', function () { window.aplayers[0].on('play', function () {
session.set('aplayer/status', 'play'); session.onload(function(){
window.aplayers[0].lrc.show(); session.set('aplayer/status', 'play');
if(window.aplayers[0].firstTime === undefined){ });
window.aplayers[0].lrc.show();
adjustSeek(); if(window.aplayers[0].firstTime === undefined){
window.aplayers[0].firstTime = false;
} //adjustSeek();
window.aplayers[0].firstTime = false;
}
}); });
window.aplayers[0].on('pause', function () { window.aplayers[0].on('pause', function () {
session.set('aplayer/status', 'pause'); session.onload(function(){
window.aplayers[0].lrc.hide(); session.set('aplayer/status', 'pause');
});
window.aplayers[0].lrc.hide();
}); });
window.aplayers[0].on('listswitch', function(e){ window.aplayers[0].on('listswitch', function(e){
session.set('aplayer/playing', window.aplayers[0].list.audios[e.index].id); session.onload(function(){
session.set('aplayer/playing', window.aplayers[0].list.audios[e.index].id);
});
}); });
setInterval(function(){ setInterval(function(){
try{ try{

16
src/ushio-head.js
Unescape View File

@ -39,7 +39,7 @@ if(typeof block_tips == "undefined"){
/* global default page config */ /* global default page config */
var page = { var page = {
version: 'v3.5.1', version: 'v3.5.2',
url: window.location.href, url: window.location.href,
title: 'Lovely Ushio', title: 'Lovely Ushio',
icon: 'https://cdn.yimian.xyz/img/head/head3r.ico', icon: 'https://cdn.yimian.xyz/img/head/head3r.ico',
@ -152,7 +152,15 @@ if(cookie.get('_lang')){
})(); })();
/* session cache */ /* session cache */
var session = {
get: function(s){
return page.session.hasOwnProperty(s) && page.session[s];
}
};
function getCache(){ function getCache(){
let cache = null; let cache = null;
try{ try{
@ -162,6 +170,7 @@ function getCache(){
cache = null; cache = null;
}else{ }else{
if(cache.data.hash){ if(cache.data.hash){
session.LastSyncTime = cache.LastSyncTime;
cache = cache.data; cache = cache.data;
}else{ }else{
throw 'no hash'; throw 'no hash';
@ -176,11 +185,6 @@ function getCache(){
/* session ini */ /* session ini */
var session = {
get: function(s){
return page.session.hasOwnProperty(s) && page.session[s];
}
};
session.onload = function(f, enCache, isFirst){ session.onload = function(f, enCache, isFirst){
if((enCache&&page.cache&&getCache()) || session.status){ if((enCache&&page.cache&&getCache()) || session.status){
if(isFirst == true){ if(isFirst == true){

Write Preview
Loading…
Cancel
Save