From b02fb8e75e0d71a7a8590fc0e752496280f6b5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E8=99=9E=E6=B8=A0=E6=88=90=E2=80=9D?= <“yuqucheng2006@qq.com”> Date: Thu, 25 Jun 2026 13:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Res/language/language.json | 171 +++++++++--------- Assets/Res/ui/common/双按钮提示.prefab | 8 +- Assets/Res/ui/homepage/fov设置.prefab | 2 +- Assets/Res/ui/homepage/距离设置.prefab | 6 +- Assets/Res/ui/homepage/错误提示.prefab | 8 +- Assets/Res/ui/videopage/videoPage.prefab | 14 ++ .../Scripts/UI/Pages/HomePage/HomePageCtrl.cs | 18 +- 7 files changed, 118 insertions(+), 109 deletions(-) diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index 2abfca9..e6fc6bb 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -347,7 +347,7 @@ { "key": "100070", "zh": "该设备已绑定至其他账号，无法重复绑定", - "en": "This device is already linked to another account and cannot be added again" + "en": "This device is already linked to another account and cannot be re-linked." }, { "key": "100071", @@ -392,7 +392,7 @@ { "key": "100079", "zh": "视频录制", - "en": "Video Recordings" + "en": "Video Recording" }, { "key": "100080", @@ -407,17 +407,17 @@ { "key": "100082", "zh": "请输入WiFi名称", - "en": "Please enter the WiFi name" + "en": "Please enter Wi-Fi name" }, { "key": "100083", "zh": "WiFi配置失败", - "en": "WiFi configuration failed" + "en": "Wi-Fi configuration failed" }, { "key": "100084", "zh": "不是可解析的二维码", - "en": "Not a valid QR code" + "en": "Not a parseable QR code" }, { "key": "100085", @@ -427,12 +427,12 @@ { "key": "100086", "zh": "没有可用的相机", - "en": "No available camera found" + "en": "No available camera" }, { "key": "100087", "zh": "绑定设备失败", - "en": "Bind device failed" + "en": "Device binding failed" }, { "key": "100088", @@ -447,17 +447,17 @@ { "key": "100090", "zh": "距离", - "en": "Lens" + "en": "Range" }, { "key": "100091", "zh": "补光灯", - "en": "Light" + "en": "Fill Light" }, { "key": "100092", "zh": "安全", - "en": "Safe" + "en": "Safety" }, { "key": "100093", @@ -472,7 +472,7 @@ { "key": "100095", "zh": "扫描", - "en": "Scan" + "en": "Scanning" }, { "key": "100096", @@ -507,12 +507,12 @@ { "key": "100102", "zh": "Fov设置", - "en": "Fov Settings" + "en": "FOV Settings" }, { "key": "100103", "zh": "性能提升{0}", - "en": "{0} improvement in performance" + "en": "Performance improvement: {0}" }, { "key": "100104", @@ -532,17 +532,17 @@ { "key": "100107", "zh": "距离设置", - "en": "Lens Settings" + "en": "Range Settings" }, { "key": "100108", "zh": "补光灯设置", - "en": "Light Settings" + "en": "Fill Light Settings" }, { "key": "100109", "zh": "开启/关闭", - "en": "ON/OFF" + "en": "On/Off" }, { "key": "100110", @@ -592,7 +592,7 @@ { "key": "100119", "zh": "毫米波雷达", - "en": "Millimeter-wave Radar" + "en": "Millimeter-Wave Radar" }, { "key": "100120", @@ -737,17 +737,17 @@ { "key": "100148", "zh": "我的设备（{0}）", - "en": "My Devices（{0}）" + "en": "My Devices ({0})" }, { "key": "100149", "zh": "分享给我的设备（{0}）", - "en": "Shared by others（{0}）" + "en": "Shared with me ({0})" }, { "key": "100150", "zh": "无法确定激光是否会损坏背景。您可以通过向激光指示器发射激光来进行点火测试，以测试其效果（请注意，激光能量不足以烧穿背景材料，但可能会损坏表面的油漆或颜色）。", - "en": "It cannot be determined whether the laser will damage the background. You can conduct an ignition test by directing the laser at the background indicator to assess its effect.(Please note: the laser energy is insufficient to burn through the background material but may damage surface paint or coloring )" + "en": "It cannot be determined whether the laser will damage the background. You can conduct an ignition test by firing the laser at a target to assess the effect. (Note: the laser energy is insufficient to burn through the background material, but may damage surface paint or finish.)" }, { "key": "100151", @@ -797,7 +797,7 @@ { "key": "100160", "zh": "恢复出厂设置", - "en": "Restore Settings" + "en": "Restore Factory Settings" }, { "key": "100161", @@ -807,7 +807,7 @@ { "key": "100162", "zh": "开启视频录制功能后，可在线查看消杀前后的视\n频，或下载这些视频。", - "en": "After enabling the video recording function, you can view the videos before and after elimination online, or download these videos" + "en": "After enabling video recording, you can view videos captured before and after elimination online, or download them." }, { "key": "100163", @@ -822,7 +822,7 @@ { "key": "100165", "zh": "音量", - "en": "Sound Level" + "en": "Volume" }, { "key": "100166", @@ -847,7 +847,7 @@ { "key": "100170", "zh": "删除设备", - "en": "Stop" + "en": "Remove Device" }, { "key": "100171", @@ -857,7 +857,7 @@ { "key": "100172", "zh": "休眠", - "en": "Dormancy" + "en": "Sleep" }, { "key": "100173", @@ -872,42 +872,42 @@ { "key": "100175", "zh": "永不", - "en": "never" + "en": "Never" }, { "key": "100176", "zh": "1分钟", - "en": "1min" + "en": "1 min" }, { "key": "100177", "zh": "5分钟", - "en": "5min" + "en": "5 min" }, { "key": "100178", "zh": "10分钟", - "en": "10min" + "en": "10 min" }, { "key": "100179", "zh": "30分钟", - "en": "30min" + "en": "30 min" }, { "key": "100180", "zh": "3秒", - "en": "3s" + "en": "3 sec" }, { "key": "100181", "zh": "5秒", - "en": "5s" + "en": "5 sec" }, { "key": "100182", "zh": "10秒", - "en": "10s" + "en": "10 sec" }, { "key": "100183", @@ -972,7 +972,7 @@ { "key": "100195", "zh": "语言设置", - "en": "Language Setting" + "en": "Language Settings" }, { "key": "100196", @@ -982,7 +982,7 @@ { "key": "100197", "zh": "头像", - "en": "Profile Photo" + "en": "Avatar" }, { "key": "100198", @@ -997,7 +997,7 @@ { "key": "100200", "zh": "设置", - "en": "Setting" + "en": "Settings" }, { "key": "100201", @@ -1006,18 +1006,18 @@ }, { "key": "100202", - "zh": "请输入用户ID", - "en": "Please enter User ID" + "zh": "请输入要共享的用户ID", + "en": "Please enter the User ID to share with" }, { "key": "100203", "zh": "找到二维码，并将其放置在上方摄像头视野范围内。", - "en": "Find the QR code and place it within the upper camera frame" + "en": "Find the QR code and place it within the upper camera frame." }, { "key": "100204", "zh": "请输入要共享的用户ID", - "en": "Please Enter shared user ID" + "en": "Please enter the User ID to share with" }, { "key": "100205", @@ -1047,7 +1047,7 @@ { "key": "100210", "zh": "取消共享后，被共享的用户将无法再查看其信息。", - "en": "After stop sharing, the shared users will no longer be able to view its information." + "en": "After stopping sharing, shared users will no longer be able to view device information." }, { "key": "100211", @@ -1057,7 +1057,7 @@ { "key": "100212", "zh": "设备型号", - "en": "Model Name" + "en": "Device Model" }, { "key": "100213", @@ -1092,7 +1092,7 @@ { "key": "100219", "zh": "当前已经是最新版本了", - "en": "Your firmware is up to date" + "en": "Your firmware is already up to date" }, { "key": "100220", @@ -1107,7 +1107,7 @@ { "key": "100222", "zh": "WiFi配置成功", - "en": "WiFi configuration successful" + "en": "Wi-Fi configuration successful" }, { "key": "100223", @@ -1137,72 +1137,72 @@ { "key": "100228", "zh": "温度错误：", - "en": "Temperature error:" + "en": "Temperature Error:" }, { "key": "100229", "zh": "温度过高", - "en": "Temperature is too high" + "en": "Temperature too high" }, { "key": "100230", "zh": "温度过低", - "en": "Temperature is too low" + "en": "Temperature too low" }, { "key": "100231", "zh": "电机错误:", - "en": "Motor error:" + "en": "Motor Error:" }, { "key": "100232", "zh": "温度异常", - "en": "Temperature error" + "en": "Temperature Abnormal" }, { "key": "100233", "zh": "反馈异常", - "en": "Feedback error" + "en": "Feedback Abnormal" }, { "key": "100234", "zh": "激光器错误:", - "en": "Laser error:" + "en": "Laser Error:" }, { "key": "100235", "zh": "电压过高", - "en": "Voltage is too high" + "en": "Voltage too high" }, { "key": "100236", "zh": "电压过低", - "en": "Voltage is too low" + "en": "Voltage too low" }, { "key": "100237", "zh": "视觉传感器异常:", - "en": "Vision error:" + "en": "Vision Sensor Error:" }, { "key": "100238", "zh": "通信异常", - "en": "Communication error:" + "en": "Communication Error" }, { "key": "100239", "zh": "加速度传感器异常:", - "en": "Accelerometer error:" + "en": "Accelerometer Error:" }, { "key": "100240", "zh": "毫米波雷达异常:", - "en": "Millimeter-Wave Radar error:" + "en": "Millimeter-Wave Radar Error:" }, { "key": "100241", "zh": "激光雷达异常:", - "en": "LiDAR error:" + "en": "LiDAR Error:" }, { "key": "100242", @@ -1227,17 +1227,17 @@ { "key": "100246", "zh": "启用电子邮件通知获取重要消息", - "en": "Enable email notifications to get important messages." + "en": "Enable email notifications to receive important messages." }, { "key": "100247", "zh": "最近一次消杀", - "en": "latest elimination" + "en": "Latest Elimination" }, { "key": "100248", "zh": "最近一次扫描", - "en": "latest detection" + "en": "Latest Detection" }, { "key": "100249", @@ -1257,12 +1257,12 @@ { "key": "100252", "zh": "年", - "en": "Annual" + "en": "Yearly" }, { "key": "100253", "zh": "热力图", - "en": "Mosquitoes Heatmap" + "en": "Mosquito Heatmap" }, { "key": "100254", @@ -1272,7 +1272,7 @@ { "key": "100255", "zh": "总计：", - "en": "Total：" + "en": "Total:" }, { "key": "100256", @@ -1292,7 +1292,7 @@ { "key": "100259", "zh": "灭蚊排行榜", - "en": "Mosquito Elimination Ranking" + "en": "Mosquito Elimination Leaderboard" }, { "key": "100260", @@ -1307,7 +1307,7 @@ { "key": "100262", "zh": "设备教学", - "en": "Device Teaching" + "en": "Device Tutorial" }, { "key": "100263", @@ -1327,57 +1327,57 @@ { "key": "100266", "zh": "反馈", - "en": "Feedback issue" + "en": "Feedback" }, { "key": "100267", "zh": "详情", - "en": "Detail" + "en": "Details" }, { "key": "100268", "zh": "帮助与反馈", - "en": "Help and Feedback" + "en": "Help & Feedback" }, { "key": "100269", "zh": "发送反馈", - "en": "Send feedback" + "en": "Send Feedback" }, { "key": "100270", "zh": "反馈类型（必填）", - "en": "Feedback Type（Required）" + "en": "Feedback Type (Required)" }, { "key": "100271", "zh": "技术问题", - "en": "Technical issue" + "en": "Technical Issue" }, { "key": "100272", "zh": "产品建议", - "en": "Product suggestion" + "en": "Product Suggestion" }, { "key": "100273", "zh": "使用咨询", - "en": "Use consultation" + "en": "Usage Consultation" }, { "key": "100274", "zh": "其他问题", - "en": "Other issues" + "en": "Other Issues" }, { "key": "100275", "zh": "上传截图", - "en": "Upload screenshot" + "en": "Upload Screenshot" }, { "key": "100276", "zh": "设备教学", - "en": "Device Teaching" + "en": "Device Tutorial" }, { "key": "100277", @@ -1407,7 +1407,7 @@ { "key": "100282", "zh": "未找到该用户，请确认ID后重新发送邀请", - "en": "User not found, please confirm the ID and resend the invitation." + "en": "User not found. Please confirm the ID and resend the invitation." }, { "key": "100283", @@ -1422,17 +1422,17 @@ { "key": "100285", "zh": "退出登录", - "en": "Sign out" + "en": "Sign Out" }, { "key": "100286", "zh": "确认退出登录吗？", - "en": "Are you sure you want to log out?" + "en": "Are you sure you want to sign out?" }, { "key": "100287", "zh": "该设备已绑定", - "en": "This device is already linked" + "en": "This device is already bound" }, { "key": "100288", @@ -1442,7 +1442,7 @@ { "key": "100289", "zh": "如需新增或修改指纹，可按设备端屏幕提示，录入指纹", - "en": "If you have any new or modified fingerprint requirements, please follow the instructions on the device screen to enter the fingerprint." + "en": "To add or modify fingerprints, please follow the instructions on the device screen to enroll." }, { "key": "100290", @@ -1452,7 +1452,7 @@ { "key": "100291", "zh": "确认删除设备吗？", - "en": "Are you sure you want to delete the device?" + "en": "Are you sure you want to delete this device?" }, { "key": "100292", @@ -1468,6 +1468,11 @@ "key": "100294", "zh": "正在下载固件，请保持屏幕常亮", "en": "Downloading firmware. Please keep the screen on." + }, + { + "key": "100295", + "zh": "显示最近30天的消杀记录", + "en": "Display elimination records of the past 30 days" } diff --git a/Assets/Res/ui/common/双按钮提示.prefab b/Assets/Res/ui/common/双按钮提示.prefab index 23a30f2..b974fc4 100644 --- a/Assets/Res/ui/common/双按钮提示.prefab +++ b/Assets/Res/ui/common/双按钮提示.prefab @@ -186,8 +186,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 + m_Left: 30 + m_Right: 30 m_Top: 55 m_Bottom: 30 m_ChildAlignment: 1 @@ -249,7 +249,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -32, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 256, y: 90} m_Pivot: {x: 1, y: 0} --- !u!222 &7593189039150743917 @@ -817,7 +817,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 32, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 256, y: 90} m_Pivot: {x: 0, y: 0} --- !u!222 &9012261608952194769 diff --git a/Assets/Res/ui/homepage/fov设置.prefab b/Assets/Res/ui/homepage/fov设置.prefab index 80bb6c8..f057f16 100644 --- a/Assets/Res/ui/homepage/fov设置.prefab +++ b/Assets/Res/ui/homepage/fov设置.prefab @@ -1838,7 +1838,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 141, y: -161} - m_SizeDelta: {x: 160, y: 50} + m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0, y: 1} --- !u!222 &4885574584866394109 CanvasRenderer: diff --git a/Assets/Res/ui/homepage/距离设置.prefab b/Assets/Res/ui/homepage/距离设置.prefab index 58134b2..0314118 100644 --- a/Assets/Res/ui/homepage/距离设置.prefab +++ b/Assets/Res/ui/homepage/距离设置.prefab @@ -349,7 +349,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1580085518831563756} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2381,7 +2381,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 141, y: -161} - m_SizeDelta: {x: 160, y: 50} + m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0, y: 1} --- !u!222 &7849405607512026235 CanvasRenderer: @@ -2424,7 +2424,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "90\xB0" + m_Text: --- !u!1 &8722062394384378896 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/homepage/错误提示.prefab b/Assets/Res/ui/homepage/错误提示.prefab index e8b1b0b..a8309e6 100644 --- a/Assets/Res/ui/homepage/错误提示.prefab +++ b/Assets/Res/ui/homepage/错误提示.prefab @@ -112,7 +112,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6451702227046065377 CanvasRenderer: @@ -176,7 +176,7 @@ RectTransform: m_GameObject: {fileID: 4475642181586946535} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0003841, y: 1.0003841, z: 1.0003841} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7472144947167662218} @@ -396,7 +396,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 295, y: -130} + m_AnchoredPosition: {x: 295, y: -140} m_SizeDelta: {x: 530, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4812881246961385574 @@ -480,7 +480,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6318456875706447668} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Res/ui/videopage/videoPage.prefab b/Assets/Res/ui/videopage/videoPage.prefab index 769ef09..f15d0e5 100644 --- a/Assets/Res/ui/videopage/videoPage.prefab +++ b/Assets/Res/ui/videopage/videoPage.prefab @@ -1697,6 +1697,7 @@ GameObject: - component: {fileID: 7389139087663539165} - component: {fileID: 2950320078278263158} - component: {fileID: 8230983586003434279} + - component: {fileID: 664495279694028958} m_Layer: 5 m_Name: tip m_TagString: Untagged @@ -1765,6 +1766,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Display elimination records of the past 30 days +--- !u!114 &664495279694028958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311629694289755230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} + m_Name: + m_EditorClassIdentifier: + textKey: 100295 --- !u!1 &5384627497149712950 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs index 4425413..893de38 100644 --- a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs +++ b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs @@ -214,26 +214,16 @@ namespace Kill.UI.Pages } }); - // 等待登录结果（最多3秒） - float timeout = 3f; + // 等待登录结果（最多2秒） + float timeout = 2f; float elapsed = 0f; while (!isBluetoothUserLoggedIn && elapsed < timeout) { yield return new WaitForSeconds(0.1f); elapsed += 0.1f; } - - if (isBluetoothUserLoggedIn) - { - Debug.Log("[HomePageCtrl] 蓝牙用户登录成功，获取锁定状态"); - BLECommunicationManager.Instance.ReadDeviceLockControl(); - } - else - { - Debug.LogWarning("[HomePageCtrl] 蓝牙用户登录超时，3s重试"); - yield return new WaitForSeconds(3); - StartCoroutine(BluetoothUserLoginThenQueryStatus()); - } + BLECommunicationManager.Instance.ReadDeviceLockControl(); + } ///