Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ fix https://github.com/siyuan-note/siyuan/issues/6601

Browse source
This commit is contained in:
Vanessa 2022-11-16 10:55:36 +08:00
parent ed58765121
commit 2b0b28b286
3 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/mobile/index.ts
View file

@ -53,16 +53,11 @@ class App {
document.title = window.siyuan.languages.siyuanNote; document.title = window.siyuan.languages.siyuanNote;
bootSync(); bootSync();
loadAssets(confResponse.data.conf.appearance); loadAssets(confResponse.data.conf.appearance);
initMessage();
initAssets(); initAssets();
fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { fetchPost("/api/system/getEmojiConf", {}, emojiResponse => {
window.siyuan.emojis = emojiResponse.data as IEmoji[]; window.siyuan.emojis = emojiResponse.data as IEmoji[];
initFramework(); initFramework();
if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) {
window.webkit.messageHandlers.changeStatusBar.postMessage(getComputedStyle(document.body).getPropertyValue("--b3-theme-background") + " " + window.siyuan.config.appearance.mode);
} else if (window.siyuan.config.system.container === "android" && window.JSAndroid) {
window.JSAndroid.changeStatusBarColor(getComputedStyle(document.body).getPropertyValue("--b3-theme-background"), window.siyuan.config.appearance.mode);
}
initMessage();
}); });
addGA(); addGA();
}); });

38
app/src/util/assets.ts
View file

@ -120,9 +120,9 @@ export const initAssets = () => {
loadingElement.remove(); loadingElement.remove();
}, 160); }, 160);
} }
watchTheme({init: true, theme: window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"}); watchTheme({init: true, OSTheme: window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"});
window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", event => { window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", event => {
watchTheme({init: false, theme: event.matches ? "dark" : "light"}); watchTheme({init: false, OSTheme: event.matches ? "dark" : "light"});
}); });
}; };
@ -246,15 +246,33 @@ export const setMode = (modeElementValue: number) => {
/// #endif /// #endif
}; };
const watchTheme = (data: { init: boolean, OSTheme: string }) => {
export const watchTheme = (data: { init: boolean, theme: string }) => { if ((window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) ||
(window.siyuan.config.system.container === "android" && window.JSAndroid)) {
setTimeout(() => {
const backgroundColor = getComputedStyle(document.body).getPropertyValue("--b3-theme-background")
let mode = window.siyuan.config.appearance.mode;
if (window.siyuan.config.appearance.modeOS) {
if (data.OSTheme === "dark") {
mode = 1;
} else {
mode = 0;
}
}
if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) {
window.webkit.messageHandlers.changeStatusBar.postMessage(backgroundColor + " " + mode);
} else if (window.siyuan.config.system.container === "android" && window.JSAndroid) {
window.JSAndroid.changeStatusBarColor(backgroundColor, mode);
}
}, Constants.TIMEOUT_BLOCKLOAD); // 移动端需要加载完才可以获取到颜色
}
if (data.init) { if (data.init) {
if (window.siyuan.config.appearance.modeOS && ( if (window.siyuan.config.appearance.modeOS && (
(window.siyuan.config.appearance.mode === 1 && data.theme === "light") || (window.siyuan.config.appearance.mode === 1 && data.OSTheme === "light") ||
(window.siyuan.config.appearance.mode === 0 && data.theme === "dark") (window.siyuan.config.appearance.mode === 0 && data.OSTheme === "dark")
)) { )) {
fetchPost("/api/system/setAppearanceMode", { fetchPost("/api/system/setAppearanceMode", {
mode: data.theme === "light" ? 0 : 1 mode: data.OSTheme === "light" ? 0 : 1
}, response => { }, response => {
window.siyuan.config.appearance = response.data.appearance; window.siyuan.config.appearance = response.data.appearance;
loadAssets(response.data.appearance); loadAssets(response.data.appearance);
@ -267,12 +285,12 @@ export const watchTheme = (data: { init: boolean, theme: string }) => {
if (!window.siyuan.config.appearance.modeOS) { if (!window.siyuan.config.appearance.modeOS) {
return; return;
} }
if ((window.siyuan.config.appearance.mode === 0 && data.theme === "light") || if ((window.siyuan.config.appearance.mode === 0 && data.OSTheme === "light") ||
(window.siyuan.config.appearance.mode === 1 && data.theme === "dark")) { (window.siyuan.config.appearance.mode === 1 && data.OSTheme === "dark")) {
return; return;
} }
fetchPost("/api/system/setAppearanceMode", { fetchPost("/api/system/setAppearanceMode", {
mode: data.theme === "light" ? 0 : 1 mode: data.OSTheme === "light" ? 0 : 1
}, response => { }, response => {
if (window.siyuan.config.appearance.themeJS) { if (window.siyuan.config.appearance.themeJS) {
/// #if !MOBILE /// #if !MOBILE

4
app/src/util/onGetConfig.ts
View file

@ -15,14 +15,14 @@ import {globalShortcut} from "./globalShortcut";
import {fetchPost} from "./fetch"; import {fetchPost} from "./fetch";
import {mountHelp, newDailyNote} from "./mount"; import {mountHelp, newDailyNote} from "./mount";
import {MenuItem} from "../menus/Menu"; import {MenuItem} from "../menus/Menu";
import {addGA, initAssets, loadAssets, setInlineStyle, setMode, watchTheme} from "./assets"; import {addGA, initAssets, setInlineStyle, setMode} from "./assets";
import {renderSnippet} from "../config/util/snippets"; import {renderSnippet} from "../config/util/snippets";
import {getOpenNotebookCount} from "./pathName"; import {getOpenNotebookCount} from "./pathName";
import {openFileById} from "../editor/util"; import {openFileById} from "../editor/util";
import {focusByRange} from "../protyle/util/selection"; import {focusByRange} from "../protyle/util/selection";
import {exitSiYuan} from "../dialog/processSystem"; import {exitSiYuan} from "../dialog/processSystem";
import {openSetting} from "../config"; import {openSetting} from "../config";
import {getSearch, isBrowser} from "./functions"; import {getSearch} from "./functions";
import {openHistory} from "./history"; import {openHistory} from "./history";
import {initStatus} from "../layout/status"; import {initStatus} from "../layout/status";
import {syncGuide} from "../sync/syncGuide"; import {syncGuide} from "../sync/syncGuide";