From 3e4be5ed4d2c0395dd60e392baf86c59762059b1 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 30 六月 2023 10:14:50 +0800
Subject: [PATCH] feature 猫眼全屏布局调整 && UI细节适配
---
EZSDK/EZSDK/EZ/Global/EZHttpUtil.h | 18 ++
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@2x.png | 0
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m | 15 +
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@3x.png | 0
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.m | 8 +
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/Contents.json | 4
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png | 0
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.h | 4
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard | 40 +++-
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@2x.png | 0
EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m | 92 +++++++----
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg@2x.png | 0
EZSDK/EZSDK/EZSDK.h | 7
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@2x.png | 0
EZSDK/EZSDK/EZSDK.m | 14 +
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/AppDelegate.m | 8
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/Contents.json | 2
EZDemo/HDLEZDemo/HDLEZDemo/ViewController.m | 2
/dev/null | 0
EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m | 149 +++++++++++++----
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 57 +++++++
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png | 0
EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/Contents.json | 2
51 files changed, 334 insertions(+), 104 deletions(-)
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/AppDelegate.m b/EZDemo/HDLEZDemo/HDLEZDemo/AppDelegate.m
index b64a256..663c19b 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/AppDelegate.m
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/AppDelegate.m
@@ -25,10 +25,10 @@
// Override point for customization after application launch.
[[EZSDK sharedInstance] initLibWithAppKey:@"1aa98a90489b4838b966b57018b4b04b" globalAppKey:@"1aa98a90489b4838b966b57018b4b04b"];
// [[EZSDK sharedInstance] initLibWithAppKey:@"941b1b72b6294998acfd36c14931b675" globalAppKey:@"941b1b72b6294998acfd36c14931b675"];
- [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YThmMmEzYzEwNTc0ZmVhYjA5MjAxMjExNDY0NjZjMiIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiS2FlZGUiLCJ1c2VyRGF0YVJpZ2h0IjoiMSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzNTAyODA5OTU5OTg4NjMzNjEiLCJleHAiOjE2ODc2NzE5NzcsIm5iZiI6MTY4NzY2NDc3N30.XZlwfkpHjBFynLbt7bQt7toCV_nHtPTnPmjhbpwsnzrywE2zVZv_8HcvF6OaZZYORrb2DAHQ6hCagQ6mwwBu8dJ0IJM3GDj98WPwIJh9tbMA9zData1erk0nZto2HeP4jVVMFkBGcfdyZd2npeAOa38oAGvER18RCr_P_7u6vJs" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI4YmE0MjdmOTQ2MTU0YzUzYTAyZmZjYTE0MTY1M2YyNyIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzUwMjgwOTk1OTk4ODYzMzYxIiwiZXhwIjoxNjg4Mjc2NjA2LCJuYmYiOjE2ODc2NzE4MDZ9.OaPGX7jUBaOJQKQdlrIACI68KKCitgH0Q_QdDX29R1LGe7wM2q2trlHgeX1si5NrJeBQo0W1zwdk5aFccAq64DqZs9Vl6B3QJZKs1EScQCHLhrZcBSL1z_mge2qkKyXTsLSMVIBYMRwcQg7dh7fXrofn50BhDjBDYqKS25t2Mn4"];
-// [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:1 homeId:@"1547099040465408002"];
- [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://nearest.hdlcontrol.com" platform:1 homeId:@"1546324800135176193"];
- [[EZSDK sharedInstance] setEZAccessToken:@"ra.6zihimwgdtix1asfaq5ter8a37ukrvzl-9697ojgbfn-0xo05zz-tgxzohe4l"];
+ [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI5ZmI0M2UyOTdjMTk0NTliOTVlMDUzNzIwZjNiNjYyZiIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJ3eHIiLCJ1c2VyRGF0YVJpZ2h0IjoiMSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2ODgwMTY4MTQsIm5iZiI6MTY4ODAwOTYxNH0.kJ-NPJIU314yz0pvD4ccmnA7_bwjbB94bpo-FBQZUPUrVz6BVSOvheiP_zzVnW16m2pArt-3O_Y8v4SfnnGWfW5X95AbAHsDwKT0Uva2PZMQaCm07HPbz02tZcRT4ssRCDMQEiDqTqzvp_fL3dhC6IrPLmUbYFy03VEPEJ4Zwtc" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI3YTI1NjE5YTUzNDk0NWE3YTE2MGViODZlZGM3ZmFiNiIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzkyMDM1NTY4MjA0NDIzMTY5IiwiZXhwIjoxNjg4NjE0NDE0LCJuYmYiOjE2ODgwMDk2MTR9.NnwX6Bpzv5s3EOTs-o13UB65bCFj_d8K81O9HQkjLbwtQamWs1QY902E1e4j2QM8E5tDFcz5Z5uGcVRyDb2_S09MU6uYArSU3xcKggt4lvdhvxIENrSmFQFBKbA40lNflYo7jZ5Mr2x-vgC0wdYw9s3JMe_jBnNm-KuQKr-rWUo"];
+ [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:1 homeId:@"1547099040465408002"];
+// [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://nearest.hdlcontrol.com" platform:1 homeId:@"1546324800135176193"];
+ [[EZSDK sharedInstance] setEZAccessToken:@"ra.7k5en870837dvic92xsbtkoa4y01rfgr-3nr377z09k-1mihhva-yifqlowra"];
// [[EZSDK sharedInstance] setEZAccessToken:@"ra.3hkirwcadrpfmaa89wep99io3wto4yds-7zptb10d20-1wxg4f3-ygiojudee"];
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg.png
index 6d59dd0..3644818 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg@2x.png
index fe4b56c..07340dc 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/picture_bg.imageset/picture_bg@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/Contents.json
deleted file mode 100644
index 98275d0..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_stoppaly_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_stoppaly_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png
deleted file mode 100644
index 7910053..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png
deleted file mode 100644
index 0668cef..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stoppaly_btn_sel.imageset/preview_stoppaly_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/Contents.json
deleted file mode 100644
index d7aabbd..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_stopplay_btn .png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_stopplay_btn @2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn .png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn .png
deleted file mode 100644
index 72c3fb4..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn .png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
deleted file mode 100644
index 003c00b..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/Contents.json
index d7aabbd..4bc2863 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/Contents.json
@@ -1,16 +1,16 @@
{
"images" : [
{
- "filename" : "preview_stopplay_btn .png",
"idiom" : "universal",
"scale" : "1x"
},
{
- "filename" : "preview_stopplay_btn @2x.png",
+ "filename" : "preview_stopplay_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "preview_stopplay_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn .png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn .png
deleted file mode 100644
index 72c3fb4..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn .png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
deleted file mode 100644
index 003c00b..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png
new file mode 100644
index 0000000..e8b6f0f
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png
new file mode 100644
index 0000000..596038a
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn.imageset/preview_stopplay_btn@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/Contents.json
index 0168d6f..80396a8 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_stopplay_btn_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_stopplay_btn_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
deleted file mode 100644
index 7910053..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
index 0668cef..a01441f 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png
new file mode 100644
index 0000000..a5e0e92
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/Contents.json
index 885eb6b..0d98283 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_unvoice_btn.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_unvoice_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn.png
deleted file mode 100644
index 77c5688..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
index 2554612..4f90c7b 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png
new file mode 100644
index 0000000..afe9882
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn.imageset/preview_unvoice_btn@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/Contents.json
index f25f265..6df9d02 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_unvoice_btn_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_unvoice_btn_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
deleted file mode 100644
index 2908329..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
index 8858696..90e6aa8 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png
new file mode 100644
index 0000000..efe18ff
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/Contents.json
index e7c16de..1fa7af4 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_voice_btn.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_voice_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn.png
deleted file mode 100644
index b330c2a..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@2x.png
index 2dff6b3..035ab45 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@3x.png
new file mode 100644
index 0000000..c605952
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn.imageset/preview_voice_btn@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/Contents.json
index 01ea8c2..3f2943d 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_voice_btn_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_voice_btn_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
deleted file mode 100644
index 7276951..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
index 1bbf161..0105ca9 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png
new file mode 100644
index 0000000..0eea11e
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/LivePlay/preview_voice_btn_sel.imageset/preview_voice_btn_sel@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/Contents.json
index 2637062..168b42c 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "large_back_btn.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "large_back_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn.png
deleted file mode 100644
index e4b9c79..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@2x.png
index b9318f6..7804900 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@3x.png
new file mode 100644
index 0000000..d5c0441
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Navigationbar/large_back_btn.imageset/large_back_btn@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/Contents.json
index 73a989d..ae1a281 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_enlarge.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_enlarge@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge.png
deleted file mode 100644
index fafd7e5..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@2x.png
index 74bf56d..1320f0a 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@3x.png
new file mode 100644
index 0000000..25313fd
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge.imageset/preview_enlarge@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/Contents.json
index d1b4589..cd149d3 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_enlarge_btn_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_enlarge_btn_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
deleted file mode 100644
index a823d6f..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
index c1838af..16dc55c 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png
new file mode 100644
index 0000000..3ef38ba
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/Contents.json
index 3de25dc..c3d435c 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_play_btn.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_play_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn.png
deleted file mode 100644
index 22b8248..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@2x.png
index 7d1bbbe..d060083 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@3x.png
new file mode 100644
index 0000000..c7226d9
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn.imageset/preview_play_btn@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/Contents.json
index 7aafe66..f5c57e2 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/Contents.json
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/Contents.json
@@ -1,7 +1,6 @@
{
"images" : [
{
- "filename" : "preview_play_btn_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
@@ -11,6 +10,7 @@
"scale" : "2x"
},
{
+ "filename" : "preview_play_btn_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel.png
deleted file mode 100644
index 9b398b5..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
index 2ea80f4..ba1d20d 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png
new file mode 100644
index 0000000..4862e3a
--- /dev/null
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/Playback/preview_play_btn_sel.imageset/preview_play_btn_sel@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@2x.png
index b2b29ec..0751cd0 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@2x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@2x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@3x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@3x.png
index fac62dd..591dc92 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@3x.png
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/hdl_ez_list_next.imageset/hdl_ez_list_next@3x.png
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/Contents.json
deleted file mode 100644
index 2637062..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "large_back_btn.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "large_back_btn@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn.png
deleted file mode 100644
index e4b9c79..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn@2x.png
deleted file mode 100644
index b9318f6..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/large_back_btn.imageset/large_back_btn@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/Contents.json
deleted file mode 100644
index e3acd91..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "picture_bg.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "picture_bg@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg.png
deleted file mode 100644
index 6d59dd0..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png
deleted file mode 100644
index fe4b56c..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/picture_bg.imageset/picture_bg@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/Contents.json
deleted file mode 100644
index 73a989d..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_enlarge.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_enlarge@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png
deleted file mode 100644
index fafd7e5..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png
deleted file mode 100644
index 74bf56d..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge.imageset/preview_enlarge@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/Contents.json
deleted file mode 100644
index d1b4589..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_enlarge_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_enlarge_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
deleted file mode 100644
index a823d6f..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
deleted file mode 100644
index c1838af..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_enlarge_btn_sel.imageset/preview_enlarge_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/Contents.json
deleted file mode 100644
index 3de25dc..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_play_btn.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_play_btn@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png
deleted file mode 100644
index 22b8248..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png
deleted file mode 100644
index 7d1bbbe..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn.imageset/preview_play_btn@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/Contents.json
deleted file mode 100644
index 7aafe66..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_play_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_play_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png
deleted file mode 100644
index 9b398b5..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
deleted file mode 100644
index 2ea80f4..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_play_btn_sel.imageset/preview_play_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json
deleted file mode 100644
index d7aabbd..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_stopplay_btn .png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_stopplay_btn @2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png
deleted file mode 100644
index 72c3fb4..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn .png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
deleted file mode 100644
index 003c00b..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn .imageset/preview_stopplay_btn @2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json
deleted file mode 100644
index d7aabbd..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_stopplay_btn .png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_stopplay_btn @2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png
deleted file mode 100644
index 72c3fb4..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn .png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
deleted file mode 100644
index 003c00b..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn.imageset/preview_stopplay_btn @2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json
deleted file mode 100644
index 0168d6f..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_stopplay_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_stopplay_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
deleted file mode 100644
index 7910053..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
deleted file mode 100644
index 0668cef..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_stopplay_btn_sel.imageset/preview_stopplay_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/Contents.json
deleted file mode 100644
index 885eb6b..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_unvoice_btn.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_unvoice_btn@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png
deleted file mode 100644
index 77c5688..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
deleted file mode 100644
index 2554612..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn.imageset/preview_unvoice_btn@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/Contents.json
deleted file mode 100644
index f25f265..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_unvoice_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_unvoice_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
deleted file mode 100644
index 2908329..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
deleted file mode 100644
index 8858696..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_unvoice_btn_sel.imageset/preview_unvoice_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/Contents.json
deleted file mode 100644
index e7c16de..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_voice_btn.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_voice_btn@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png
deleted file mode 100644
index b330c2a..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png
deleted file mode 100644
index 2dff6b3..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn.imageset/preview_voice_btn@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/Contents.json b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/Contents.json
deleted file mode 100644
index 01ea8c2..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "filename" : "preview_voice_btn_sel.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "preview_voice_btn_sel@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
deleted file mode 100644
index 7276951..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png b/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
deleted file mode 100644
index 1bbf161..0000000
--- a/EZDemo/HDLEZDemo/HDLEZDemo/Assets.xcassets/preview_voice_btn_sel.imageset/preview_voice_btn_sel@2x.png
+++ /dev/null
Binary files differ
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard b/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard
index 3d04739..d813fa0 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard
@@ -941,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"/>
@@ -960,7 +966,10 @@
</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"/>
@@ -1249,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="64" 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"/>
@@ -1361,10 +1370,10 @@
<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="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="3qm-Zv-a7S" firstAttribute="top" secondItem="sMv-Yh-W5N" secondAttribute="bottom" id="5fc-VK-Tfj"/>
- <constraint firstItem="dTs-1h-o4p" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="7Nq-GR-ypc"/>
<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"/>
@@ -1374,7 +1383,6 @@
<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="sMv-Yh-W5N" firstAttribute="top" secondItem="7Gq-77-ypg" secondAttribute="top" id="TvP-3j-NV3"/>
- <constraint firstItem="nkn-oC-NfP" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="YSp-TA-bZd"/>
<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"/>
@@ -1387,6 +1395,7 @@
<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"/>
@@ -1405,11 +1414,13 @@
<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"/>
@@ -1418,6 +1429,7 @@
<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"/>
@@ -1571,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>
@@ -1582,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>
@@ -2581,9 +2595,9 @@
<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="8" height="8"/>
+ <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"/>
@@ -2601,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"/>
@@ -2614,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/EZDemo/HDLEZDemo/HDLEZDemo/ViewController.m b/EZDemo/HDLEZDemo/HDLEZDemo/ViewController.m
index c3d82ad..769bec0 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/ViewController.m
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/ViewController.m
@@ -10,7 +10,7 @@
//钀ょ煶闂ㄩ攣spk
#define HDLEZ_DOOR_SPK @"security.door.ezviz"
-#define HDLEZ_DEVICEID @"1671450533475319810"
+#define HDLEZ_DEVICEID @"1673936447243640833"
//#define HDLEZ_DEVICESERIAL @"K36229010"
#define HDLEZ_DEVICESERIAL @"J92513662"
diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a b/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a
index 529743e..9fd2450 100644
--- a/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a
+++ b/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a
Binary files differ
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
index 22fd570..8802af2 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
@@ -143,6 +143,24 @@
pageNo:(NSInteger)pageNo
completion:(void (^)(ResponseData *responseData))completion;
+/**
+ * @since 娌充笢鑾峰彇璁惧娑堟伅
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ */
+- (void)getCoverSwitchStatus:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion;
+
+/**
+ * @since 娌充笢鑾峰彇璁惧娑堟伅
+ * @param deviceId 璁惧id
+ * @param enable 闅愮閬斀鐘舵��
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ */
+- (void)getCoverSwitchStatus:(NSString *)deviceId
+ enable:(NSInteger)enable
+ completion:(void (^)(ResponseData *responseData))completion;
+
@end
NS_ASSUME_NONNULL_END
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index e258090..a24250c 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -30,6 +30,9 @@
#define API_POST_EZ_DeleteAlarmMes @"/home-wisdom/platform/yingshi/alarm/delete"//鍒犻櫎鎶ヨ娑堟伅
#define API_POST_EZ_ReadAlarmMes @"/home-wisdom/platform/yingshi/alarm/updateChecked"//鏍囪鎶ヨ娑堟伅宸茶
+#define API_POST_EZ_GetCoverSwitchStaus @"/home-wisdom/platform/yingshi/getCoverSwitchStatus"//鑾峰彇钀ょ煶闀滃ご閬斀寮�鍏崇姸鎬�
+#define API_POST_EZ_GetCoverSwitch @"/home-wisdom/platform/yingshi/coverSwitch"//璁剧疆钀ょ煶闀滃ご閬斀寮�鍏�
+
#pragma mark APP_KEY
#define APP_KEY @"HDL-HOME-APP-TEST"
#define SECRET_KEY @"WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"
@@ -421,6 +424,59 @@
}];
}
+/**
+ * @since 娌充笢鑾峰彇璁惧娑堟伅
+ * @param deviceId 璁惧id
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ */
+- (void)getCoverSwitchStatus:(NSString *)deviceId
+ completion:(void (^)(ResponseData *responseData))completion {
+ //璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:@(1) forKey:@"platform"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"鑾峰彇璁惧娑堟伅鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_GetCoverSwitchStaus parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
+/**
+ * @since 娌充笢鑾峰彇璁惧娑堟伅
+ * @param deviceId 璁惧id
+ * @param enable 闅愮閬斀鐘舵��
+ * @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘垚鍔�
+ */
+- (void)getCoverSwitchStatus:(NSString *)deviceId
+ enable:(NSInteger)enable
+ completion:(void (^)(ResponseData *responseData))completion {
+ //璁剧疆璇锋眰鍙傛暟
+ NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue:deviceId forKey:@"deviceId"];
+ [parameters setValue:@(enable) forKey:@"enable"];
+ [parameters setValue:@(1) forKey:@"platform"];
+ [parameters setValue:[NSString stringWithFormat:@"%@",[GlobalKit shareKit].hdlAppKey] forKey:@"appKey"];
+ [parameters setValue:[GlobalKit shareKit].hdlHomeId forKey:@"homeId"];
+
+ parameters = [self GetSignRequestDictionary:parameters];
+
+ NSLog(@"鑾峰彇璁惧娑堟伅鍙傛暟锛�%@",parameters);
+
+ [self requestHttpsPost:API_POST_EZ_GetCoverSwitch parameters:parameters completion:^(ResponseData *responseData) {
+ if (completion) {
+ completion (responseData);
+ }
+ }];
+}
+
/// 鍒锋柊token
/// @param block 缁撴灉
- (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
@@ -501,6 +557,7 @@
URL = TestRequestHttpsHost;
}
URL = [NSString stringWithFormat:@"%@%@", URL, apiPath];
+ NSLog(@"############鎺ュ彛璇锋眰url锛�%@", URL);
// NSURLSessionDataTask * task=nil;
AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
index f1f1cdc..0596bbe 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
@@ -74,7 +74,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (self.msgList.count <= indexPath.row) return;
HDLEZDeviceMsgInfoModel *messageModel = self.msgList[indexPath.row];
- if (self.previewPic) {
+ if (self.previewPic && messageModel.imageUrl && messageModel.imageUrl.length > 0) {
self.previewPic(messageModel.imageUrl);
}
}
@@ -94,13 +94,24 @@
NSString *stataus = @"";
if (indexPath.row == 0) {
stataus = @"鏈帴";
+ messageModel.createTime = @"";
} else if (indexPath.row == 1) {
stataus = @"宸叉帴";
}
- [cell configMessageInfoWithTitle:messageModel.title deviceStatus:stataus messageTime:messageModel.createTime messageImage:indexPath.row != 0 ? messageModel.imageUrl : @""];
+ if (messageModel.createTime && messageModel.createTime.length == 13) {
+ messageModel.createTime = [messageModel.createTime substringToIndex:10];
+ }
+ NSString *messageTime = [self turnDate:messageModel.createTime];
+ [cell configMessageInfoWithTitle:messageModel.content deviceStatus:stataus messageTime:messageTime messageImage:indexPath.row != 0 ? messageModel.imageUrl : @""];
[cell showSpearator:(self.msgList.count != indexPath.row + 1)];
}
+/*鏃堕棿鎴宠浆鏃堕棿
+ */
+-(NSString *)turnDate:(NSString*)dateStr{
+ return [HDLEZConstants timeStrWithFormate:@"yyyy.MM.dd HH:mm" data:[NSDate dateWithTimeIntervalSince1970:[dateStr integerValue]]];;
+}
+
/*璁剧疆娑堟伅鍒楄〃鍊�
*/
-(void)setMsgList:(NSArray<HDLEZDeviceMsgInfoModel *> *)msgList{
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.h b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.h
index 36f401d..f747110 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.h
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.h
@@ -38,6 +38,10 @@
/// - Parameter videoLevel: 娓呮櫚搴�
- (void)videoLevel:(NSInteger)videoLevel;
+/// 璁剧疆娓呮櫚搴﹁皟鑺�
+/// - Parameter isSupport: 鏄惁鏀寔璋冩暣娓呮櫚搴�
+- (void)supportVideoLevelChange:(BOOL)isSupport;
+
/// 鍝嶉搩淇℃伅
/// - Parameter isRing: 鏄惁姝ｅ湪鍝嶉搩馃敂
- (void)ringRingRing:(BOOL)isRing;
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.m b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.m
index 74053b2..f04ef07 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.m
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorToolView.m
@@ -163,6 +163,12 @@
self.hangUpButton.hidden = !isRing;
}
+/// 璁剧疆娓呮櫚搴﹁皟鑺�
+/// - Parameter isSupport: 鏄惁鏀寔璋冩暣娓呮櫚搴�
+- (void)supportVideoLevelChange:(BOOL)isSupport {
+ self.qualityButton.userInteractionEnabled = isSupport;
+}
+
#pragma mark - PrivateMethod
- (void)hangUpAction {
if (self.fullOperation) {
@@ -190,6 +196,8 @@
// }
self.qualityButton.selected = !self.qualityButton.selected;
self.qualityBox.hidden = !self.qualityButton.selected;
+ self.hangUpButton.enabled = !self.qualityButton.selected;
+ self.hangUpButton.alpha = self.qualityButton.selected ? 0.5 : 1;
}
- (void)fullSceneAction {
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
index 155f7c6..9db3569 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m
@@ -39,6 +39,7 @@
@property (nonatomic) BOOL isOpenSound;
@property (nonatomic) BOOL isPlaying;
+@property (nonatomic) BOOL isAnswering; // 姝ｅ湪鎺ュ惉涓�
@property (nonatomic, strong) NSTimer *recordTimer;
@property (nonatomic) NSTimeInterval seconds;
@property (nonatomic, strong) CALayer *orangeLayer;
@@ -60,12 +61,16 @@
@property (nonatomic, weak) IBOutlet UIButton *captureButton;
@property (nonatomic, weak) IBOutlet UIButton *localRecordButton;
@property (nonatomic, weak) IBOutlet UIButton *playButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *playBtnLeftMargin;
@property (weak, nonatomic) IBOutlet UIButton *streamPlayBtn;
@property (nonatomic, weak) IBOutlet UIButton *voiceButton;
@property (nonatomic, weak) IBOutlet UIButton *qualityButton;
@property (nonatomic, weak) IBOutlet UIButton *emptyButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *emptyBtnLeftMargin;
@property (nonatomic, weak) IBOutlet UIButton *largeButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *largeBtnRightMargin;
@property (nonatomic, weak) IBOutlet UIButton *largeBackButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *largeBackBtnLeftMargin;
@property (nonatomic, weak) IBOutlet UIView *ptzView;
@property (nonatomic, weak) IBOutlet UIButton *ptzCloseButton;
@property (nonatomic, weak) IBOutlet UIButton *ptzControlButton;
@@ -132,6 +137,7 @@
self.isStartingTalk = NO;
self.ptzView.hidden = YES;
self.talkView.hidden = YES;
+ self.isAnswering = NO;
self.videoCallOutView.hidden = YES;
self.doorPlayerAspectRatio = HDLEZ_APP_SCREEN_WIDTH / HDLEZ_APP_SCREEN_HEIGHT;
_landscape = NO;
@@ -290,15 +296,16 @@
//缁撴潫鏈湴褰曞儚
if(self.localRecordButton.selected)
{
+ __weak __typeof(self)weakSelf = self;
[_player stopLocalRecordExt:^(BOOL ret) {
NSLog(@"%d", ret);
- [_recordTimer invalidate];
- _recordTimer = nil;
- self.localRecordLabel.hidden = YES;
- [self saveRecordToPhotosAlbum:_filePath];
- _filePath = nil;
+ [weakSelf.recordTimer invalidate];
+ weakSelf.recordTimer = nil;
+ weakSelf.localRecordLabel.hidden = YES;
+ [weakSelf saveRecordToPhotosAlbum:weakSelf.filePath];
+ weakSelf.filePath = nil;
}];
}
@@ -351,8 +358,7 @@
self.captureButton.enabled = NO;
self.localRecordButton.enabled = NO;
self.streamPlayBtn.hidden = YES;
- self.isShowAlert = YES;
- NSLog(@"#####鍒濆鍖栨柟娉曞睍绀�");
+// self.isShowAlert = YES;
if (_url)
{
@@ -383,9 +389,9 @@
[self.qualityButton setTitle:NSLocalizedString(@"device_quality_low",@"娴佺晠") forState:UIControlStateNormal];
}
}
-#warning 涓嶆敮鎸佸垏鎹㈡竻鏅板害锛屽叏灞忔椂涔熼渶瑕佷富鎸�
if (_cameraInfo.cameraNo == 0 || [self.deviceInfo.deviceType containsString:@"CAS"]) { //涓嶆敮鎸佹竻鏅板害鍒囨崲
self.qualityButton.hidden = YES;
+ [self.fullSceneToolView supportVideoLevelChange:NO];
}
if (self.deviceInfo.cameraInfo.count > 1) {
@@ -401,8 +407,9 @@
if (!_url)
{
//鎶撳浘鎺ュ彛婕旂ず浠ｇ爜
+ __weak __typeof(self)weakSelf = self;
[EZOPENSDK captureCamera:_cameraInfo.deviceSerial cameraNo:_cameraInfo.cameraNo completion:^(NSString *url, NSError *error) {
- NSLog(@"[%@] capture cameraNo is [%d] url is %@, error is %@", _cameraInfo.deviceSerial, (int)_cameraInfo.cameraNo, url, error);
+ NSLog(@"[%@] capture cameraNo is [%d] url is %@, error is %@", weakSelf.cameraInfo.deviceSerial, (int)weakSelf.cameraInfo.cameraNo, url, error);
}];
}
#endif
@@ -499,8 +506,9 @@
// 闂ㄩ攣鍏ㄥ睆鐘舵�佷笅宸ュ叿鏍�
[self.view addSubview:self.fullSceneToolView];
- __weak EZLivePlayViewController *weakSelf = self;
- [self.fullSceneToolView configPlayStatus:YES soundOn:YES videoLevel:1 toolOperation:^(HDLEZVideoFullSceneOperation operationType) {
+ __weak __typeof(self)weakSelf = self;
+ [self.fullSceneToolView ringRingRing:YES]; // 榛樿鏄剧ず鎸傛柇鎸夐挳
+ [self.fullSceneToolView configPlayStatus:YES soundOn:YES videoLevel:_cameraInfo.videoLevel toolOperation:^(HDLEZVideoFullSceneOperation operationType) {
[weakSelf doorLockFullSceneOperation:operationType];
}];
}
@@ -600,12 +608,22 @@
[self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO];
- [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio]];
+ [self.playButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [self.emptyButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [self.largeButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+// [self.largeBackButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio, self.playBtnLeftMargin, self.emptyBtnLeftMargin, self.largeBtnRightMargin]];
self.scrollViewWHRatio = [NSLayoutConstraint constraintWithItem:self.scrollView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.scrollView attribute:NSLayoutAttributeHeight multiplier:16/9. constant:0];
- [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio]];
+ self.playBtnLeftMargin = [NSLayoutConstraint constraintWithItem:self.playButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.toolBar attribute:NSLayoutAttributeLeading multiplier:1 constant:0];
+ self.emptyBtnLeftMargin = [NSLayoutConstraint constraintWithItem:self.emptyButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.qualityButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:0];
+ self.largeBtnRightMargin = [NSLayoutConstraint constraintWithItem:self.toolBar attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:self.largeButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:0];
+ [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio, self.playBtnLeftMargin, self.emptyBtnLeftMargin, self.largeBtnRightMargin]];
dispatch_async(dispatch_get_main_queue(), ^{
[self.scrollView layoutIfNeeded];
[self.toolBar layoutIfNeeded];
+ [self.playButton layoutIfNeeded];
+ [self.emptyButton layoutIfNeeded];
+ [self.largeButton layoutIfNeeded];
});
if(toInterfaceOrientation == UIInterfaceOrientationLandscapeLeft ||
@@ -620,16 +638,25 @@
CGFloat tureScreenW = HDLEZ_APP_SCREEN_WIDTH > HDLEZ_APP_SCREEN_HEIGHT ? HDLEZ_APP_SCREEN_HEIGHT : HDLEZ_APP_SCREEN_WIDTH;
CGFloat tureScreenH = HDLEZ_APP_SCREEN_WIDTH < HDLEZ_APP_SCREEN_HEIGHT ? HDLEZ_APP_SCREEN_HEIGHT : HDLEZ_APP_SCREEN_WIDTH;
-
+ CGFloat marginSpace = 64;
[self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO];
- [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio]];
+ [self.playButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [self.emptyButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [self.largeButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+ [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio, self.playBtnLeftMargin, self.emptyBtnLeftMargin, self.largeBtnRightMargin]];
self.scrollViewWHRatio = [NSLayoutConstraint constraintWithItem:self.scrollView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.scrollView attribute:NSLayoutAttributeHeight multiplier:tureScreenH/(tureScreenW - 37) constant:0];
- [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio]];
+ self.playBtnLeftMargin = [NSLayoutConstraint constraintWithItem:self.playButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.toolBar attribute:NSLayoutAttributeLeading multiplier:1 constant:marginSpace];
+ self.emptyBtnLeftMargin = [NSLayoutConstraint constraintWithItem:self.emptyButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.qualityButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:(tureScreenH - tureScreenW - 2 * marginSpace)];
+ self.largeBtnRightMargin = [NSLayoutConstraint constraintWithItem:self.toolBar attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:self.largeButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:marginSpace];
+ [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio, self.playBtnLeftMargin, self.emptyBtnLeftMargin, self.largeBtnRightMargin]];
dispatch_async(dispatch_get_main_queue(), ^{
[self.scrollView layoutIfNeeded];
[self.toolBar layoutIfNeeded];
+ [self.playButton layoutIfNeeded];
+ [self.emptyButton layoutIfNeeded];
+ [self.largeButton layoutIfNeeded];
});
}
}
@@ -699,7 +726,7 @@
// HDLEZLog(@"楂橈細%ld",(long)playerVH);
CGFloat ratio=((CGFloat)width)/((CGFloat)height);
NSLog(@"姣斾緥锛�%f",ratio);
- CGFloat playerVW=playerVH*ratio;
+// CGFloat playerVW=playerVH*ratio;
self.doorPlayerAspectRatio = ratio;
// HDLEZLog(@"瀹斤細%ld",(long)playerVW);
[self.doorPlayerView mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -900,6 +927,7 @@
- (IBAction)large:(id)sender
{
+ if (!self.isPlaying)return; // 鏈挱鏀剧姝㈠叏灞忥紝
self.videoCallOutView.hidden = YES;
if (_landscape == YES) {
[self largeBack:self.largeBackButton];
@@ -1301,6 +1329,7 @@
self.speakImageView.alpha = 0;
self.talkView.hidden = YES;
}];
+ self.isAnswering = NO;
}
- (IBAction)localButtonClicked:(id)sender
@@ -1308,15 +1337,16 @@
//缁撴潫鏈湴褰曞儚
if(self.localRecordButton.selected)
{
+ __weak __typeof(self)weakSelf = self;
[_player stopLocalRecordExt:^(BOOL ret) {
NSLog(@"%d", ret);
- [_recordTimer invalidate];
- _recordTimer = nil;
- self.localRecordLabel.hidden = YES;
- [self saveRecordToPhotosAlbum:_filePath];
- _filePath = nil;
+ [weakSelf.recordTimer invalidate];
+ weakSelf.recordTimer = nil;
+ weakSelf.localRecordLabel.hidden = YES;
+ [weakSelf saveRecordToPhotosAlbum:weakSelf.filePath];
+ weakSelf.filePath = nil;
}];
}
else
@@ -1396,18 +1426,19 @@
}
- (IBAction)clickCalloutHangupAction:(id)sender {
- [UIView dd_showMessage:@"鎸傛柇寮�鍙戜腑..."];
self.isShowAlert = NO;
+ [self closeTalkView:self.talkCloseButton];
}
- (IBAction)clickCalloutIgnoreAction:(id)sender {
- [UIView dd_showMessage:@"蹇界暐寮�鍙戜腑..."];
+// [UIView dd_showMessage:@"蹇界暐寮�鍙戜腑..."];
self.isShowAlert = NO;
+ self.isAnswering = NO;
}
- (IBAction)clickCalloutAnswerAction:(id)sender {
- [UIView dd_showMessage:@"鎺ュ惉寮�鍙戜腑..."];
self.isShowAlert = NO;
+ self.isAnswering = YES;
[self talkButtonClicked:self.talkButton];
}
@@ -1416,15 +1447,11 @@
/// 灞曠ず鍛煎彨寮规
- (void)showCallOutAlertView {
self.videoCallOutView.hidden = NO;
- [UIView dd_showMessage:@"灞曠ず鍛煎彨寮规"];
- NSLog(@"灞曠ず鍛煎彨寮规");
}
/// 闅愯棌鍛煎彨寮规
- (void)hiddenCallOutAlertView {
self.videoCallOutView.hidden = YES;
- [UIView dd_showMessage:@"闅愯棌鍛煎彨寮规"];
- NSLog(@"闅愯棌鍛煎彨寮规");
}
#pragma mark - Private Methods
@@ -1545,7 +1572,7 @@
[view removeFromSuperview];
}
}
- CGFloat averageWidth = [UIScreen mainScreen].bounds.size.width/5.0;
+// CGFloat averageWidth = [UIScreen mainScreen].bounds.size.width/5.0;
UIImageView *lineImageView1 = [UIView dd_instanceVerticalLine:20 color:[UIColor grayColor]];
// lineImageView1.frame = CGRectMake(averageWidth, 7, lineImageView1.frame.size.width, lineImageView1.frame.size.height);
[self.toolBar addSubview:lineImageView1];
@@ -1686,7 +1713,10 @@
- (void)doorLockFullSceneOperation:(HDLEZVideoFullSceneOperation)operation {
switch (operation) {
case HDLEZVideoFullSceneOperationOfHangUp: { // 鎸傛柇
+ [self largeBack:self.largeButton];
+ [self closeTalkView:self.talkCloseButton];
[self hiddenCallOutAlertView];
+ [self.navigationController popViewControllerAnimated:YES];
}
break;
case HDLEZVideoFullSceneOperationOfPlay: { // 鎾斁
@@ -1732,10 +1762,8 @@
- (void)setIsShowAlert:(BOOL)isShowAlert {
_isShowAlert = isShowAlert;
if (isShowAlert) {
- NSLog(@"#####set鏂规硶灞曠ず");
[self showCallOutAlertView];
} else {
- NSLog(@"#####set鏂规硶闅愯棌");
[self hiddenCallOutAlertView];
}
}
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
index eb184f6..9ae55a2 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
@@ -33,6 +33,7 @@
@property (nonatomic, weak) IBOutlet UILabel *currentVersionLabel;
@property (nonatomic, weak) IBOutlet UILabel *nVersionLabel;
@property (nonatomic, weak) IBOutlet UIImageView *updateImageView;
+@property (nonatomic, strong) UIButton *deleteButton;
@property (nonatomic, strong) EZDeviceVersion *deviceVersion;
@property (nonatomic, strong) NSTimer *timer;
@@ -87,21 +88,22 @@
self.serialLabel.text = self.deviceInfo.deviceSerial;
self.updateImageView.hidden = YES;
+ __weak __typeof(self)weakSelf = self;
[EZOPENSDK getDeviceVersion:self.deviceInfo.deviceSerial
completion:^(EZDeviceVersion *version, NSError *error) {
- _deviceVersion = version;
- self.currentVersionLabel.text = version.currentVersion;
- if(version.isNeedUpgrade)
- {
- self.nVersionLabel.text = version.latestVersion;
- self.updateImageView.hidden = NO;
- }
- else
- {
- self.updateImageView.hidden = YES;
- self.nVersionLabel.text = version.currentVersion;
- }
- }];
+ weakSelf.deviceVersion = version;
+ weakSelf.currentVersionLabel.text = version.currentVersion;
+ if(version.isNeedUpgrade) {
+ weakSelf.nVersionLabel.text = version.latestVersion;
+ weakSelf.updateImageView.hidden = NO;
+ } else {
+ weakSelf.updateImageView.hidden = YES;
+ weakSelf.nVersionLabel.text = version.currentVersion;
+ }
+ }];
+ [self.privacyMaskSwitch setOn:NO];
+ [self getPrivacyMaskSwitchStatus];
+ self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
// [[EzvizDeviceManager sharedManager] startP2PHolePunching:_cameraInfo.cameraId completion:^(BOOL result, NSError *error) {
// NSLog(@"result = %d, error = %@", result, error);
// }];
@@ -164,6 +166,15 @@
// Dispose of any resources that can be recreated.
}
+- (void)getPrivacyMaskSwitchStatus { // 鑾峰彇闀滃ご閬斀寮�鍏崇姸鎬�
+ __weak __typeof(self)weakSelf = self;
+ [EZHttpUtil.sharedManager getCoverSwitchStatus:self.deviceInfo.deviceSerial completion:^(ResponseData * _Nonnull responseData) {
+ if(responseData.success) {
+ NSLog(@"#############鎵撳嵃鏁版嵁锛�%@", responseData);
+ }
+ }];
+}
+
#pragma mark - Table view data source
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -178,16 +189,22 @@
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"EZSettingCell" forIndexPath:indexPath];
// Configure the cell...
+ cell.backgroundColor = [UIColor whiteColor];
+ cell.contentView.backgroundColor = [UIColor whiteColor];
cell.textLabel.text = [[_settingList dd_objectAtIndex:indexPath.section] dd_objectAtIndex:indexPath.row];
-
+ cell.textLabel.textColor = HDLEZHEXCOLOR(0x1B2D4D, 1.0);
+ cell.textLabel.textAlignment = NSTextAlignmentLeft;
cell.accessoryType = UITableViewCellAccessoryNone;
if (indexPath.section == 0)
{
[cell.contentView addSubview:self.nameLabel];
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+// cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ UIImageView *accessoryImgView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"hdl_ez_list_next"]];
+ accessoryImgView.frame = CGRectMake(0, 0, 16, 16);
+ cell.accessoryView = accessoryImgView;
[self.nameLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(@140);
- make.trailing.mas_equalTo(cell.contentView.mas_trailing);
+ make.trailing.mas_equalTo(cell.contentView.mas_trailing).offset(-10);
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
make.height.mas_equalTo(@20);
}];
@@ -233,14 +250,23 @@
[self.rightArrowImg mas_remakeConstraints:^(MASConstraintMaker *make) {
make.trailing.mas_equalTo(@(-17));
make.centerY.mas_equalTo(cell.contentView.mas_centerY);
- make.width.mas_equalTo(@20);
- make.height.mas_equalTo(@20);
+ make.width.mas_equalTo(@16);
+ make.height.mas_equalTo(@16);
}];
}
else if (indexPath.section == 8)
{
- cell.textLabel.textColor = [UIColor redColor];
- cell.textLabel.textAlignment = NSTextAlignmentCenter;
+ cell.backgroundColor = [UIColor clearColor];
+ cell.contentView.backgroundColor = [UIColor clearColor];
+ cell.textLabel.text = @"";
+ [cell.contentView addSubview:self.deleteButton];
+ [self.deleteButton addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
+ [self.deleteButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+ make.centerX.mas_equalTo(cell.contentView.mas_centerX);
+ make.left.mas_equalTo(cell.contentView.mas_left).offset(77.);
+ make.bottom.mas_equalTo(cell.contentView.mas_bottom);
+ make.height.mas_equalTo(@44);
+ }];
}
else if (indexPath.section == 3)
{
@@ -294,9 +320,24 @@
return cell;
}
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 5.0f;
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return (indexPath.section == 8) ? 92 : 50.;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 0.0001f;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return (section == 0 || section == 2 || section == 6) ? 8.0f : 0.001f;
+}
+
+- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+ return nil;
+}
+
+- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+ return nil;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
@@ -307,21 +348,21 @@
// UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", @"鍙栨秷") destructiveButtonTitle:NSLocalizedString(@"delete",@"鍒犻櫎") otherButtonTitles:nil];
// [actionSheet showInView:self.view];
- __weak __typeof(self)weakSelf = self;
- UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-
- [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"cancel", @"鍙栨秷") style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
- [weakSelf dismissViewControllerAnimated:YES completion:^{
- }];
- }]];
-
- [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"delete",@"鍒犻櫎") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
- [weakSelf deleteCurrentDevice];
- [weakSelf dismissViewControllerAnimated:YES completion:^{
- }];
- }]];
-
- [self presentViewController:actionSheet animated:YES completion:nil];
+// __weak __typeof(self)weakSelf = self;
+// UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+//
+// [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"cancel", @"鍙栨秷") style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+// [weakSelf dismissViewControllerAnimated:YES completion:^{
+// }];
+// }]];
+//
+// [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"delete",@"鍒犻櫎") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+// [weakSelf deleteCurrentDevice];
+// [weakSelf dismissViewControllerAnimated:YES completion:^{
+// }];
+// }]];
+//
+// [self presentViewController:actionSheet animated:YES completion:nil];
}
// else if (indexPath.section == 5)
@@ -580,4 +621,36 @@
}
}
+- (void)deleteAction {
+ __weak __typeof(self)weakSelf = self;
+ UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+
+ [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"cancel", @"鍙栨秷") style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+ [weakSelf dismissViewControllerAnimated:YES completion:^{
+ }];
+ }]];
+
+ [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"delete",@"鍒犻櫎") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+ [weakSelf deleteCurrentDevice];
+ [weakSelf dismissViewControllerAnimated:YES completion:^{
+ }];
+ }]];
+
+ [self presentViewController:actionSheet animated:YES completion:nil];
+}
+
+#pragma mark - Getter
+- (UIButton *)deleteButton {
+ if (!_deleteButton) {
+ _deleteButton = [UIButton buttonWithType:UIButtonTypeCustom];
+ _deleteButton.backgroundColor = [UIColor whiteColor];
+ [_deleteButton setTitle:NSLocalizedString(@"delete", @"鍒犻櫎") forState:UIControlStateNormal];
+ [_deleteButton setTitleColor:HDLEZHEXCOLOR(0xFF4747, 1.0) forState:UIControlStateNormal];
+ _deleteButton.titleLabel.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_16);
+ _deleteButton.layer.cornerRadius = 22.;
+ _deleteButton.clipsToBounds = YES;
+ }
+ return _deleteButton;
+}
+
@end
diff --git a/EZSDK/EZSDK/EZSDK.h b/EZSDK/EZSDK/EZSDK.h
index 3532d07..442c613 100644
--- a/EZSDK/EZSDK/EZSDK.h
+++ b/EZSDK/EZSDK/EZSDK.h
@@ -75,6 +75,13 @@
*/
- (void)Play:(EZDeviceInfo*)deviceInfo;
+/**
+ 鏌ョ湅瑙嗛鐩戞帶鐩存挱
+ @param deviceInfo 璁惧淇℃伅
+ @param isShow 鏄惁灞曠ず鍛煎彨寮规
+ */
+- (void)Play:(EZDeviceInfo*)deviceInfo showCallout:(BOOL)isShow;
+
/// 鎸囧畾搴忓垪鍙� 鏌ョ湅瑙嗛鐩戞帶鐩存挱
/// @param deviceSerial 搴忓垪鍙�
- (void)PlayWithDeviceSerial:(NSString *)deviceSerial;
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index fa3e998..4300cc7 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -202,8 +202,18 @@
// rootViewController.cameraIndex=0;
[[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:rootViewController animated:YES];
-
-
+}
+
+- (void)Play:(EZDeviceInfo*)deviceInfo showCallout:(BOOL)isShow {
+ [GlobalKit shareKit].deviceType=HDLEZDeviceType_Default;
+ UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+ EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
+ rootViewController.isShowAlert = isShow;
+ rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
+ NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
+
+ [[self getCurrentVC].navigationBar setHidden:NO];
+ [[self getCurrentVC] pushViewController:rootViewController animated:YES];
}
/// 鎸囧畾搴忓垪鍙锋挱鏀�
--
Gitblit v1.8.0