From b1e34173e0b84cccf70c06200c48d8a8188d6166 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 16 Jun 2022 14:02:44 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Android=20=E7=AB=AF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93=E5=AF=86?= =?UTF-8?q?=E9=92=A5=20Fix=20https://github.com/siyuan-note/siyuan/issues/?= =?UTF-8?q?5198?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/mobile/util/menu.ts | 1 + app/src/protyle/util/compatibility.ts | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index 248c2f5c0..0d4be950f 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -319,6 +319,7 @@ ${accountHTML} writeText(window.siyuan.config.repo.key); }); modelMainElement.querySelector("#token").addEventListener("click", () => { + showMessage(window.siyuan.languages.copied); writeText(window.siyuan.config.api.token); }); modelMainElement.querySelector("#exportData").addEventListener("click", () => { diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index 63db39d11..a19041662 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -1,5 +1,16 @@ export const writeText = async (text: string) => { try { + // navigator.clipboard.writeText 抛出异常不进入 catch,这里需要先处理移动端复制 + if ("android" === window.siyuan.config.system.container && window.JSAndroid) { + + window.JSAndroid.writeClipboard(text); + return; + } + if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) { + window.webkit.messageHandlers.setClipboard.postMessage(text); + return; + } + navigator.clipboard.writeText(text); } catch (e) { if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) {