From fed85eb8733eb50c459f2f75ad469598bd26f7b6 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 21 七月 2023 16:11:29 +0800
Subject: [PATCH] merge dev-wxw to Dev-Branch
---
SiriIntents/SiriIntents.csproj | 6
HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 6
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json | 10
HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/Contents.json | 23 ++
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png | 0
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json | 11
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@3x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@3x.png | 0
HDL-ON_iOS/Resources/en.lproj/Localizable.strings | 31 +++
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png | 0
SiriIntentsUI/SiriIntentsUI.csproj | 6
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/Contents.json | 10
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png | 0
HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png | 0
DLL/IOS/EZSDK.IOS.dll | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png | 0
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings | 29 +++
HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png | 0
HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard | 303 +++++++++++++++++++++++++------------
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn .png | 0
HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png | 0
HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json | 10
55 files changed, 321 insertions(+), 124 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 86181a6..81c670a 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg.png b/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg.png
index 6d59dd0..3644818 100644
--- a/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg.png
+++ b/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png b/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png
index fe4b56c..07340dc 100644
--- a/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png
index fafd7e5..a46ea23 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png
index 74bf56d..1320f0a 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@3x.png
new file mode 100644
index 0000000..25313fd
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
index a823d6f..0c3e498 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
index c1838af..16dc55c 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png
new file mode 100644
index 0000000..3ef38ba
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png
index 22b8248..a30f9fd 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png
index 7d1bbbe..d060083 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@3x.png
new file mode 100644
index 0000000..c7226d9
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png
index 9b398b5..c431f51 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
index 2ea80f4..ba1d20d 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png
new file mode 100644
index 0000000..4862e3a
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/Contents.json
new file mode 100644
index 0000000..1535ae4
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "preview_stoppaly_btn .png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "preview_stoppaly_btn @2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "preview_stoppaly_btn @3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn .png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn .png
new file mode 100644
index 0000000..9d158cd
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn .png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @2x.png
new file mode 100644
index 0000000..e8b6f0f
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @3x.png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @3x.png
new file mode 100644
index 0000000..596038a
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn .imageset/preview_stoppaly_btn @3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/Contents.json
index 4fe27fc..98275d0 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/Contents.json
@@ -1,13 +1,13 @@
{
"images" : [
{
- "idiom" : "universal",
"filename" : "preview_stoppaly_btn_sel.png",
+ "idiom" : "universal",
"scale" : "1x"
},
{
- "idiom" : "universal",
"filename" : "preview_stoppaly_btn_sel@2x.png",
+ "idiom" : "universal",
"scale" : "2x"
},
{
@@ -16,7 +16,7 @@
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png
index 7910053..dc8415d 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png
index 0668cef..a01441f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@3x.png
new file mode 100644
index 0000000..a5e0e92
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json
index b458dba..1958f48 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json
@@ -1,22 +1,23 @@
{
"images" : [
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn .png",
+ "idiom" : "universal",
"scale" : "1x"
},
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn @2x.png",
+ "idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "preview_stopplay_btn @3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png
index 72c3fb4..9d158cd 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
index 003c00b..e8b6f0f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @3x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @3x.png
new file mode 100644
index 0000000..596038a
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json
index b458dba..d7aabbd 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json
@@ -1,13 +1,13 @@
{
"images" : [
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn .png",
+ "idiom" : "universal",
"scale" : "1x"
},
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn @2x.png",
+ "idiom" : "universal",
"scale" : "2x"
},
{
@@ -16,7 +16,7 @@
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png
index 72c3fb4..9d158cd 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
index 003c00b..e8b6f0f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn.png
new file mode 100644
index 0000000..9d158cd
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png
new file mode 100644
index 0000000..e8b6f0f
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png
new file mode 100644
index 0000000..596038a
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json
index 5f871e8..0168d6f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json
@@ -1,13 +1,13 @@
{
"images" : [
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn_sel.png",
+ "idiom" : "universal",
"scale" : "1x"
},
{
- "idiom" : "universal",
"filename" : "preview_stopplay_btn_sel@2x.png",
+ "idiom" : "universal",
"scale" : "2x"
},
{
@@ -16,7 +16,7 @@
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
index 7910053..dc8415d 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
index 0668cef..a01441f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png
new file mode 100644
index 0000000..a5e0e92
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png
index 77c5688..ce321b8 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
index 2554612..4f90c7b 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png
new file mode 100644
index 0000000..afe9882
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
index 2908329..dbd1bfa 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
index 8858696..90e6aa8 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png
new file mode 100644
index 0000000..efe18ff
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png
index b330c2a..ab3bfcf 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png
index 2dff6b3..035ab45 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@3x.png
new file mode 100644
index 0000000..c605952
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
index 7276951..8cdf75f 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
index 1bbf161..0105ca9 100644
--- a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png
new file mode 100644
index 0000000..0eea11e
--- /dev/null
+++ b/HDL-ON_iOS/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f095271..45e9310 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -25,7 +25,7 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
@@ -59,7 +59,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro230630-1-Dev</CodesignProvision>
+<CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
index 63dec62..9e5e029 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment version="4352" identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -14,7 +14,7 @@
<navigationController id="tPl-Go-Tmu" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Item" id="EOh-Lf-fJU"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="9n2-YJ-ND5">
- <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
@@ -35,7 +35,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="R2t-zM-WMl">
- <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R2t-zM-WMl" id="a02-NK-SeS">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -92,14 +92,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="MPX-n4-aGz">
- <rect key="frame" x="82.5" y="100" width="210" height="94"/>
+ <rect key="frame" x="82.5" y="120" width="210" height="94"/>
<constraints>
<constraint firstAttribute="height" constant="94" id="UZa-4y-JdR"/>
<constraint firstAttribute="width" constant="210" id="xPZ-ku-beA"/>
</constraints>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9VU-hP-zCR">
- <rect key="frame" x="45" y="247" width="285" height="39"/>
+ <rect key="frame" x="45" y="267" width="285" height="39"/>
<constraints>
<constraint firstAttribute="height" constant="39" id="Uox-Yc-kob"/>
<constraint firstAttribute="width" constant="285" id="wAy-Hx-fAn"/>
@@ -112,7 +112,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p2R-3f-bRm">
- <rect key="frame" x="45" y="306" width="285" height="39"/>
+ <rect key="frame" x="45" y="326" width="285" height="39"/>
<constraints>
<constraint firstAttribute="height" constant="39" id="Dta-c4-zZr"/>
<constraint firstAttribute="width" constant="285" id="OT3-hb-4Yn"/>
@@ -138,7 +138,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EWl-dl-v7z">
- <rect key="frame" x="45" y="365" width="285" height="39"/>
+ <rect key="frame" x="45" y="385" width="285" height="39"/>
<constraints>
<constraint firstAttribute="height" constant="39" id="FhC-TV-ezu"/>
<constraint firstAttribute="width" constant="285" id="Niw-45-NHf"/>
@@ -151,7 +151,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tbh-3f-Kyo">
- <rect key="frame" x="45" y="483" width="285" height="39"/>
+ <rect key="frame" x="45" y="503" width="285" height="39"/>
<constraints>
<constraint firstAttribute="height" constant="39" id="aUb-DN-crC"/>
<constraint firstAttribute="width" constant="285" id="u2c-90-3In"/>
@@ -164,7 +164,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ps8-ku-D1c">
- <rect key="frame" x="45" y="424" width="285" height="39"/>
+ <rect key="frame" x="45" y="444" width="285" height="39"/>
<constraints>
<constraint firstAttribute="height" constant="39" id="Mu0-my-UVK"/>
<constraint firstAttribute="width" constant="285" id="rGt-yT-DqQ"/>
@@ -222,7 +222,7 @@
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZDeviceCell" rowHeight="73" id="Xkg-Dw-w2X" customClass="DeviceListCell">
- <rect key="frame" x="0.0" y="44.5" width="375" height="73"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="73"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xkg-Dw-w2X" id="Iet-JC-0rQ">
<rect key="frame" x="0.0" y="0.0" width="375" height="73"/>
@@ -392,7 +392,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZCameraCell" id="7Im-ni-l3z">
- <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7Im-ni-l3z" id="DdN-J1-0fa">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -428,13 +428,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="璁惧搴忓垪鍙�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iwL-Ah-WH0">
- <rect key="frame" x="20" y="150" width="72" height="17"/>
+ <rect key="frame" x="20" y="170" width="72" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="bezel" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3Ww-0Y-zfl">
- <rect key="frame" x="102" y="138.5" width="253" height="40"/>
+ <rect key="frame" x="102" y="158.5" width="253" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="zI7-mv-iMH"/>
</constraints>
@@ -442,7 +442,7 @@
<textInputTraits key="textInputTraits"/>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="bezel" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iAj-OV-oUu">
- <rect key="frame" x="102" y="198.5" width="253" height="40"/>
+ <rect key="frame" x="102" y="218.5" width="253" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="jeW-7w-Zss"/>
</constraints>
@@ -450,7 +450,7 @@
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2s3-2Z-WBg">
- <rect key="frame" x="170" y="258.5" width="35" height="33"/>
+ <rect key="frame" x="170" y="278.5" width="35" height="33"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="璺宠浆">
<color key="titleColor" systemColor="darkTextColor"/>
@@ -466,7 +466,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="閫氶亾鍙�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gfd-eM-Uwg">
- <rect key="frame" x="20" y="210" width="43" height="17"/>
+ <rect key="frame" x="20" y="230" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -512,7 +512,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DemoAPICell" id="wpS-t4-02o">
- <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wpS-t4-02o" id="8mM-ux-z21">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -551,7 +551,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="UVM-wN-ME4">
- <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UVM-wN-ME4" id="PFk-ak-8nJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -587,22 +587,22 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8AH-ts-VAl">
- <rect key="frame" x="0.0" y="44" width="187.5" height="100"/>
+ <rect key="frame" x="0.0" y="64" width="187.5" height="100"/>
<color key="backgroundColor" red="0.17321318387985229" green="0.74333697557449341" blue="0.45914602279663086" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="uyH-gu-qB2"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="frT-lO-vkv">
- <rect key="frame" x="187.5" y="144" width="187.5" height="100"/>
+ <rect key="frame" x="187.5" y="164" width="187.5" height="100"/>
<color key="backgroundColor" red="0.17321318387985229" green="0.74333697557449341" blue="0.45914602279663086" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XlI-CJ-eCW">
- <rect key="frame" x="0.0" y="144" width="187.5" height="100"/>
+ <rect key="frame" x="0.0" y="164" width="187.5" height="100"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.65490196079999996" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iCt-fy-olc">
- <rect key="frame" x="187.5" y="44" width="187.5" height="100"/>
+ <rect key="frame" x="187.5" y="64" width="187.5" height="100"/>
<color key="backgroundColor" red="0.85770881180000003" green="0.211302614" blue="0.113631911" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</subviews>
@@ -648,7 +648,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="VhH-MZ-U0P">
- <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VhH-MZ-U0P" id="Kep-2I-4hb">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -683,7 +683,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hdv-eQ-Pot">
- <rect key="frame" x="0.0" y="44" width="375" height="211"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="211"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" secondItem="hdv-eQ-Pot" secondAttribute="height" multiplier="16:9" id="qjy-ev-K4v"/>
@@ -800,24 +800,23 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="gFl-PI-CLn">
- <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="603"/>
</imageView>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NRj-hs-uOI">
- <rect key="frame" x="0.0" y="44" width="375" height="211"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="211"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Xz-5f-ZJx">
<rect key="frame" x="0.0" y="0.0" width="375" height="211"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" red="0.047058823530000002" green="0.054901960780000002" blue="0.062745098040000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="1Xz-5f-ZJx" secondAttribute="height" multiplier="16:9" id="7NS-WA-bEr"/>
</constraints>
</view>
</subviews>
<constraints>
- <constraint firstItem="1Xz-5f-ZJx" firstAttribute="centerY" secondItem="NRj-hs-uOI" secondAttribute="centerY" id="DTc-SB-nnD"/>
+ <constraint firstItem="1Xz-5f-ZJx" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="top" id="DTc-SB-nnD"/>
<constraint firstAttribute="width" secondItem="NRj-hs-uOI" secondAttribute="height" multiplier="16:9" id="FHe-T4-BRJ"/>
<constraint firstItem="1Xz-5f-ZJx" firstAttribute="width" secondItem="NRj-hs-uOI" secondAttribute="width" id="JfK-ti-Ys7"/>
- <constraint firstItem="1Xz-5f-ZJx" firstAttribute="height" secondItem="NRj-hs-uOI" secondAttribute="height" id="QcN-dO-GL9"/>
<constraint firstAttribute="bottom" secondItem="1Xz-5f-ZJx" secondAttribute="bottom" id="ted-kP-rO7"/>
<constraint firstAttribute="trailing" secondItem="1Xz-5f-ZJx" secondAttribute="trailing" id="wA6-Da-kWF"/>
<constraint firstItem="1Xz-5f-ZJx" firstAttribute="centerX" secondItem="NRj-hs-uOI" secondAttribute="centerX" id="zUn-i2-2qZ"/>
@@ -826,7 +825,7 @@
<viewLayoutGuide key="frameLayoutGuide" id="itJ-oF-sXb"/>
</scrollView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2bL-GF-xWw">
- <rect key="frame" x="0.0" y="44" width="375" height="40"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="40"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="u99-on-soH"/>
@@ -836,7 +835,7 @@
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-c9-rvb">
- <rect key="frame" x="147.5" y="54" width="80" height="24"/>
+ <rect key="frame" x="147.5" y="74" width="80" height="24"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="O7b-Gn-efp"/>
@@ -847,7 +846,7 @@
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dTs-1h-o4p">
- <rect key="frame" x="157" y="162" width="61" height="93"/>
+ <rect key="frame" x="157" y="182" width="61" height="93"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="picture_bg" translatesAutoresizingMaskIntoConstraints="NO" id="oew-Eh-y6G">
<rect key="frame" x="0.0" y="0.0" width="61" height="93"/>
@@ -911,7 +910,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1FE-Su-4U4">
- <rect key="frame" x="0.0" y="255" width="375" height="37"/>
+ <rect key="frame" x="0.0" y="275" width="375" height="37"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xSp-4i-Jwh">
<rect key="frame" x="0.0" y="0.0" width="75" height="37"/>
@@ -942,6 +941,12 @@
<constraint firstAttribute="height" constant="37" id="dpN-py-vBv"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <state key="normal">
+ <color key="titleColor" red="0.61960784310000006" green="0.62352941179999999" blue="0.62352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lTh-qe-8pV">
<rect key="frame" x="300" y="0.0" width="75" height="37"/>
@@ -961,14 +966,17 @@
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="楂樻竻">
- <color key="titleColor" red="0.70588235294117641" green="0.70588235294117641" blue="0.70588235294117641" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleColor" red="0.61960784310000006" green="0.62352941179999999" blue="0.62352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="qualityButtonClicked:" destination="uBF-Yq-Qo0" eventType="touchUpInside" id="Hze-u0-cgn"/>
</connections>
</button>
</subviews>
- <color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" red="0.047058823529411764" green="0.054901960784313725" blue="0.062745098039215685" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="xSp-4i-Jwh" firstAttribute="top" secondItem="1FE-Su-4U4" secondAttribute="top" id="1W5-cF-JRC"/>
<constraint firstItem="lTh-qe-8pV" firstAttribute="top" secondItem="1FE-Su-4U4" secondAttribute="top" id="HsY-AZ-lgd"/>
@@ -989,10 +997,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Gq-77-ypg">
- <rect key="frame" x="0.0" y="292" width="375" height="375"/>
+ <rect key="frame" x="0.0" y="312" width="375" height="355"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUI-tR-jyG">
- <rect key="frame" x="77.5" y="87.5" width="100" height="100"/>
+ <rect key="frame" x="77.5" y="77.5" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="4pV-lo-eLV"/>
<constraint firstAttribute="height" constant="100" id="CFM-rZ-KQg"/>
@@ -1008,7 +1016,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Eh-hh-84T">
- <rect key="frame" x="197.5" y="87.5" width="100" height="100"/>
+ <rect key="frame" x="197.5" y="77.5" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="MdX-on-ZlR"/>
<constraint firstAttribute="height" constant="100" id="uZ6-ZC-fku"/>
@@ -1025,7 +1033,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-O3-gSJ">
- <rect key="frame" x="77.5" y="187.5" width="100" height="100"/>
+ <rect key="frame" x="77.5" y="177.5" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="HNG-1d-auy"/>
<constraint firstAttribute="height" constant="100" id="fFt-WV-T6O"/>
@@ -1041,7 +1049,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lrx-9r-gJZ">
- <rect key="frame" x="0.0" y="287" width="375" height="88"/>
+ <rect key="frame" x="0.0" y="287" width="375" height="68"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Un0-bC-uwU">
<rect key="frame" x="325" y="0.0" width="50" height="50"/>
@@ -1059,7 +1067,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cRL-ov-Bad">
- <rect key="frame" x="110.5" y="-33" width="154" height="154"/>
+ <rect key="frame" x="110.5" y="-43" width="154" height="154"/>
<constraints>
<constraint firstAttribute="width" constant="154" id="2qV-nc-X2D"/>
<constraint firstAttribute="height" constant="154" id="CCV-cO-2RB"/>
@@ -1069,7 +1077,7 @@
<state key="highlighted" image="ptz_bg"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="46J-XC-G3M">
- <rect key="frame" x="162.5" y="-33" width="50" height="50"/>
+ <rect key="frame" x="162.5" y="-43" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="bG6-29-hdH"/>
<constraint firstAttribute="height" constant="50" id="sI2-gA-aFQ"/>
@@ -1080,7 +1088,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YpD-H2-J3L">
- <rect key="frame" x="162.5" y="71" width="50" height="50"/>
+ <rect key="frame" x="162.5" y="61" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="8xd-ja-amB"/>
<constraint firstAttribute="height" constant="50" id="fYS-8a-jfb"/>
@@ -1091,7 +1099,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WlW-FZ-jz8">
- <rect key="frame" x="214.5" y="18" width="50" height="50"/>
+ <rect key="frame" x="214.5" y="8" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="JyV-sT-9Nd"/>
<constraint firstAttribute="height" constant="50" id="bVy-Jx-0Yf"/>
@@ -1102,7 +1110,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g5e-Uk-Wgs">
- <rect key="frame" x="110.5" y="19" width="50" height="50"/>
+ <rect key="frame" x="110.5" y="9" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="ZN7-OU-GCA"/>
<constraint firstAttribute="height" constant="50" id="et2-oA-SKp"/>
@@ -1130,7 +1138,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IqL-eW-ddl">
- <rect key="frame" x="0.0" y="287" width="375" height="88"/>
+ <rect key="frame" x="0.0" y="287" width="375" height="68"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j3z-1C-gSQ">
<rect key="frame" x="325" y="0.0" width="50" height="50"/>
@@ -1148,7 +1156,7 @@
</connections>
</button>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="preview_talkback" highlightedImage="spkImg" translatesAutoresizingMaskIntoConstraints="NO" id="SdD-om-sXP">
- <rect key="frame" x="137.5" y="-6" width="100" height="100"/>
+ <rect key="frame" x="137.5" y="-16" width="100" height="100"/>
<gestureRecognizers/>
<constraints>
<constraint firstAttribute="height" constant="100" id="5Av-B7-ISV"/>
@@ -1168,7 +1176,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQS-rQ-Xez">
- <rect key="frame" x="197.5" y="187.5" width="100" height="100"/>
+ <rect key="frame" x="197.5" y="177.5" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="Gjc-CC-41w"/>
<constraint firstAttribute="height" constant="100" id="Kpb-pS-Xes"/>
@@ -1250,7 +1258,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nkn-oC-NfP">
- <rect key="frame" x="0.0" y="44" width="40" height="40"/>
+ <rect key="frame" x="17.5" y="64" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="WQV-Fb-Hpn"/>
<constraint firstAttribute="width" constant="40" id="rqc-sI-jaX"/>
@@ -1262,7 +1270,7 @@
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yYv-tJ-QCV">
- <rect key="frame" x="160.5" y="122.5" width="54" height="54"/>
+ <rect key="frame" x="160.5" y="142.5" width="54" height="54"/>
<constraints>
<constraint firstAttribute="width" constant="54" id="TXE-KQ-iJl"/>
<constraint firstAttribute="height" constant="54" id="nqy-4G-kEq"/>
@@ -1275,7 +1283,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YwB-6z-DKL">
- <rect key="frame" x="0.0" y="134.5" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="154.5" width="375" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="eMk-ij-ZRD"/>
</constraints>
@@ -1284,22 +1292,89 @@
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3XK-Ur-ZIj">
- <rect key="frame" x="16" y="139" width="0.0" height="0.0"/>
+ <rect key="frame" x="16" y="159" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
+ <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sMv-Yh-W5N">
+ <rect key="frame" x="0.0" y="312" width="375" height="355"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Fe-E7-C5g">
+ <rect key="frame" x="32" y="46.5" width="311" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.090196078430000007" green="0.094117647060000004" blue="0.29411764709999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aq5-rn-Dgo" customClass="HDLEZOPButton">
+ <rect key="frame" x="142.5" y="117.5" width="84.5" height="120"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+ <state key="normal" title="蹇界暐" image="hdl_ez_cat_eyes_ignore">
+ <color key="titleColor" red="0.10588235294117647" green="0.1764705882352941" blue="0.30196078431372547" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="clickCalloutIgnoreAction:" destination="uBF-Yq-Qo0" eventType="touchUpInside" id="fTQ-p0-9jk"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2bC-B5-gMZ" customClass="HDLEZOPButton">
+ <rect key="frame" x="259" y="117.5" width="84" height="120"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+ <state key="normal" title="鎺ュ惉" image="hdl_ez_cat_eyes_answer">
+ <color key="titleColor" red="0.10588235294117647" green="0.1764705882352941" blue="0.30196078431372547" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="clickCalloutAnswerAction:" destination="uBF-Yq-Qo0" eventType="touchUpInside" id="2tR-65-1sv"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jPI-nC-uAq" customClass="HDLEZOPButton">
+ <rect key="frame" x="32" y="117.5" width="78.5" height="120"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="120" id="NXb-C0-Nw5"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+ <state key="normal" title="鎸傛柇" image="hdl_ez_cat_eyes_hang_up">
+ <color key="titleColor" red="0.1058823529" green="0.1764705882" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="clickCalloutHangupAction:" destination="uBF-Yq-Qo0" eventType="touchUpInside" id="Szo-xH-Mh6"/>
+ </connections>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <constraints>
+ <constraint firstItem="aq5-rn-Dgo" firstAttribute="centerY" secondItem="jPI-nC-uAq" secondAttribute="centerY" id="0YK-rV-xIW"/>
+ <constraint firstAttribute="trailing" secondItem="8Fe-E7-C5g" secondAttribute="trailing" constant="32" id="8NR-Fc-tPc"/>
+ <constraint firstItem="aq5-rn-Dgo" firstAttribute="leading" secondItem="jPI-nC-uAq" secondAttribute="trailing" constant="32" id="8ht-5u-0y7"/>
+ <constraint firstItem="2bC-B5-gMZ" firstAttribute="height" secondItem="aq5-rn-Dgo" secondAttribute="height" id="B0O-2O-7OG"/>
+ <constraint firstItem="jPI-nC-uAq" firstAttribute="centerY" secondItem="sMv-Yh-W5N" secondAttribute="centerY" id="Fa3-MI-9zW"/>
+ <constraint firstItem="aq5-rn-Dgo" firstAttribute="width" secondItem="jPI-nC-uAq" secondAttribute="width" multiplier="1.07143" id="Jzm-Kq-s1B"/>
+ <constraint firstItem="aq5-rn-Dgo" firstAttribute="top" secondItem="8Fe-E7-C5g" secondAttribute="bottom" constant="50" id="aM7-YH-wta"/>
+ <constraint firstItem="aq5-rn-Dgo" firstAttribute="height" secondItem="jPI-nC-uAq" secondAttribute="height" id="dri-gY-bvB"/>
+ <constraint firstItem="jPI-nC-uAq" firstAttribute="leading" secondItem="sMv-Yh-W5N" secondAttribute="leading" constant="32" id="eUw-x2-5HY"/>
+ <constraint firstItem="2bC-B5-gMZ" firstAttribute="leading" secondItem="aq5-rn-Dgo" secondAttribute="trailing" constant="32" id="eu1-g4-zxI"/>
+ <constraint firstAttribute="trailing" secondItem="2bC-B5-gMZ" secondAttribute="trailing" constant="32" id="fzR-kq-9dw"/>
+ <constraint firstItem="2bC-B5-gMZ" firstAttribute="centerY" secondItem="aq5-rn-Dgo" secondAttribute="centerY" id="jQf-ae-vvC"/>
+ <constraint firstItem="8Fe-E7-C5g" firstAttribute="leading" secondItem="sMv-Yh-W5N" secondAttribute="leading" constant="32" id="p4O-md-aUe"/>
+ <constraint firstItem="2bC-B5-gMZ" firstAttribute="width" secondItem="aq5-rn-Dgo" secondAttribute="width" id="w2D-Ia-3nQ"/>
+ </constraints>
+ </view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Yrc-c9-rvb" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" constant="10" id="0Cf-Q8-Mwq"/>
<constraint firstAttribute="trailing" secondItem="YwB-6z-DKL" secondAttribute="trailing" id="0oZ-sb-kgM"/>
<constraint firstItem="YwB-6z-DKL" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="135-mO-STg"/>
- <constraint firstItem="7Gq-77-ypg" firstAttribute="top" secondItem="1FE-Su-4U4" secondAttribute="bottom" priority="751" id="4Dh-L5-Wxp"/>
+ <constraint firstItem="dTs-1h-o4p" firstAttribute="centerX" secondItem="JEB-Q6-XNh" secondAttribute="centerX" id="16Z-Vr-x9e"/>
+ <constraint firstItem="7Gq-77-ypg" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" priority="751" constant="37" id="4Dh-L5-Wxp"/>
<constraint firstItem="YwB-6z-DKL" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="58C-Bi-adb"/>
- <constraint firstItem="dTs-1h-o4p" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="7Nq-GR-ypc"/>
- <constraint firstAttribute="trailing" secondItem="1FE-Su-4U4" secondAttribute="trailing" id="9po-jh-PJt"/>
- <constraint firstItem="1FE-Su-4U4" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" id="Aeo-vo-x5Y"/>
+ <constraint firstItem="3qm-Zv-a7S" firstAttribute="top" secondItem="sMv-Yh-W5N" secondAttribute="bottom" id="5fc-VK-Tfj"/>
+ <constraint firstItem="NRj-hs-uOI" firstAttribute="trailing" secondItem="1FE-Su-4U4" secondAttribute="trailing" id="9po-jh-PJt"/>
<constraint firstAttribute="trailing" secondItem="NRj-hs-uOI" secondAttribute="trailing" id="G3Q-MC-BpN"/>
<constraint firstItem="2bL-GF-xWw" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="JNG-uc-9XA"/>
<constraint firstItem="NRj-hs-uOI" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="PXn-FW-8dk"/>
@@ -1307,35 +1382,45 @@
<constraint firstItem="1FE-Su-4U4" firstAttribute="top" secondItem="dTs-1h-o4p" secondAttribute="bottom" id="Qae-km-Xxm"/>
<constraint firstItem="NRj-hs-uOI" firstAttribute="centerY" secondItem="yYv-tJ-QCV" secondAttribute="centerY" id="TGA-a5-AUm"/>
<constraint firstItem="nkn-oC-NfP" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="Tn0-Se-wHE"/>
- <constraint firstItem="nkn-oC-NfP" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="YSp-TA-bZd"/>
+ <constraint firstItem="sMv-Yh-W5N" firstAttribute="top" secondItem="7Gq-77-ypg" secondAttribute="top" id="TvP-3j-NV3"/>
<constraint firstItem="yYv-tJ-QCV" firstAttribute="centerX" secondItem="YwB-6z-DKL" secondAttribute="centerX" id="Yt6-5R-nAw"/>
+ <constraint firstItem="1FE-Su-4U4" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" id="aO9-KQ-MPh"/>
<constraint firstItem="2bL-GF-xWw" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="adY-eM-6Nb"/>
<constraint firstItem="NRj-hs-uOI" firstAttribute="centerY" secondItem="YwB-6z-DKL" secondAttribute="centerY" id="cjf-nt-XqE"/>
<constraint firstItem="3qm-Zv-a7S" firstAttribute="top" secondItem="gFl-PI-CLn" secondAttribute="bottom" id="fSZ-Xw-PGz"/>
<constraint firstItem="gFl-PI-CLn" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="hvI-bX-2fD"/>
<constraint firstItem="3XK-Ur-ZIj" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" constant="16" id="hya-DL-nrl"/>
+ <constraint firstItem="sMv-Yh-W5N" firstAttribute="trailing" secondItem="PYB-vu-Xcw" secondAttribute="trailing" id="jzU-g2-HL3"/>
<constraint firstItem="1FE-Su-4U4" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="mfp-Y3-aJF"/>
<constraint firstItem="7Gq-77-ypg" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="nIY-1B-8KJ"/>
<constraint firstItem="NRj-hs-uOI" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="opo-g8-z05"/>
<constraint firstAttribute="trailing" secondItem="7Gq-77-ypg" secondAttribute="trailing" id="pjs-uX-99u"/>
+ <constraint firstItem="nkn-oC-NfP" firstAttribute="centerX" secondItem="xSp-4i-Jwh" secondAttribute="centerX" id="qFB-6I-bhK"/>
<constraint firstAttribute="trailing" secondItem="2bL-GF-xWw" secondAttribute="trailing" id="sJ1-Mt-Ys4"/>
<constraint firstItem="gFl-PI-CLn" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="sJh-Px-GtM"/>
<constraint firstAttribute="trailing" secondItem="gFl-PI-CLn" secondAttribute="trailing" id="vZX-0k-C1e"/>
<constraint firstItem="3XK-Ur-ZIj" firstAttribute="top" secondItem="2bL-GF-xWw" secondAttribute="bottom" constant="55" id="vyg-ls-OTR"/>
<constraint firstItem="Yrc-c9-rvb" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="y5l-xh-jsd"/>
+ <constraint firstItem="sMv-Yh-W5N" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="yPz-fc-ra1"/>
</constraints>
</view>
<navigationItem key="navigationItem" id="vpB-aG-zb3"/>
<connections>
+ <outlet property="answerButton" destination="2bC-B5-gMZ" id="T42-Dl-1mx"/>
<outlet property="bottomView" destination="7Gq-77-ypg" id="kLP-FN-Tvv"/>
+ <outlet property="callOutAlertLabel" destination="8Fe-E7-C5g" id="h1w-BY-5fi"/>
<outlet property="captureButton" destination="wEO-O3-gSJ" id="ABn-Ub-QEs"/>
<outlet property="cloudBtn" destination="WYB-ca-Ox6" id="E4S-1L-4uS"/>
<outlet property="cloudTip" destination="wXb-RI-dLd" id="bCu-fP-8IF"/>
<outlet property="controlButton" destination="fUI-tR-jyG" id="uqI-1T-h8V"/>
<outlet property="currentHDStatus" destination="oNR-gT-NPm" id="STe-rh-VhG"/>
+ <outlet property="emptyBtnLeftMargin" destination="ea4-ei-JXX" id="aQh-Jb-qGX"/>
<outlet property="emptyButton" destination="MqM-GF-jSr" id="jD7-hz-yfd"/>
+ <outlet property="hangUpButton" destination="jPI-nC-uAq" id="WAF-xK-pJI"/>
<outlet property="highButton" destination="skK-Ar-y6h" id="jbk-j5-fCX"/>
+ <outlet property="ignoreButton" destination="aq5-rn-Dgo" id="0J6-cC-KP5"/>
<outlet property="largeBackButton" destination="nkn-oC-NfP" id="kwo-DU-hgk"/>
+ <outlet property="largeBtnRightMargin" destination="aid-gD-fi2" id="2eQ-2e-83s"/>
<outlet property="largeButton" destination="lTh-qe-8pV" id="feK-gX-fjt"/>
<outlet property="largeTitleLabel" destination="2bL-GF-xWw" id="mev-Ko-lDT"/>
<outlet property="localRecordButton" destination="xQS-rQ-Xez" id="Z0M-JE-cTx"/>
@@ -1344,9 +1429,12 @@
<outlet property="lowButton" destination="UlQ-aK-1VP" id="ISE-DJ-W5I"/>
<outlet property="messageLabel" destination="YwB-6z-DKL" id="196-Ds-Vl6"/>
<outlet property="middleButton" destination="WSh-Ao-McO" id="vty-N8-cDz"/>
+ <outlet property="playBtnLeftMargin" destination="qZZ-Fc-8jt" id="Fyj-20-v8W"/>
<outlet property="playButton" destination="xSp-4i-Jwh" id="DUU-ap-reQ"/>
<outlet property="playerPlayButton" destination="yYv-tJ-QCV" id="EIB-lc-14l"/>
<outlet property="playerView" destination="1Xz-5f-ZJx" id="tYS-5X-mCe"/>
+ <outlet property="playerViewBottomMargin" destination="ted-kP-rO7" id="oFs-an-sCu"/>
+ <outlet property="playerViewWHRatio" destination="7NS-WA-bEr" id="nAT-Lb-Z7I"/>
<outlet property="ptzCloseButton" destination="Un0-bC-uwU" id="pBM-jg-Hsv"/>
<outlet property="ptzControlButton" destination="cRL-ov-Bad" id="dO9-KY-Fpn"/>
<outlet property="ptzDownButton" destination="YpD-H2-J3L" id="9Hs-IT-QQk"/>
@@ -1358,6 +1446,8 @@
<outlet property="qualityButton" destination="JEB-Q6-XNh" id="z41-pC-jcF"/>
<outlet property="qualityView" destination="dTs-1h-o4p" id="cwe-H0-P0z"/>
<outlet property="scrollView" destination="NRj-hs-uOI" id="eoY-a5-7Nt"/>
+ <outlet property="scrollViewTopMargin" destination="PXn-FW-8dk" id="ROR-nh-sCL"/>
+ <outlet property="scrollViewWHRatio" destination="FHe-T4-BRJ" id="VDa-Ms-cmg"/>
<outlet property="speakImageView" destination="SdD-om-sXP" id="vut-X7-g34"/>
<outlet property="streamPlayBtn" destination="X2B-Km-Emd" id="wjk-zR-FDC"/>
<outlet property="streamTypeLabel" destination="5WH-Ih-9Yw" id="azv-2u-5FX"/>
@@ -1366,6 +1456,7 @@
<outlet property="talkView" destination="IqL-eW-ddl" id="hTy-iu-CUA"/>
<outlet property="talkViewContraint" destination="IcU-Zd-4MD" id="vMR-vH-k7J"/>
<outlet property="toolBar" destination="1FE-Su-4U4" id="CTH-vb-IfL"/>
+ <outlet property="videoCallOutView" destination="sMv-Yh-W5N" id="RBZ-2y-YXA"/>
<outlet property="voiceButton" destination="tAW-X2-E9K" id="N5O-Qz-qd6"/>
<outlet property="zoomSizeLabel" destination="3XK-Ur-ZIj" id="vYD-CM-uoE"/>
</connections>
@@ -1392,7 +1483,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kQU-Pc-qqv">
- <rect key="frame" x="0.0" y="44" width="375" height="211"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="211"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<constraints>
@@ -1403,7 +1494,7 @@
</connections>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SJH-Sa-TMv">
- <rect key="frame" x="0.0" y="44" width="375" height="40"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="40"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="o94-Gh-tdc"/>
@@ -1413,7 +1504,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3j6-e7-ztE">
- <rect key="frame" x="0.0" y="255" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="275" width="375" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bu9-Qz-3Ij">
<rect key="frame" x="187.5" y="0.0" width="187.5" height="44"/>
@@ -1472,7 +1563,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hY1-Ac-Oot">
- <rect key="frame" x="0.0" y="44" width="40" height="40"/>
+ <rect key="frame" x="0.0" y="64" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="AFV-2p-wo1"/>
<constraint firstAttribute="width" constant="40" id="h15-cw-wZH"/>
@@ -1483,7 +1574,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="buq-PS-h5p">
- <rect key="frame" x="0.0" y="195" width="375" height="60"/>
+ <rect key="frame" x="0.0" y="215" width="375" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z3E-1u-wEn">
<rect key="frame" x="0.0" y="23" width="60" height="37"/>
@@ -1492,6 +1583,7 @@
<constraint firstAttribute="width" constant="60" id="mZh-Ks-yHR"/>
</constraints>
<state key="normal" image="preview_play_btn"/>
+ <state key="highlighted" image="preview_play_btn_sel"/>
<connections>
<action selector="playButtonClicked:" destination="I6z-uV-dEU" eventType="touchUpInside" id="nzq-1I-c5F"/>
</connections>
@@ -1503,6 +1595,7 @@
<constraint firstAttribute="height" constant="37" id="nC8-FN-WAT"/>
</constraints>
<state key="normal" image="preview_voice_btn"/>
+ <state key="highlighted" image="preview_voice_btn_sel"/>
<connections>
<action selector="voiceButtonClicked:" destination="I6z-uV-dEU" eventType="touchUpInside" id="aAV-1Z-FGI"/>
</connections>
@@ -1520,7 +1613,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ruu-Hg-3Tx">
- <rect key="frame" x="0.0" y="0.0" width="34" height="20"/>
+ <rect key="frame" x="20" y="0.0" width="34" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="0Xh-uc-DaE"/>
</constraints>
@@ -1529,7 +1622,7 @@
<nil key="highlightedColor"/>
</label>
<slider opaque="NO" contentMode="scaleToFill" semanticContentAttribute="playback" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="e5d-g8-Knj">
- <rect key="frame" x="35.5" y="-5" width="303.5" height="31"/>
+ <rect key="frame" x="55.5" y="-5" width="263.5" height="31"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="4zL-xp-G9T"/>
</constraints>
@@ -1539,7 +1632,7 @@
</connections>
</slider>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ESG-x4-J8R">
- <rect key="frame" x="341" y="0.0" width="34" height="20"/>
+ <rect key="frame" x="321" y="0.0" width="34" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="2SN-fe-EDR"/>
</constraints>
@@ -1575,7 +1668,7 @@
<constraints>
<constraint firstItem="Z3E-1u-wEn" firstAttribute="leading" secondItem="buq-PS-h5p" secondAttribute="leading" id="1R2-0e-zLb"/>
<constraint firstItem="t6K-Cq-gMh" firstAttribute="leading" secondItem="Z3E-1u-wEn" secondAttribute="trailing" id="4m4-IR-mc0"/>
- <constraint firstItem="ruu-Hg-3Tx" firstAttribute="leading" secondItem="buq-PS-h5p" secondAttribute="leading" id="7Mx-RJ-l3f"/>
+ <constraint firstItem="ruu-Hg-3Tx" firstAttribute="leading" secondItem="buq-PS-h5p" secondAttribute="leading" constant="20" id="7Mx-RJ-l3f"/>
<constraint firstAttribute="bottom" secondItem="7aB-y0-gtH" secondAttribute="bottom" id="7tH-jm-Tc8"/>
<constraint firstItem="7aB-y0-gtH" firstAttribute="leading" secondItem="gRk-Pf-zJ6" secondAttribute="trailing" constant="5" id="8Ex-wx-3ye"/>
<constraint firstItem="ruu-Hg-3Tx" firstAttribute="top" secondItem="buq-PS-h5p" secondAttribute="top" id="Er7-IE-Hng"/>
@@ -1590,12 +1683,12 @@
<constraint firstAttribute="bottom" secondItem="gRk-Pf-zJ6" secondAttribute="bottom" constant="10" id="pO2-v2-n1y"/>
<constraint firstItem="e5d-g8-Knj" firstAttribute="centerY" secondItem="ESG-x4-J8R" secondAttribute="centerY" id="pTj-gC-TCd"/>
<constraint firstAttribute="height" constant="60" id="tMQ-jL-rdi"/>
- <constraint firstAttribute="trailing" secondItem="ESG-x4-J8R" secondAttribute="trailing" id="vMR-I6-RPC"/>
+ <constraint firstAttribute="trailing" secondItem="ESG-x4-J8R" secondAttribute="trailing" constant="20" id="vMR-I6-RPC"/>
<constraint firstAttribute="trailing" secondItem="7aB-y0-gtH" secondAttribute="trailing" id="vXW-8l-Y0i"/>
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="jim-qG-8NV">
- <rect key="frame" x="0.0" y="299" width="375" height="368"/>
+ <rect key="frame" x="0.0" y="319" width="375" height="348"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="rBI-Vc-Dgo">
<size key="itemSize" width="106" height="80"/>
@@ -1662,14 +1755,14 @@
</connections>
</collectionView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="no_video" translatesAutoresizingMaskIntoConstraints="NO" id="KsP-XU-bB0">
- <rect key="frame" x="140.5" y="361" width="94" height="94"/>
+ <rect key="frame" x="140.5" y="381" width="94" height="94"/>
<constraints>
<constraint firstAttribute="height" constant="94" id="aF8-gn-fXB"/>
<constraint firstAttribute="width" constant="94" id="kaI-f1-60h"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绌虹┖濡備篃" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pg3-8C-ucI">
- <rect key="frame" x="137.5" y="465" width="100" height="20"/>
+ <rect key="frame" x="137.5" y="485" width="100" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="lIY-Ce-8Ca"/>
<constraint firstAttribute="height" constant="20" id="zIg-E3-en7"/>
@@ -1679,7 +1772,7 @@
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihF-af-cva">
- <rect key="frame" x="338.5" y="54" width="26.5" height="12"/>
+ <rect key="frame" x="338.5" y="74" width="26.5" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" systemColor="systemRedColor"/>
<nil key="highlightedColor"/>
@@ -1687,7 +1780,6 @@
</subviews>
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstItem="3j6-e7-ztE" firstAttribute="top" secondItem="buq-PS-h5p" secondAttribute="bottom" id="3Mc-Kc-zIp"/>
<constraint firstItem="kQU-Pc-qqv" firstAttribute="leading" secondItem="6jg-tf-s0b" secondAttribute="leading" id="3Sz-uF-O8o"/>
<constraint firstItem="ihF-af-cva" firstAttribute="top" secondItem="0R4-Gk-cpw" secondAttribute="bottom" constant="10" id="4k9-qQ-Y1T"/>
<constraint firstItem="hY1-Ac-Oot" firstAttribute="top" secondItem="0R4-Gk-cpw" secondAttribute="bottom" id="9Ug-e9-Uoo"/>
@@ -1710,6 +1802,7 @@
<constraint firstAttribute="trailing" secondItem="ihF-af-cva" secondAttribute="trailing" constant="10" id="mtn-nO-5qu"/>
<constraint firstAttribute="trailing" secondItem="buq-PS-h5p" secondAttribute="trailing" id="qAj-RS-bdT"/>
<constraint firstItem="3j6-e7-ztE" firstAttribute="top" secondItem="kQU-Pc-qqv" secondAttribute="bottom" id="tGf-lM-bPe"/>
+ <constraint firstItem="buq-PS-h5p" firstAttribute="bottom" secondItem="kQU-Pc-qqv" secondAttribute="bottom" id="w1f-hD-qgK"/>
<constraint firstItem="SJH-Sa-TMv" firstAttribute="leading" secondItem="6jg-tf-s0b" secondAttribute="leading" id="xkf-hy-wp1"/>
<constraint firstItem="jim-qG-8NV" firstAttribute="top" secondItem="3j6-e7-ztE" secondAttribute="bottom" priority="750" id="zW5-Vq-dsE"/>
</constraints>
@@ -1756,6 +1849,7 @@
<outlet property="noVideoLabel" destination="pg3-8C-ucI" id="pWG-m9-pOS"/>
<outlet property="playButton" destination="Z3E-1u-wEn" id="kh9-WC-095"/>
<outlet property="playTimeLabel" destination="ruu-Hg-3Tx" id="wAa-dH-XNO"/>
+ <outlet property="playViewWHScale" destination="0Wa-du-utY" id="4f8-NA-Y6I"/>
<outlet property="playbackList" destination="jim-qG-8NV" id="dpb-Sy-z2g"/>
<outlet property="playerToolbox" destination="buq-PS-h5p" id="1ue-bg-0Vs"/>
<outlet property="playerToolboxConstraint" destination="tMQ-jL-rdi" id="STA-TC-Nan"/>
@@ -1809,7 +1903,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MessageCell" rowHeight="75" id="St6-kz-bZE" customClass="MessageListCell">
- <rect key="frame" x="0.0" y="44.5" width="375" height="75"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="75"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="St6-kz-bZE" id="gqt-AI-8vk">
<rect key="frame" x="0.0" y="0.0" width="375" height="75"/>
@@ -1927,7 +2021,7 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZSettingCell" id="Mk7-Ag-WW0">
- <rect key="frame" x="0.0" y="49.5" width="375" height="44"/>
+ <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mk7-Ag-WW0" id="Pt3-DC-cCE">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1947,6 +2041,8 @@
<outlet property="hdSwitch" destination="KBU-5V-GwK" id="lf0-8b-Qeq"/>
<outlet property="nVersionLabel" destination="bvq-5A-JW8" id="dqy-G7-H05"/>
<outlet property="nameLabel" destination="8Y3-zX-Cnw" id="w24-b8-OXa"/>
+ <outlet property="privacyMaskSwitch" destination="rv3-Sh-Gib" id="Cmw-V7-tnn"/>
+ <outlet property="rightArrowImg" destination="PR2-qZ-cVt" id="g4z-ld-DK0"/>
<outlet property="serialLabel" destination="9VV-np-Xv9" id="Vvo-rR-zdY"/>
<outlet property="updateImageView" destination="A8K-Mk-xFS" id="qqg-Hg-1rw"/>
<outlet property="videoSwitch" destination="eKv-yq-ycl" id="HD9-JX-sBQ"/>
@@ -1976,6 +2072,17 @@
<action selector="HDChanged:" destination="3ZH-14-C2h" eventType="valueChanged" id="fHK-6L-vL6"/>
</connections>
</switch>
+ <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="rv3-Sh-Gib">
+ <rect key="frame" x="0.0" y="0.0" width="51" height="31"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <connections>
+ <action selector="privacyMasking:" destination="3ZH-14-C2h" eventType="valueChanged" id="X9h-ed-zD5"/>
+ </connections>
+ </switch>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hdl_ez_list_next" id="PR2-qZ-cVt">
+ <rect key="frame" x="0.0" y="0.0" width="42" height="49"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="璁惧鍚�" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8Y3-zX-Cnw">
<rect key="frame" x="0.0" y="0.0" width="72" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -2024,7 +2131,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="璇疯緭鍏ヨ澶囧悕绉�" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="r1W-d8-Rg7">
- <rect key="frame" x="0.0" y="94" width="375" height="40"/>
+ <rect key="frame" x="0.0" y="114" width="375" height="40"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="NLX-OK-XZ7"/>
@@ -2034,7 +2141,7 @@
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xdQ-Ec-12V">
- <rect key="frame" x="45" y="194" width="285" height="39"/>
+ <rect key="frame" x="45" y="214" width="285" height="39"/>
<constraints>
<constraint firstAttribute="width" constant="285" id="F6x-VP-pj1"/>
<constraint firstAttribute="height" constant="39" id="eMs-1w-UTL"/>
@@ -2046,7 +2153,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="涓嶈秴杩�50涓瓧绗�" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xj6-wT-AiB">
- <rect key="frame" x="9" y="145" width="216" height="21"/>
+ <rect key="frame" x="9" y="165" width="216" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="H5l-ew-D4h"/>
</constraints>
@@ -2188,7 +2295,7 @@
<rect key="frame" x="0.0" y="32" width="375" height="635"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sid-Ff-mRw">
- <rect key="frame" x="0.0" y="44" width="375" height="211"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="211"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<constraints>
@@ -2199,7 +2306,7 @@
</connections>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IqR-oy-XmU">
- <rect key="frame" x="147.5" y="54" width="80" height="24"/>
+ <rect key="frame" x="147.5" y="74" width="80" height="24"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="57P-5k-0tb"/>
@@ -2210,7 +2317,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XID-G7-Q1F">
- <rect key="frame" x="0.0" y="44" width="40" height="40"/>
+ <rect key="frame" x="0.0" y="64" width="40" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="AOT-6h-sls"/>
<constraint firstAttribute="height" constant="40" id="JO7-Hb-1i7"/>
@@ -2222,7 +2329,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b60-F5-UgT">
- <rect key="frame" x="0.0" y="195" width="375" height="60"/>
+ <rect key="frame" x="0.0" y="215" width="375" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a6a-IS-kTU">
<rect key="frame" x="0.0" y="23" width="60" height="37"/>
@@ -2311,7 +2418,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="es2-2O-C6T">
- <rect key="frame" x="197.5" y="355" width="100" height="100"/>
+ <rect key="frame" x="197.5" y="375" width="100" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="ggm-qd-KNb"/>
<constraint firstAttribute="width" constant="100" id="sET-Nc-aei"/>
@@ -2329,7 +2436,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uxM-3S-gu1">
- <rect key="frame" x="77.5" y="355" width="100" height="100"/>
+ <rect key="frame" x="77.5" y="375" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="76E-yD-MgD"/>
<constraint firstAttribute="height" constant="100" id="YTu-Ca-QiC"/>
@@ -2408,7 +2515,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ol-dw-GX9">
- <rect key="frame" x="45" y="260" width="285" height="39"/>
+ <rect key="frame" x="45" y="280" width="285" height="39"/>
<constraints>
<constraint firstAttribute="width" constant="285" id="ZIE-YP-8dt"/>
<constraint firstAttribute="height" constant="39" id="t3Q-fl-sHA"/>
@@ -2420,7 +2527,7 @@
</connections>
</button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ex5-eL-x0h">
- <rect key="frame" x="0.0" y="80" width="375" height="150"/>
+ <rect key="frame" x="0.0" y="100" width="375" height="150"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="150" id="azy-6S-UKf"/>
@@ -2429,10 +2536,10 @@
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<progressView hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jcN-yM-fWF">
- <rect key="frame" x="20" y="313" width="335" height="4"/>
+ <rect key="frame" x="20" y="333" width="335" height="4"/>
</progressView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姝ｅ湪鏇存柊..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ckd-hd-wtP">
- <rect key="frame" x="20" y="269" width="335" height="21"/>
+ <rect key="frame" x="20" y="289" width="335" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="hMV-z6-oh2"/>
</constraints>
@@ -2485,8 +2592,12 @@
<image name="chuanshujilu--2" width="24" height="24"/>
<image name="cloud" width="32" height="32"/>
<image name="duijiangji" width="39" height="39"/>
+ <image name="hdl_ez_cat_eyes_answer" width="68" height="68"/>
+ <image name="hdl_ez_cat_eyes_hang_up" width="68" height="68"/>
+ <image name="hdl_ez_cat_eyes_ignore" width="68" height="68"/>
+ <image name="hdl_ez_list_next" width="16" height="16"/>
<image name="icon_download_fill" width="20" height="20"/>
- <image name="large_back_btn" width="10" height="19"/>
+ <image name="large_back_btn" width="12" height="20"/>
<image name="logo" width="210" height="94"/>
<image name="message" width="39" height="39"/>
<image name="no_message" width="94" height="94"/>
@@ -2504,10 +2615,10 @@
<image name="preview_barrel" width="65" height="65"/>
<image name="preview_barrel_dis" width="65" height="65"/>
<image name="preview_barrel_sel" width="65" height="65"/>
- <image name="preview_enlarge" width="37" height="37"/>
- <image name="preview_enlarge_btn_sel" width="37" height="37"/>
- <image name="preview_play_btn" width="37" height="37"/>
- <image name="preview_play_btn_sel" width="37" height="37"/>
+ <image name="preview_enlarge" width="20" height="20"/>
+ <image name="preview_enlarge_btn_sel" width="20" height="20"/>
+ <image name="preview_play_btn" width="20" height="20"/>
+ <image name="preview_play_btn_sel" width="20" height="20"/>
<image name="preview_recording" width="65" height="65"/>
<image name="preview_recording_dis" width="65" height="65"/>
<image name="preview_recording_sel" width="65" height="65"/>
@@ -2517,9 +2628,9 @@
<image name="preview_talkback" width="65" height="65"/>
<image name="preview_talkback_dis" width="65" height="65"/>
<image name="preview_talkback_sel" width="65" height="65"/>
- <image name="preview_unvoice_btn" width="37" height="37"/>
- <image name="preview_voice_btn" width="37" height="37"/>
- <image name="preview_voice_btn_sel" width="37" height="37"/>
+ <image name="preview_unvoice_btn" width="20" height="20"/>
+ <image name="preview_voice_btn" width="20" height="20"/>
+ <image name="preview_voice_btn_sel" width="20" height="20"/>
<image name="ptz_bg" width="154" height="154"/>
<image name="setup" width="39" height="39"/>
<image name="spkImg" width="155" height="155"/>
diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
index ac1100f..7937614 100644
--- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -50,6 +50,7 @@
"device_verify_code_wrong"="Incorrect device password.";
"device_restart_talk"="Enabling two-way audio. Please wait...";
"device_save_gallery"="Saved to the albums.";
+"device_save_gallery_failure"="Download failure";
"device_analogue_camera"="Analog Channel";
"device_digital_camera"="Digital Channel";
"device_lan_device_list_title"="LAN Device List";
@@ -107,6 +108,18 @@
"device_temp_copied"="Copied";
"device_temp_long_tap_copy"="Long press to copy";
"device_temp_sure_to_delete"="Are you sure to delete the temporary password?";
+"device_callout_alert_message" = "Doorbell on call...";
+"device_callout_hang_up" = "Hang up";
+"device_callout_ignore" = "Ignore";
+"device_callout_answer" = "Answer";
+"device_full_scene_play" = "play";
+"device_full_scene_pause" = "Pause";
+"device_full_scene_sound" = "Sound";
+"device_full_scene_sound_off" = "Sound off";
+"device_full_scene_quality" = "Articulation";
+"device_full_scene_exit_full" = "Exit";
+"device_callout_answer" = "Answered";
+"device_callout_no_answer" = "Missed";
"dmessage_title"="Message";
"message_read"="Mark as Read";
@@ -140,8 +153,15 @@
"setting_secure_code"="Encrypt Video and Picture";
"setting_cloud_storage"="Cloud Storage";
"setting_hardware_decoding" = "Hardware decoding";
+"setting_privacy_masking" = "Privacy masking";
+"setting_sd_card_formatting" = "SD card formatting";
+"setting_formatting_alert_message" = "You are currently formatting an SD card";
"setting_opration_fail"="Operation failed.";
"setting_opration_success"="Completed.";
+"setting_privacy_masking_ing"="Running, please try again later";
+"setting_privacy_masking_fail"="Setup failed, please try again later";
+"setting_sd_card_success"="Successful formatting";
+"setting_sd_card_fail"="Formatting failed, please try again";
"setting_switching"="Switching. Please wait...";
"setting_device_security_check"="Security Authentication";
"setting_input_code_plz"="Input the device verification code (6 characters on the device label).";
@@ -223,4 +243,13 @@
"Logout"="Log Out";
//閫氱敤
-"hdl_ez_common_no_data"="No Data";
\ No newline at end of file
+"hdl_ez_common_no_data"="No Data";
+"hdl_ez_download"="Download";
+"hdl_ez_download_selectPhotos" = "Select a photo";
+"hdl_ez_download_takePhoto" = "Take a picture";
+"hdl_ez_download_selectFrAlbum" = "Select from the albums";
+"hdl_ez_download_cancle"= "Cancle";
+"hdl_ez_download_tip" = "Tips";
+"hdl_ez_download_auth" = "Please authorize access";
+"hdl_ez_download_sure" = "Sure";
+"hdl_ez_download_toSet" = "Setting";
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
index d2711a4..01e9e45 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -50,6 +50,7 @@
"device_verify_code_wrong"="璁惧瀵嗙爜閿欒";
"device_restart_talk"="姝ｅ湪寮�鍚璁诧紝璇风◢鍊�...";
"device_save_gallery"="宸蹭繚瀛樿嚦鎵嬫満鐩稿唽";
+"device_save_gallery_failure"="涓嬭浇澶辫触";
"device_analogue_camera"="妯℃嫙閫氶亾";
"device_digital_camera"="鏁板瓧閫氶亾";
"device_lan_device_list_title"="灞�鍩熺綉璁惧鍒楄〃";
@@ -67,6 +68,18 @@
"device_account_pw_empty"="甯愬彿鎴栧瘑鐮佷笉鑳戒负绌�";
"device_lan_preview_title"="灞�鍩熺綉棰勮";
"device_add_device_qr_code"="璁惧浜岀淮鐮�";
+"device_callout_alert_message" = "闂ㄩ搩鍛煎彨涓�...";
+"device_callout_hang_up" = "鎸傛柇";
+"device_callout_ignore" = "蹇界暐";
+"device_callout_answer" = "鎺ュ惉";
+"device_full_scene_play" = "鎾斁";
+"device_full_scene_pause" = "鏆傚仠";
+"device_full_scene_sound" = "闊抽噺";
+"device_full_scene_sound_off" = "闈欓煶";
+"device_full_scene_quality" = "娓呮櫚搴�";
+"device_full_scene_exit_full" = "閫�鍑哄叏灞�";
+"device_callout_answer" = "宸叉帴";
+"device_callout_no_answer" = "鏈帴";
"device_open"="寮�闂�";
"device_open_success"="寮�闂ㄦ垚鍔燂紒";
@@ -141,8 +154,15 @@
"setting_secure_code"="瑙嗛鍥剧墖鍔犲瘑";
"setting_cloud_storage"="浜戝瓨鍌�";
"setting_hardware_decoding" = "纭В鐮�";
+"setting_privacy_masking" = "闅愮閬斀";
+"setting_sd_card_formatting" = "SD鍗℃牸寮忓寲";
+"setting_formatting_alert_message" = "鎮ㄥ綋鍓嶆鍦ㄦ牸寮忓寲SD鍗�";
"setting_opration_fail"="鎿嶄綔澶辫触";
"setting_opration_success"="鎿嶄綔鎴愬姛";
+"setting_privacy_masking_ing"="姝ｅ湪鎵ц涓紝璇风◢鍚庡啀璇�";
+"setting_privacy_masking_fail"="璁剧疆澶辫触锛岃绋嶅悗鍐嶈瘯";
+"setting_sd_card_success"="鏍煎紡鍖栨垚鍔�";
+"setting_sd_card_fail"="鏍煎紡鍖栧け璐ワ紝璇烽噸鏂板啀璇�";
"setting_switching"="姝ｅ湪鍒囨崲锛岃绋嶅��...";
"setting_device_security_check"="璁惧鎿嶄綔瀹夊叏楠岃瘉";
"setting_input_code_plz"="璇疯緭鍏ヨ璁惧鐨勮澶囬獙璇佺爜锛堣澶囨爣绛句笂鐨�6浣嶅瓧姣嶏級";
@@ -225,3 +245,12 @@
//閫氱敤
"hdl_ez_common_no_data"="鏆傛棤鏁版嵁";
+"hdl_ez_download"="涓嬭浇";
+"hdl_ez_download_selectPhotos" = "閫夊彇鐓х墖";
+"hdl_ez_download_takePhoto" = "鎷嶇収";
+"hdl_ez_download_selectFrAlbum" = "浠庣浉鍐岄�夊彇";
+"hdl_ez_download_cancle"= "鍙栨秷";
+"hdl_ez_download_tip" = "娓╅Θ鎻愮ず";
+"hdl_ez_download_auth" = "璇锋墦寮�璁块棶鏉冮檺";
+"hdl_ez_download_sure" = "纭畾";
+"hdl_ez_download_toSet" = "鍘昏缃�";
diff --git a/SiriIntents/SiriIntents.csproj b/SiriIntents/SiriIntents.csproj
index 1be1162..20861d5 100644
--- a/SiriIntents/SiriIntents.csproj
+++ b/SiriIntents/SiriIntents.csproj
@@ -18,7 +18,7 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<MtouchFastDev>true</MtouchFastDev>
@@ -28,6 +28,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<DeviceSpecificBuild>false</DeviceSpecificBuild>
<MtouchVerbosity></MtouchVerbosity>
+ <CodesignProvision>OnProSiri230605-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType>
@@ -67,7 +68,7 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchDebug>true</MtouchDebug>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
@@ -79,6 +80,7 @@
<MtouchArch>ARM64</MtouchArch>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
+ <CodesignProvision>OnProSiri230605-1-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/SiriIntentsUI/SiriIntentsUI.csproj b/SiriIntentsUI/SiriIntentsUI.csproj
index 77abe25..7c1916e 100644
--- a/SiriIntentsUI/SiriIntentsUI.csproj
+++ b/SiriIntentsUI/SiriIntentsUI.csproj
@@ -18,7 +18,7 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<MtouchFastDev>true</MtouchFastDev>
@@ -29,6 +29,7 @@
<DeviceSpecificBuild>false</DeviceSpecificBuild>
<MtouchVerbosity></MtouchVerbosity>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodesignProvision>OnProSiriUI230605-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType>
@@ -70,7 +71,7 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchDebug>true</MtouchDebug>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
@@ -83,6 +84,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodesignProvision>OnProSiriUI230605-1-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
--
Gitblit v1.8.0