From f009bd6f9cdb33656326087ea91ccc4899ae2f14 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 17 Mar 2024 00:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E8=89=B2=E9=A2=9D=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/global.js | 5 ++-- public/videos/dplayer.html | 50 -------------------------------------- themes/theme.js | 15 ++++++++---- 3 files changed, 13 insertions(+), 57 deletions(-) delete mode 100644 public/videos/dplayer.html diff --git a/lib/global.js b/lib/global.js index 4eadfa19..57f5e41d 100644 --- a/lib/global.js +++ b/lib/global.js @@ -16,7 +16,8 @@ export function GlobalContextProvider(props) { const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言 const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言 const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题 - const [isDarkMode, updateDarkMode] = useState(NOTION_CONFIG?.APPEARANCE || APPEARANCE === 'dark') // 默认深色模式 + const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE === 'dark' + const [isDarkMode, updateDarkMode] = useState(defaultDarkMode) // 默认深色模式 const [onLoading, setOnLoading] = useState(false) // 抓取文章数据 const router = useRouter() @@ -57,7 +58,7 @@ export function GlobalContextProvider(props) { } useEffect(() => { - initDarkMode(updateDarkMode) + initDarkMode(updateDarkMode,defaultDarkMode) initLocale(lang, locale, updateLang, updateLocale) }, []) diff --git a/public/videos/dplayer.html b/public/videos/dplayer.html deleted file mode 100644 index 66573c2b..00000000 --- a/public/videos/dplayer.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - DPlayer Video Player - - - - - - - -
- - - - - - - - - - \ No newline at end of file diff --git a/themes/theme.js b/themes/theme.js index 5a237dce..7b50b1ee 100644 --- a/themes/theme.js +++ b/themes/theme.js @@ -90,14 +90,19 @@ const checkThemeDOM = () => { * @param updateDarkMode 更改主题ChangeState函数 * @description 读取cookie中存的用户主题 */ -export const initDarkMode = (updateDarkMode) => { +export const initDarkMode = (updateDarkMode,defaultDarkMode) => { // 查看用户设备浏览器是否深色模型 let newDarkMode = isPreferDark() - // 查看cookie中是否用户强制设置深色模式 - const cookieDarkMode = loadDarkModeFromLocalStorage() - if (cookieDarkMode) { - newDarkMode = JSON.parse(cookieDarkMode) + // 查看localStorage中用户记录的是否深色模式 + const userDarkMode = loadDarkModeFromLocalStorage() + if (userDarkMode) { + newDarkMode = userDarkMode + } + + // 如果站点强制设置默认深色，则优先级改过用 + if(defaultDarkMode){ + newDarkMode = defaultDarkMode } // url查询条件中是否深色模式