From d48287f93a03c8a0ffeabf7e04e70a1167417f86 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 4 Nov 2025 12:44:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BAiPad=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=9C=A8=E9=A2=84=E5=8A=A0=E8=BD=BD=E6=97=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=89=E5=85=A8=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/functions/common.js | 9 +++++++++ resources/assets/js/functions/eeui.js | 12 ++++++++++++ resources/assets/js/store/actions.js | 2 +- resources/mobile | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index d97d71426..2f830689b 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -466,6 +466,15 @@ const timezone = require("dayjs/plugin/timezone"); return ua && /iphone|ipad|ipod|ios/.test(ua); }, + /** + * 是否iPad + * @returns {boolean|string} + */ + isIpad() { + let ua = typeof window !== 'undefined' && window.navigator.userAgent.toLowerCase(); + return ua && /ipad/.test(ua); + }, + /** * 是否安卓 * @returns {boolean|string} diff --git a/resources/assets/js/functions/eeui.js b/resources/assets/js/functions/eeui.js index 512ddd9f9..b1f100261 100755 --- a/resources/assets/js/functions/eeui.js +++ b/resources/assets/js/functions/eeui.js @@ -362,6 +362,18 @@ import {languageName} from "../language"; reject(e); } }) + }, + + // 判断是否窗口化 + eeuiAppIsWindowed() { + return new Promise(async resolve => { + try { + const eeui = await $A.eeuiModulePromise(); + resolve(eeui.isFullscreen() === false || eeui.isFullscreen() === 0); + } catch (e) { + resolve(false); + } + }) } }); diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 6f58737db..ffc16d335 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -177,7 +177,7 @@ export default { if (!state.isFirstPage) { return resolve(null) } - $A.eeuiAppGetSafeAreaInsets().then(data => { + $A.eeuiAppGetSafeAreaInsets().then(async data => { data.top = data.top || state.safeAreaSize?.data?.top || 0 data.bottom = data.bottom || state.safeAreaSize?.data?.bottom || 0 const proportion = data.height / window.outerHeight diff --git a/resources/mobile b/resources/mobile index 65fddcf2c..430291453 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 65fddcf2cdfa4c5dbc9bef60a5c8b66575f2f30f +Subproject commit 4302914539ca3aae58e3724250abafa1a2124233