From 0bd5b2652bd977e823e877025038bb46bd36b48e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 28 七月 2023 10:33:31 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1

---
 HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings |    2 +-
 HDL-ON_iOS/Resources/en.lproj/Localizable.strings      |    2 +-
 DLL/HdlEzvizDroid.dll                                  |    0 
 DLL/IOS/EZSDK.IOS.dll                                  |    0 
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DLL/HdlEzvizDroid.dll b/DLL/HdlEzvizDroid.dll
index 58d3a63..46365eb 100644
--- a/DLL/HdlEzvizDroid.dll
+++ b/DLL/HdlEzvizDroid.dll
Binary files differ
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 6edfc27..34f80db 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
index 0d5be5d..8b6ff4d 100644
--- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -111,7 +111,7 @@
 "device_callout_alert_message" = "Doorbell on call...";
 "device_callout_hang_up" = "Hang up";
 "device_callout_ignore" = "Ignore";
-"device_callout_answer" = "Answer";
+"device_callout_answered" = "Answer";
 "device_full_scene_play" = "play";
 "device_full_scene_pause" = "Pause";
 "device_full_scene_sound" = "Sound";
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
index 2a5f549..a70b581 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -71,7 +71,7 @@
 "device_callout_alert_message" = "闂ㄩ搩鍛煎彨涓�...";
 "device_callout_hang_up" = "鎸傛柇";
 "device_callout_ignore" = "蹇界暐";
-"device_callout_answer" = "鎺ュ惉";
+"device_callout_answered" = "鎺ュ惉";
 "device_full_scene_play" = "鎾斁";
 "device_full_scene_pause" = "鏆傚仠";
 "device_full_scene_sound" = "闊抽噺";

--
Gitblit v1.8.0