From 047771e6f8e05bec6636170088276d8bfc47dcf3 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 10 Nov 2024 23:04:15 +0800 Subject: [PATCH] no message --- app/Models/WebSocketDialogMsg.php | 4 ++++ language/original-api.txt | 1 + language/original-web.txt | 2 ++ public/tools/map/index.html | 1 - resources/assets/js/functions/eeui.js | 4 +++- .../assets/js/pages/manage/components/DialogView/location.vue | 3 ++- resources/assets/statics/public/tools/map/index.html | 1 - resources/mobile | 2 +- 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php index 5b6d79f23..bae963f58 100644 --- a/app/Models/WebSocketDialogMsg.php +++ b/app/Models/WebSocketDialogMsg.php @@ -1016,6 +1016,10 @@ class WebSocketDialogMsg extends AbstractModel throw new ApiException('保存地图快照失败'); } $imageSize = getimagesize($filePath); + if ($imageSize[0] < 20 || $imageSize[1] < 20) { + throw new ApiException('地图快照尺寸太小'); + } + $msg['thumb_original'] = $msg['thumb']; $msg['thumb'] = $fileUrl; $msg['width'] = $imageSize[0]; $msg['height'] = $imageSize[1]; diff --git a/language/original-api.txt b/language/original-api.txt index 7810b6a2f..14808a2fa 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -727,6 +727,7 @@ webhook地址最长仅支持255个字符。 错误的定位签到。 获取地图快照失败 保存地图快照失败 +地图快照尺寸太小 项目负责人 项目成员 diff --git a/language/original-web.txt b/language/original-web.txt index 7147c9146..73bcc221b 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1787,3 +1787,5 @@ WiFi签到延迟时长为±1分钟。 仅支持移动端App 暂未开放定位签到。 错误的定位签到。 + +正在会议中，无法进入其他会议室 diff --git a/public/tools/map/index.html b/public/tools/map/index.html index fccb294ef..fd499cbf1 100644 --- a/public/tools/map/index.html +++ b/public/tools/map/index.html @@ -4,7 +4,6 @@ - diff --git a/resources/assets/js/functions/eeui.js b/resources/assets/js/functions/eeui.js index 090849498..16d081106 100755 --- a/resources/assets/js/functions/eeui.js +++ b/resources/assets/js/functions/eeui.js @@ -85,7 +85,9 @@ delete object.callback } $A.eeuiModule("eeui").then(obj => { - obj.openPage(object, callback); + obj.openPage(Object.assign({ + softInputMode: "resize", + }, object), callback); }) }, diff --git a/resources/assets/js/pages/manage/components/DialogView/location.vue b/resources/assets/js/pages/manage/components/DialogView/location.vue index 161c1b729..b2d8b76de 100644 --- a/resources/assets/js/pages/manage/components/DialogView/location.vue +++ b/resources/assets/js/pages/manage/components/DialogView/location.vue @@ -19,7 +19,8 @@ export default { backgroundImage: `url(${thumb})`, } if (width && height) { - style.backgroundSize = `${width}px ${height}px`; + const scale = $A.scaleToScale(width, height, 600); + style.backgroundSize = `${scale.width}px ${scale.height}px`; } return style; } diff --git a/resources/assets/statics/public/tools/map/index.html b/resources/assets/statics/public/tools/map/index.html index fccb294ef..fd499cbf1 100644 --- a/resources/assets/statics/public/tools/map/index.html +++ b/resources/assets/statics/public/tools/map/index.html @@ -4,7 +4,6 @@ - diff --git a/resources/mobile b/resources/mobile index aa9a81ddb..fdd51c533 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit aa9a81ddbf6dc2a1a35b244e63da6a284299c65a +Subproject commit fdd51c533c1f3966cbe5ab6249a08015519517bc