Merge branch

This commit is contained in:
the1812 2018-12-30 22:32:03 +08:00
commit eff16f94d4
12 changed files with 111 additions and 7 deletions

View File

@ -25,6 +25,7 @@
## 默认值
### 视频
- 默认播放器模式: `常规`
- 默认播放器布局: `新版2`
- 使用默认视频画质: `关闭`
- 画质设定: `自动`
- 使用默认弹幕设置: `关闭`
@ -94,6 +95,15 @@
### 默认播放器模式
设置默认的播放器模式, 可以为`常规`, `宽屏`或`网页全屏`(`全屏`还未完成). 默认模式将在进入视频页面的首次播放时应用.
### 默认播放器布局
设置视频页(非番剧/电影)默认的播放器布局.
> **⚠ 更改此设置将立即刷新页面**
> **⚠ 旧版布局中, 很多功能将不适用, 如夜间模式, 样式调整, 历史纪录点播放等**
- 旧版: 传统布局/番剧区使用的布局
- 新版: 视频区默认的新版布局
### 默认视频画质
进入视频时自动选择指定的画质, 若视频最高画质低于所选画质, 则使用视频的最高画质.
### 默认弹幕设置

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -67,6 +67,7 @@
color: false,
special: false,
},
defaultPlayerLayout: "新版2",
skipChargeList: false,
autoLightOff: false,
useCache: true,
@ -85,6 +86,7 @@
downloadVideo: true,
downloadDanmaku: true,
useDefaultPlayerMode: true,
useDefaultPlayerLayout: true,
about: false,
blurSettingsPanel: false,
latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/preview/bilibili-evolved.preview.user.js",
@ -585,6 +587,16 @@
skipChargeList: "跳过充电鸣谢",
}
},
useDefaultPlayerLayout: {
path: "min/default-player-layout.min.js",
displayNames: {
"defaultPlayerLayout": "默认播放器布局",
},
dropdown: {
key: "defaultPlayerLayout",
items: ["旧版", "新版"]
},
}
};
Resource.root = "https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/";
Resource.all = {};

View File

@ -67,6 +67,7 @@
color: false,
special: false,
},
defaultPlayerLayout: "新版2",
skipChargeList: false,
autoLightOff: false,
useCache: true,
@ -85,6 +86,7 @@
downloadVideo: true,
downloadDanmaku: true,
useDefaultPlayerMode: true,
useDefaultPlayerLayout: true,
about: false,
blurSettingsPanel: false,
latestVersionLink: "https://github.com/the1812/Bilibili-Evolved/raw/master/bilibili-evolved.user.js",
@ -585,6 +587,16 @@
skipChargeList: "跳过充电鸣谢",
}
},
useDefaultPlayerLayout: {
path: "min/default-player-layout.min.js",
displayNames: {
"defaultPlayerLayout": "默认播放器布局",
},
dropdown: {
key: "defaultPlayerLayout",
items: ["旧版", "新版"]
},
}
};
Resource.root = "https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/";
Resource.all = {};

1
min/default-player-layout.min.js vendored Normal file
View File

@ -0,0 +1 @@
(()=>{return(t,e)=>{(async()=>{const e=await SpinQuery.select(()=>document.querySelector(`input[key=defaultPlayerLayout]`));if(!e){return}const o="stardustvideo";const n="旧版";const a="新版";const c={[n]:0,[a]:2};const i=document.cookie.split(";").filter(t=>t.includes(o+"=0")).length>0?n:a;function u(t){document.cookie=`${o}=${c[t]};path=/;domain=.bilibili.com;max-age=31536000`;window.location.reload()}$(e).on("change",()=>{u(e.value)});if(t.defaultPlayerLayout!==i){u(t.defaultPlayerLayout)}})()}})();

View File

@ -1 +1 @@
<div class="gui-settings-mask"></div><div class="gui-settings-widgets-box icons-enabled"><div class="gui-settings-header"><i class="icon-widgets"></i><span class="gui-settings-title">附加功能</span></div><div class="widgets-container"></div></div><div class="gui-settings-box icons-enabled"><div class="gui-settings-header"><i class="icon-settings"></i><span class="gui-settings-title">设置</span></div><div class="gui-settings-content"><ul><category icon="video">视频</category><dropdown indent="0" key="defaultPlayerMode" dependencies=""></dropdown><checkbox indent="0" key="useDefaultVideoQuality" dependencies=""></checkbox><dropdown indent="1" key="defaultVideoQuality" dependencies="useDefaultVideoQuality"></dropdown><checkbox indent="0" key="useDefaultDanmakuSettings" dependencies=""></checkbox><checkbox indent="1" key="enableDanmaku" dependencies="useDefaultDanmakuSettings"></checkbox><checkbox indent="1" key="rememberDanmakuBlock" dependencies="useDefaultDanmakuSettings enableDanmaku"></checkbox><checkbox indent="0" key="autoLightOff" dependencies=""></checkbox><checkbox indent="0" key="expandDanmakuList" dependencies=""></checkbox><checkbox indent="0" key="expandDescription" dependencies=""></checkbox><checkbox indent="0" key="autoContinue" dependencies=""></checkbox><checkbox indent="0" key="skipChargeList" dependencies=""></checkbox><category icon="style">样式</category><li class="indent-0"><label class="gui-settings-textbox-container"><span>主题颜色</span><div class="custom-color-preview"><div class="predefined-colors popup"><div class="predefined-colors-grid"></div></div></div><input key="customStyleColor" dependencies="" spellcheck="false" type="text"/></label></li><checkbox indent="0" key="useNewStyle" dependencies=""></checkbox><textbox indent="1" key="blurBackgroundOpacity" dependencies="useNewStyle"></textbox><checkbox indent="0" key="useDarkStyle" dependencies=""></checkbox><checkbox indent="0" key="darkSchedule" dependencies=""></checkbox><textbox indent="1" key="darkScheduleStart" dependencies="darkSchedule"></textbox><textbox indent="1" key="darkScheduleEnd" dependencies="darkSchedule"></textbox><checkbox indent="0" key="overrideNavBar" dependencies=""></checkbox><checkbox indent="1" key="showBanner" dependencies="overrideNavBar"></checkbox><checkbox indent="1" key="preserveRank" dependencies="overrideNavBar"></checkbox><checkbox indent="0" key="blurVideoControl" dependencies=""></checkbox><checkbox indent="0" key="customControlBackground" dependencies=""></checkbox><textbox indent="1" key="customControlBackgroundOpacity" dependencies="customControlBackground"></textbox><checkbox indent="0" key="harunaScale" dependencies=""></checkbox><checkbox indent="0" key="removeLiveWatermark" dependencies=""></checkbox><checkbox indent="0" key="removeVideoTopMask" dependencies=""></checkbox><checkbox indent="0" key="forceWide" dependencies=""></checkbox><category icon="tool">工具</category><checkbox indent="0" key="removeAds" dependencies=""></checkbox><checkbox indent="0" key="watchLaterRedirect" dependencies=""></checkbox><checkbox indent="0" key="hideTopSearch" dependencies=""></checkbox><checkbox indent="0" key="fullTweetsTitle" dependencies=""></checkbox><category icon="touch">触摸</category><checkbox indent="0" key="touchNavBar" dependencies=""></checkbox><checkbox indent="0" key="touchVideoPlayer" dependencies=""></checkbox><checkbox indent="1" key="touchVideoPlayerAnimation" dependencies="touchVideoPlayer"></checkbox><checkbox indent="1" key="touchVideoPlayerDoubleTapControl" dependencies="touchVideoPlayer"></checkbox><category icon="other">其他</category><checkbox indent="0" key="toast" dependencies=""></checkbox><checkbox indent="1" key="toastInternalError" dependencies="toast"></checkbox><checkbox indent="0" key="useCache" dependencies=""></checkbox></ul></div><div class="gui-settings-tooltip"></div></div>
<div class="gui-settings-mask"></div><div class="gui-settings-widgets-box icons-enabled"><div class="gui-settings-header"><i class="icon-widgets"></i><span class="gui-settings-title">附加功能</span></div><div class="widgets-container"></div></div><div class="gui-settings-box icons-enabled"><div class="gui-settings-header"><i class="icon-settings"></i><span class="gui-settings-title">设置</span></div><div class="gui-settings-content"><ul><category icon="video">视频</category><dropdown indent="0" key="defaultPlayerMode" dependencies=""></dropdown><dropdown indent="0" key="defaultPlayerLayout" dependencies=""></dropdown><checkbox indent="0" key="useDefaultVideoQuality" dependencies=""></checkbox><dropdown indent="1" key="defaultVideoQuality" dependencies="useDefaultVideoQuality"></dropdown><checkbox indent="0" key="useDefaultDanmakuSettings" dependencies=""></checkbox><checkbox indent="1" key="enableDanmaku" dependencies="useDefaultDanmakuSettings"></checkbox><checkbox indent="1" key="rememberDanmakuBlock" dependencies="useDefaultDanmakuSettings enableDanmaku"></checkbox><checkbox indent="0" key="autoLightOff" dependencies=""></checkbox><checkbox indent="0" key="expandDanmakuList" dependencies=""></checkbox><checkbox indent="0" key="expandDescription" dependencies=""></checkbox><checkbox indent="0" key="autoContinue" dependencies=""></checkbox><checkbox indent="0" key="skipChargeList" dependencies=""></checkbox><category icon="style">样式</category><li class="indent-0"><label class="gui-settings-textbox-container"><span>主题颜色</span><div class="custom-color-preview"><div class="predefined-colors popup"><div class="predefined-colors-grid"></div></div></div><input key="customStyleColor" dependencies="" spellcheck="false" type="text"/></label></li><checkbox indent="0" key="useNewStyle" dependencies=""></checkbox><textbox indent="1" key="blurBackgroundOpacity" dependencies="useNewStyle"></textbox><checkbox indent="0" key="useDarkStyle" dependencies=""></checkbox><checkbox indent="0" key="darkSchedule" dependencies=""></checkbox><textbox indent="1" key="darkScheduleStart" dependencies="darkSchedule"></textbox><textbox indent="1" key="darkScheduleEnd" dependencies="darkSchedule"></textbox><checkbox indent="0" key="overrideNavBar" dependencies=""></checkbox><checkbox indent="1" key="showBanner" dependencies="overrideNavBar"></checkbox><checkbox indent="1" key="preserveRank" dependencies="overrideNavBar"></checkbox><checkbox indent="0" key="blurVideoControl" dependencies=""></checkbox><checkbox indent="0" key="customControlBackground" dependencies=""></checkbox><textbox indent="1" key="customControlBackgroundOpacity" dependencies="customControlBackground"></textbox><checkbox indent="0" key="harunaScale" dependencies=""></checkbox><checkbox indent="0" key="removeLiveWatermark" dependencies=""></checkbox><checkbox indent="0" key="removeVideoTopMask" dependencies=""></checkbox><checkbox indent="0" key="forceWide" dependencies=""></checkbox><category icon="tool">工具</category><checkbox indent="0" key="removeAds" dependencies=""></checkbox><checkbox indent="0" key="watchLaterRedirect" dependencies=""></checkbox><checkbox indent="0" key="hideTopSearch" dependencies=""></checkbox><checkbox indent="0" key="fullTweetsTitle" dependencies=""></checkbox><category icon="touch">触摸</category><checkbox indent="0" key="touchNavBar" dependencies=""></checkbox><checkbox indent="0" key="touchVideoPlayer" dependencies=""></checkbox><checkbox indent="1" key="touchVideoPlayerAnimation" dependencies="touchVideoPlayer"></checkbox><checkbox indent="1" key="touchVideoPlayerDoubleTapControl" dependencies="touchVideoPlayer"></checkbox><category icon="other">其他</category><checkbox indent="0" key="toast" dependencies=""></checkbox><checkbox indent="1" key="toastInternalError" dependencies="toast"></checkbox><checkbox indent="0" key="useCache" dependencies=""></checkbox></ul></div><div class="gui-settings-tooltip"></div></div>

File diff suppressed because one or more lines are too long

View File

@ -15,6 +15,7 @@
<ul>
<category icon="video">视频</category>
<dropdown indent="0" key="defaultPlayerMode" dependencies=""></dropdown>
<dropdown indent="0" key="defaultPlayerLayout" dependencies=""></dropdown>
<checkbox indent="0" key="useDefaultVideoQuality" dependencies=""></checkbox>
<dropdown indent="1" key="defaultVideoQuality" dependencies="useDefaultVideoQuality"></dropdown>
<checkbox indent="0" key="useDefaultDanmakuSettings" dependencies=""></checkbox>

View File

@ -4,6 +4,10 @@
{
const toolTips = {
defaultPlayerMode: `设置默认的播放器模式, 可以为<span>常规</span>, <span>宽屏</span>或<span>网页全屏</span>(<span>全屏</span>还未完成). 默认模式将在进入视频页面的首次播放时应用.`,
defaultPlayerLayout: `设置视频页(非番剧/电影)默认的播放器布局.
- 旧版: 传统布局/番剧区使用的布局
- 新版: 视频区默认的新版布局
: 更改此设置将立即刷新页面; 旧版布局中, 很多功能将不适用, 如夜间模式, 样式调整, 历史纪录点播放等.`,
useDefaultVideoQuality: `进入视频时自动选择指定的画质, 若视频最高画质低于所选画质, 则使用视频的最高画质.`,
defaultVideoQuality: `设定自动选择的视频画质.`,
autoLightOff: `首次播放时, 自动进入关灯模式.`,

View File

@ -1 +1 @@
1.6.24
1.6.24

View File

@ -0,0 +1,38 @@
(() =>
{
return (settings, resources) =>
{
(async () =>
{
const dropdown = await SpinQuery.select(() => document.querySelector(`input[key=defaultPlayerLayout]`));
if (!dropdown)
{
return;
}
const cookieKey = "stardustvideo";
const oldLayout = "旧版";
const newLayout = "新版";
const cookieValues = {
[oldLayout]: 0,
// "新版1": 1,
[newLayout]: 2,
};
const currentLayout = document.cookie.split(";")
.filter(it => it.includes(cookieKey + "=0")).length > 0 ? oldLayout : newLayout;
function setLayout(layoutName)
{
document.cookie = `${cookieKey}=${cookieValues[layoutName]};path=/;domain=.bilibili.com;max-age=31536000`;
window.location.reload();
}
$(dropdown).on("change", () =>
{
setLayout(dropdown.value);
});
if (settings.defaultPlayerLayout !== currentLayout)
{
setLayout(settings.defaultPlayerLayout);
}
})();
};
})();