From 5bc255efe4b83702db368b7af3945e9a8368bfce Mon Sep 17 00:00:00 2001 From: Davin <591807572@qq.com> Date: 星期二, 13 六月 2023 20:19:09 +0800 Subject: [PATCH] faeture 摄像头放大功能 --- EZDemo/HDLEZDemo/HDLEZDemo.xcodeproj/project.pbxproj | 58 +--- EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/EZMain.strings | 147 ++++++++++++ EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m | 97 +++++++ EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a | 0 EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/AddDevice.strings | 74 ++++++ EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard | 151 ++++++------ EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/Localizable.strings | 168 ++++++++++++++ 7 files changed, 572 insertions(+), 123 deletions(-) diff --git a/EZDemo/HDLEZDemo/HDLEZDemo.xcodeproj/project.pbxproj b/EZDemo/HDLEZDemo/HDLEZDemo.xcodeproj/project.pbxproj index 6243df7..8d1e7d5 100644 --- a/EZDemo/HDLEZDemo/HDLEZDemo.xcodeproj/project.pbxproj +++ b/EZDemo/HDLEZDemo/HDLEZDemo.xcodeproj/project.pbxproj @@ -10,9 +10,6 @@ AE31FE2129CC31F200678568 /* EZOpenSDKFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE31FE2029CC31F200678568 /* EZOpenSDKFramework.framework */; }; AE31FE2229CC321500678568 /* EZOpenSDKFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AE31FE2029CC31F200678568 /* EZOpenSDKFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; AEC1E3F429B6DDC200A00548 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEC1E3F329B6DDC200A00548 /* NetworkExtension.framework */; }; - AEC1E3FE29B836D700A00548 /* AddDevice.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E3FA29B836D700A00548 /* AddDevice.strings */; }; - AEC1E3FF29B836D700A00548 /* EZMain.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E3FC29B836D700A00548 /* EZMain.strings */; }; - AEC1E40429B837C800A00548 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E40229B837C800A00548 /* Localizable.strings */; }; AEC1E40529B839E700A00548 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E40729B839E700A00548 /* Localizable.strings */; }; AEC1E40829B83A0E00A00548 /* EZMain.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E40A29B83A0E00A00548 /* EZMain.strings */; }; AEC1E40B29B83A1200A00548 /* AddDevice.strings in Resources */ = {isa = PBXBuildFile; fileRef = AEC1E40D29B83A1200A00548 /* AddDevice.strings */; }; @@ -74,11 +71,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 835636642A3802FC009A992A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/AddDevice.strings"; sourceTree = "<group>"; }; + 835636652A3802FC009A992A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/EZMain.strings"; sourceTree = "<group>"; }; + 835636662A3802FC009A992A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; }; AE31FE2029CC31F200678568 /* EZOpenSDKFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = EZOpenSDKFramework.framework; sourceTree = "<group>"; }; AEC1E3F329B6DDC200A00548 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; - AEC1E3FB29B836D700A00548 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../../../../../../HDL/EZOpenSDK/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/AddDevice.strings"; sourceTree = "<group>"; }; - AEC1E3FD29B836D700A00548 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../../../../../../HDL/EZOpenSDK/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/zh-Hans.lproj/EZMain.strings"; sourceTree = "<group>"; }; - AEC1E40329B837C800A00548 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../../../../../../HDL/OnPro/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; }; AEC1E40629B839E700A00548 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; }; AEC1E40929B83A0E00A00548 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EZMain.strings; sourceTree = "<group>"; }; AEC1E40C29B83A1200A00548 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AddDevice.strings; sourceTree = "<group>"; }; @@ -234,9 +231,6 @@ isa = PBXGroup; children = ( AEC1E40729B839E700A00548 /* Localizable.strings */, - AEC1E40229B837C800A00548 /* Localizable.strings */, - AEC1E3FA29B836D700A00548 /* AddDevice.strings */, - AEC1E3FC29B836D700A00548 /* EZMain.strings */, AEC1E40D29B83A1200A00548 /* AddDevice.strings */, AEC1E40A29B83A0E00A00548 /* EZMain.strings */, ); @@ -525,16 +519,13 @@ AEDD94C629B04DDA00EAA2CA /* LaunchScreen.storyboard in Resources */, AEDD957329B0650000EAA2CA /* AddDevice.storyboard in Resources */, AEDD950E29B04E4B00EAA2CA /* com.hri.hpc.mobile.ios.player.metallib in Resources */, - AEC1E40429B837C800A00548 /* Localizable.strings in Resources */, AEDD957129B0650000EAA2CA /* EZSupportViewController.xib in Resources */, AEC1E40B29B83A1200A00548 /* AddDevice.strings in Resources */, AEC1E40829B83A0E00A00548 /* EZMain.strings in Resources */, - AEC1E3FE29B836D700A00548 /* AddDevice.strings in Resources */, AEDD957429B0650000EAA2CA /* EZMain.storyboard in Resources */, AEDD94C329B04DDA00EAA2CA /* Assets.xcassets in Resources */, AEC1E40529B839E700A00548 /* Localizable.strings in Resources */, AEDD94BE29B04DD800EAA2CA /* Main.storyboard in Resources */, - AEC1E3FF29B836D700A00548 /* EZMain.strings in Resources */, AEDD957229B0650000EAA2CA /* EZVideoTalkViewcontroller.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -566,34 +557,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - AEC1E3FA29B836D700A00548 /* AddDevice.strings */ = { - isa = PBXVariantGroup; - children = ( - AEC1E3FB29B836D700A00548 /* zh-Hans */, - ); - name = AddDevice.strings; - sourceTree = "<group>"; - }; - AEC1E3FC29B836D700A00548 /* EZMain.strings */ = { - isa = PBXVariantGroup; - children = ( - AEC1E3FD29B836D700A00548 /* zh-Hans */, - ); - name = EZMain.strings; - sourceTree = "<group>"; - }; - AEC1E40229B837C800A00548 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - AEC1E40329B837C800A00548 /* zh-Hans */, - ); - name = Localizable.strings; - sourceTree = "<group>"; - }; AEC1E40729B839E700A00548 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( AEC1E40629B839E700A00548 /* en */, + 835636662A3802FC009A992A /* zh-Hans */, ); name = Localizable.strings; sourceTree = "<group>"; @@ -602,6 +570,7 @@ isa = PBXVariantGroup; children = ( AEC1E40929B83A0E00A00548 /* en */, + 835636652A3802FC009A992A /* zh-Hans */, ); name = EZMain.strings; sourceTree = "<group>"; @@ -610,6 +579,7 @@ isa = PBXVariantGroup; children = ( AEC1E40C29B83A1200A00548 /* en */, + 835636642A3802FC009A992A /* zh-Hans */, ); name = AddDevice.strings; sourceTree = "<group>"; @@ -749,9 +719,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = HDLEZDemo/HDLEZDemo.entitlements; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = BVTA78PRYA; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = BVTA78PRYA; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -783,6 +755,8 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.hdl.onpro1; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "HDLEZDemo-Development"; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_WORKSPACE = YES; @@ -795,9 +769,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = HDLEZDemo/HDLEZDemo.entitlements; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = BVTA78PRYA; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = BVTA78PRYA; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -829,6 +805,8 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.hdl.onpro1; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "HDLEZDemo-Development"; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_WORKSPACE = YES; diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard b/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard index 63dec62..d163528 100644 --- a/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard +++ b/EZDemo/HDLEZDemo/HDLEZDemo/EZMain.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment version="4352" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -14,7 +14,7 @@ <navigationController id="tPl-Go-Tmu" sceneMemberID="viewController"> <tabBarItem key="tabBarItem" title="Item" id="EOh-Lf-fJU"/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="9n2-YJ-ND5"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="20" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <connections> @@ -35,7 +35,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="R2t-zM-WMl"> - <rect key="frame" x="0.0" y="44.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="50" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R2t-zM-WMl" id="a02-NK-SeS"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -92,14 +92,14 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="MPX-n4-aGz"> - <rect key="frame" x="82.5" y="100" width="210" height="94"/> + <rect key="frame" x="82.5" y="120" width="210" height="94"/> <constraints> <constraint firstAttribute="height" constant="94" id="UZa-4y-JdR"/> <constraint firstAttribute="width" constant="210" id="xPZ-ku-beA"/> </constraints> </imageView> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9VU-hP-zCR"> - <rect key="frame" x="45" y="247" width="285" height="39"/> + <rect key="frame" x="45" y="267" width="285" height="39"/> <constraints> <constraint firstAttribute="height" constant="39" id="Uox-Yc-kob"/> <constraint firstAttribute="width" constant="285" id="wAy-Hx-fAn"/> @@ -112,7 +112,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p2R-3f-bRm"> - <rect key="frame" x="45" y="306" width="285" height="39"/> + <rect key="frame" x="45" y="326" width="285" height="39"/> <constraints> <constraint firstAttribute="height" constant="39" id="Dta-c4-zZr"/> <constraint firstAttribute="width" constant="285" id="OT3-hb-4Yn"/> @@ -138,7 +138,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EWl-dl-v7z"> - <rect key="frame" x="45" y="365" width="285" height="39"/> + <rect key="frame" x="45" y="385" width="285" height="39"/> <constraints> <constraint firstAttribute="height" constant="39" id="FhC-TV-ezu"/> <constraint firstAttribute="width" constant="285" id="Niw-45-NHf"/> @@ -151,7 +151,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tbh-3f-Kyo"> - <rect key="frame" x="45" y="483" width="285" height="39"/> + <rect key="frame" x="45" y="503" width="285" height="39"/> <constraints> <constraint firstAttribute="height" constant="39" id="aUb-DN-crC"/> <constraint firstAttribute="width" constant="285" id="u2c-90-3In"/> @@ -164,7 +164,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ps8-ku-D1c"> - <rect key="frame" x="45" y="424" width="285" height="39"/> + <rect key="frame" x="45" y="444" width="285" height="39"/> <constraints> <constraint firstAttribute="height" constant="39" id="Mu0-my-UVK"/> <constraint firstAttribute="width" constant="285" id="rGt-yT-DqQ"/> @@ -222,7 +222,7 @@ <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZDeviceCell" rowHeight="73" id="Xkg-Dw-w2X" customClass="DeviceListCell"> - <rect key="frame" x="0.0" y="44.5" width="375" height="73"/> + <rect key="frame" x="0.0" y="50" width="375" height="73"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xkg-Dw-w2X" id="Iet-JC-0rQ"> <rect key="frame" x="0.0" y="0.0" width="375" height="73"/> @@ -392,7 +392,7 @@ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZCameraCell" id="7Im-ni-l3z"> - <rect key="frame" x="0.0" y="44.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="50" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7Im-ni-l3z" id="DdN-J1-0fa"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -428,13 +428,13 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="璁惧搴忓垪鍙�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iwL-Ah-WH0"> - <rect key="frame" x="20" y="150" width="72" height="17"/> + <rect key="frame" x="20" y="170" width="72" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="bezel" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3Ww-0Y-zfl"> - <rect key="frame" x="102" y="138.5" width="253" height="40"/> + <rect key="frame" x="102" y="158.5" width="253" height="40"/> <constraints> <constraint firstAttribute="height" constant="40" id="zI7-mv-iMH"/> </constraints> @@ -442,7 +442,7 @@ <textInputTraits key="textInputTraits"/> </textField> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="bezel" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iAj-OV-oUu"> - <rect key="frame" x="102" y="198.5" width="253" height="40"/> + <rect key="frame" x="102" y="218.5" width="253" height="40"/> <constraints> <constraint firstAttribute="height" constant="40" id="jeW-7w-Zss"/> </constraints> @@ -450,7 +450,7 @@ <textInputTraits key="textInputTraits"/> </textField> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2s3-2Z-WBg"> - <rect key="frame" x="170" y="258.5" width="35" height="33"/> + <rect key="frame" x="170" y="278.5" width="35" height="33"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <state key="normal" title="璺宠浆"> <color key="titleColor" systemColor="darkTextColor"/> @@ -466,7 +466,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="閫氶亾鍙�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gfd-eM-Uwg"> - <rect key="frame" x="20" y="210" width="43" height="17"/> + <rect key="frame" x="20" y="230" width="43" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -512,7 +512,7 @@ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DemoAPICell" id="wpS-t4-02o"> - <rect key="frame" x="0.0" y="44.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="50" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wpS-t4-02o" id="8mM-ux-z21"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -551,7 +551,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="UVM-wN-ME4"> - <rect key="frame" x="0.0" y="44.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="50" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UVM-wN-ME4" id="PFk-ak-8nJ"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -587,22 +587,22 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8AH-ts-VAl"> - <rect key="frame" x="0.0" y="44" width="187.5" height="100"/> + <rect key="frame" x="0.0" y="64" width="187.5" height="100"/> <color key="backgroundColor" red="0.17321318387985229" green="0.74333697557449341" blue="0.45914602279663086" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="100" id="uyH-gu-qB2"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="frT-lO-vkv"> - <rect key="frame" x="187.5" y="144" width="187.5" height="100"/> + <rect key="frame" x="187.5" y="164" width="187.5" height="100"/> <color key="backgroundColor" red="0.17321318387985229" green="0.74333697557449341" blue="0.45914602279663086" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XlI-CJ-eCW"> - <rect key="frame" x="0.0" y="144" width="187.5" height="100"/> + <rect key="frame" x="0.0" y="164" width="187.5" height="100"/> <color key="backgroundColor" red="0.93333333330000001" green="0.65490196079999996" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iCt-fy-olc"> - <rect key="frame" x="187.5" y="44" width="187.5" height="100"/> + <rect key="frame" x="187.5" y="64" width="187.5" height="100"/> <color key="backgroundColor" red="0.85770881180000003" green="0.211302614" blue="0.113631911" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> </subviews> @@ -648,7 +648,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="VhH-MZ-U0P"> - <rect key="frame" x="0.0" y="44.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="50" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VhH-MZ-U0P" id="Kep-2I-4hb"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -683,7 +683,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hdv-eQ-Pot"> - <rect key="frame" x="0.0" y="44" width="375" height="211"/> + <rect key="frame" x="0.0" y="64" width="375" height="211"/> <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="width" secondItem="hdv-eQ-Pot" secondAttribute="height" multiplier="16:9" id="qjy-ev-K4v"/> @@ -800,10 +800,10 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="gFl-PI-CLn"> - <rect key="frame" x="0.0" y="44" width="375" height="623"/> + <rect key="frame" x="0.0" y="64" width="375" height="603"/> </imageView> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NRj-hs-uOI"> - <rect key="frame" x="0.0" y="44" width="375" height="211"/> + <rect key="frame" x="0.0" y="64" width="375" height="211"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Xz-5f-ZJx"> <rect key="frame" x="0.0" y="0.0" width="375" height="211"/> @@ -826,7 +826,7 @@ <viewLayoutGuide key="frameLayoutGuide" id="itJ-oF-sXb"/> </scrollView> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2bL-GF-xWw"> - <rect key="frame" x="0.0" y="44" width="375" height="40"/> + <rect key="frame" x="0.0" y="64" width="375" height="40"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="40" id="u99-on-soH"/> @@ -836,7 +836,7 @@ <nil key="highlightedColor"/> </label> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-c9-rvb"> - <rect key="frame" x="147.5" y="54" width="80" height="24"/> + <rect key="frame" x="147.5" y="74" width="80" height="24"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="80" id="O7b-Gn-efp"/> @@ -847,7 +847,7 @@ <nil key="highlightedColor"/> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dTs-1h-o4p"> - <rect key="frame" x="157" y="162" width="61" height="93"/> + <rect key="frame" x="157" y="182" width="61" height="93"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="picture_bg" translatesAutoresizingMaskIntoConstraints="NO" id="oew-Eh-y6G"> <rect key="frame" x="0.0" y="0.0" width="61" height="93"/> @@ -911,7 +911,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1FE-Su-4U4"> - <rect key="frame" x="0.0" y="255" width="375" height="37"/> + <rect key="frame" x="0.0" y="275" width="375" height="37"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xSp-4i-Jwh"> <rect key="frame" x="0.0" y="0.0" width="75" height="37"/> @@ -989,10 +989,10 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Gq-77-ypg"> - <rect key="frame" x="0.0" y="292" width="375" height="375"/> + <rect key="frame" x="0.0" y="312" width="375" height="355"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUI-tR-jyG"> - <rect key="frame" x="77.5" y="87.5" width="100" height="100"/> + <rect key="frame" x="77.5" y="77.5" width="100" height="100"/> <constraints> <constraint firstAttribute="width" constant="100" id="4pV-lo-eLV"/> <constraint firstAttribute="height" constant="100" id="CFM-rZ-KQg"/> @@ -1008,7 +1008,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Eh-hh-84T"> - <rect key="frame" x="197.5" y="87.5" width="100" height="100"/> + <rect key="frame" x="197.5" y="77.5" width="100" height="100"/> <constraints> <constraint firstAttribute="width" constant="100" id="MdX-on-ZlR"/> <constraint firstAttribute="height" constant="100" id="uZ6-ZC-fku"/> @@ -1025,7 +1025,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-O3-gSJ"> - <rect key="frame" x="77.5" y="187.5" width="100" height="100"/> + <rect key="frame" x="77.5" y="177.5" width="100" height="100"/> <constraints> <constraint firstAttribute="width" constant="100" id="HNG-1d-auy"/> <constraint firstAttribute="height" constant="100" id="fFt-WV-T6O"/> @@ -1041,7 +1041,7 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lrx-9r-gJZ"> - <rect key="frame" x="0.0" y="287" width="375" height="88"/> + <rect key="frame" x="0.0" y="287" width="375" height="68"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Un0-bC-uwU"> <rect key="frame" x="325" y="0.0" width="50" height="50"/> @@ -1059,7 +1059,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cRL-ov-Bad"> - <rect key="frame" x="110.5" y="-33" width="154" height="154"/> + <rect key="frame" x="110.5" y="-43" width="154" height="154"/> <constraints> <constraint firstAttribute="width" constant="154" id="2qV-nc-X2D"/> <constraint firstAttribute="height" constant="154" id="CCV-cO-2RB"/> @@ -1069,7 +1069,7 @@ <state key="highlighted" image="ptz_bg"/> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="46J-XC-G3M"> - <rect key="frame" x="162.5" y="-33" width="50" height="50"/> + <rect key="frame" x="162.5" y="-43" width="50" height="50"/> <constraints> <constraint firstAttribute="width" constant="50" id="bG6-29-hdH"/> <constraint firstAttribute="height" constant="50" id="sI2-gA-aFQ"/> @@ -1080,7 +1080,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YpD-H2-J3L"> - <rect key="frame" x="162.5" y="71" width="50" height="50"/> + <rect key="frame" x="162.5" y="61" width="50" height="50"/> <constraints> <constraint firstAttribute="width" constant="50" id="8xd-ja-amB"/> <constraint firstAttribute="height" constant="50" id="fYS-8a-jfb"/> @@ -1091,7 +1091,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WlW-FZ-jz8"> - <rect key="frame" x="214.5" y="18" width="50" height="50"/> + <rect key="frame" x="214.5" y="8" width="50" height="50"/> <constraints> <constraint firstAttribute="width" constant="50" id="JyV-sT-9Nd"/> <constraint firstAttribute="height" constant="50" id="bVy-Jx-0Yf"/> @@ -1102,7 +1102,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g5e-Uk-Wgs"> - <rect key="frame" x="110.5" y="19" width="50" height="50"/> + <rect key="frame" x="110.5" y="9" width="50" height="50"/> <constraints> <constraint firstAttribute="width" constant="50" id="ZN7-OU-GCA"/> <constraint firstAttribute="height" constant="50" id="et2-oA-SKp"/> @@ -1130,7 +1130,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IqL-eW-ddl"> - <rect key="frame" x="0.0" y="287" width="375" height="88"/> + <rect key="frame" x="0.0" y="287" width="375" height="68"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j3z-1C-gSQ"> <rect key="frame" x="325" y="0.0" width="50" height="50"/> @@ -1148,7 +1148,7 @@ </connections> </button> <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="preview_talkback" highlightedImage="spkImg" translatesAutoresizingMaskIntoConstraints="NO" id="SdD-om-sXP"> - <rect key="frame" x="137.5" y="-6" width="100" height="100"/> + <rect key="frame" x="137.5" y="-16" width="100" height="100"/> <gestureRecognizers/> <constraints> <constraint firstAttribute="height" constant="100" id="5Av-B7-ISV"/> @@ -1168,7 +1168,7 @@ </constraints> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQS-rQ-Xez"> - <rect key="frame" x="197.5" y="187.5" width="100" height="100"/> + <rect key="frame" x="197.5" y="177.5" width="100" height="100"/> <constraints> <constraint firstAttribute="width" constant="100" id="Gjc-CC-41w"/> <constraint firstAttribute="height" constant="100" id="Kpb-pS-Xes"/> @@ -1250,7 +1250,7 @@ </constraints> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nkn-oC-NfP"> - <rect key="frame" x="0.0" y="44" width="40" height="40"/> + <rect key="frame" x="0.0" y="64" width="40" height="40"/> <constraints> <constraint firstAttribute="height" constant="40" id="WQV-Fb-Hpn"/> <constraint firstAttribute="width" constant="40" id="rqc-sI-jaX"/> @@ -1262,7 +1262,7 @@ </connections> </button> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yYv-tJ-QCV"> - <rect key="frame" x="160.5" y="122.5" width="54" height="54"/> + <rect key="frame" x="160.5" y="142.5" width="54" height="54"/> <constraints> <constraint firstAttribute="width" constant="54" id="TXE-KQ-iJl"/> <constraint firstAttribute="height" constant="54" id="nqy-4G-kEq"/> @@ -1275,7 +1275,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YwB-6z-DKL"> - <rect key="frame" x="0.0" y="134.5" width="375" height="30"/> + <rect key="frame" x="0.0" y="154.5" width="375" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="eMk-ij-ZRD"/> </constraints> @@ -1284,7 +1284,7 @@ <nil key="highlightedColor"/> </label> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3XK-Ur-ZIj"> - <rect key="frame" x="16" y="139" width="0.0" height="0.0"/> + <rect key="frame" x="16" y="159" width="0.0" height="0.0"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> @@ -1295,11 +1295,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="7Gq-77-ypg" firstAttribute="top" secondItem="1FE-Su-4U4" secondAttribute="bottom" priority="751" id="4Dh-L5-Wxp"/> + <constraint firstItem="7Gq-77-ypg" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" priority="751" constant="37" id="4Dh-L5-Wxp"/> <constraint firstItem="YwB-6z-DKL" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="58C-Bi-adb"/> <constraint firstItem="dTs-1h-o4p" firstAttribute="centerX" secondItem="PYB-vu-Xcw" secondAttribute="centerX" id="7Nq-GR-ypc"/> - <constraint firstAttribute="trailing" secondItem="1FE-Su-4U4" secondAttribute="trailing" id="9po-jh-PJt"/> - <constraint firstItem="1FE-Su-4U4" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" id="Aeo-vo-x5Y"/> + <constraint firstItem="NRj-hs-uOI" firstAttribute="trailing" secondItem="1FE-Su-4U4" secondAttribute="trailing" id="9po-jh-PJt"/> <constraint firstAttribute="trailing" secondItem="NRj-hs-uOI" secondAttribute="trailing" id="G3Q-MC-BpN"/> <constraint firstItem="2bL-GF-xWw" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="JNG-uc-9XA"/> <constraint firstItem="NRj-hs-uOI" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="PXn-FW-8dk"/> @@ -1309,6 +1308,7 @@ <constraint firstItem="nkn-oC-NfP" firstAttribute="top" secondItem="heE-pR-PSR" secondAttribute="bottom" id="Tn0-Se-wHE"/> <constraint firstItem="nkn-oC-NfP" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="YSp-TA-bZd"/> <constraint firstItem="yYv-tJ-QCV" firstAttribute="centerX" secondItem="YwB-6z-DKL" secondAttribute="centerX" id="Yt6-5R-nAw"/> + <constraint firstItem="1FE-Su-4U4" firstAttribute="top" secondItem="NRj-hs-uOI" secondAttribute="bottom" id="aO9-KQ-MPh"/> <constraint firstItem="2bL-GF-xWw" firstAttribute="leading" secondItem="PYB-vu-Xcw" secondAttribute="leading" id="adY-eM-6Nb"/> <constraint firstItem="NRj-hs-uOI" firstAttribute="centerY" secondItem="YwB-6z-DKL" secondAttribute="centerY" id="cjf-nt-XqE"/> <constraint firstItem="3qm-Zv-a7S" firstAttribute="top" secondItem="gFl-PI-CLn" secondAttribute="bottom" id="fSZ-Xw-PGz"/> @@ -1358,6 +1358,7 @@ <outlet property="qualityButton" destination="JEB-Q6-XNh" id="z41-pC-jcF"/> <outlet property="qualityView" destination="dTs-1h-o4p" id="cwe-H0-P0z"/> <outlet property="scrollView" destination="NRj-hs-uOI" id="eoY-a5-7Nt"/> + <outlet property="scrollViewWHRatio" destination="FHe-T4-BRJ" id="VDa-Ms-cmg"/> <outlet property="speakImageView" destination="SdD-om-sXP" id="vut-X7-g34"/> <outlet property="streamPlayBtn" destination="X2B-Km-Emd" id="wjk-zR-FDC"/> <outlet property="streamTypeLabel" destination="5WH-Ih-9Yw" id="azv-2u-5FX"/> @@ -1392,7 +1393,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kQU-Pc-qqv"> - <rect key="frame" x="0.0" y="44" width="375" height="211"/> + <rect key="frame" x="0.0" y="64" width="375" height="211"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <gestureRecognizers/> <constraints> @@ -1403,7 +1404,7 @@ </connections> </view> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SJH-Sa-TMv"> - <rect key="frame" x="0.0" y="44" width="375" height="40"/> + <rect key="frame" x="0.0" y="64" width="375" height="40"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="40" id="o94-Gh-tdc"/> @@ -1413,7 +1414,7 @@ <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3j6-e7-ztE"> - <rect key="frame" x="0.0" y="255" width="375" height="44"/> + <rect key="frame" x="0.0" y="275" width="375" height="44"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bu9-Qz-3Ij"> <rect key="frame" x="187.5" y="0.0" width="187.5" height="44"/> @@ -1472,7 +1473,7 @@ </constraints> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hY1-Ac-Oot"> - <rect key="frame" x="0.0" y="44" width="40" height="40"/> + <rect key="frame" x="0.0" y="64" width="40" height="40"/> <constraints> <constraint firstAttribute="height" constant="40" id="AFV-2p-wo1"/> <constraint firstAttribute="width" constant="40" id="h15-cw-wZH"/> @@ -1483,7 +1484,7 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="buq-PS-h5p"> - <rect key="frame" x="0.0" y="195" width="375" height="60"/> + <rect key="frame" x="0.0" y="215" width="375" height="60"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z3E-1u-wEn"> <rect key="frame" x="0.0" y="23" width="60" height="37"/> @@ -1595,7 +1596,7 @@ </constraints> </view> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="jim-qG-8NV"> - <rect key="frame" x="0.0" y="299" width="375" height="368"/> + <rect key="frame" x="0.0" y="319" width="375" height="348"/> <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="rBI-Vc-Dgo"> <size key="itemSize" width="106" height="80"/> @@ -1662,14 +1663,14 @@ </connections> </collectionView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="no_video" translatesAutoresizingMaskIntoConstraints="NO" id="KsP-XU-bB0"> - <rect key="frame" x="140.5" y="361" width="94" height="94"/> + <rect key="frame" x="140.5" y="381" width="94" height="94"/> <constraints> <constraint firstAttribute="height" constant="94" id="aF8-gn-fXB"/> <constraint firstAttribute="width" constant="94" id="kaI-f1-60h"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绌虹┖濡備篃" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pg3-8C-ucI"> - <rect key="frame" x="137.5" y="465" width="100" height="20"/> + <rect key="frame" x="137.5" y="485" width="100" height="20"/> <constraints> <constraint firstAttribute="width" constant="100" id="lIY-Ce-8Ca"/> <constraint firstAttribute="height" constant="20" id="zIg-E3-en7"/> @@ -1679,7 +1680,7 @@ <nil key="highlightedColor"/> </label> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihF-af-cva"> - <rect key="frame" x="338.5" y="54" width="26.5" height="12"/> + <rect key="frame" x="338.5" y="74" width="26.5" height="12"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <color key="textColor" systemColor="systemRedColor"/> <nil key="highlightedColor"/> @@ -1809,7 +1810,7 @@ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MessageCell" rowHeight="75" id="St6-kz-bZE" customClass="MessageListCell"> - <rect key="frame" x="0.0" y="44.5" width="375" height="75"/> + <rect key="frame" x="0.0" y="50" width="375" height="75"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="St6-kz-bZE" id="gqt-AI-8vk"> <rect key="frame" x="0.0" y="0.0" width="375" height="75"/> @@ -1927,7 +1928,7 @@ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZSettingCell" id="Mk7-Ag-WW0"> - <rect key="frame" x="0.0" y="49.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="55.5" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mk7-Ag-WW0" id="Pt3-DC-cCE"> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> @@ -2024,7 +2025,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="璇疯緭鍏ヨ澶囧悕绉�" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="r1W-d8-Rg7"> - <rect key="frame" x="0.0" y="94" width="375" height="40"/> + <rect key="frame" x="0.0" y="114" width="375" height="40"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="40" id="NLX-OK-XZ7"/> @@ -2034,7 +2035,7 @@ <textInputTraits key="textInputTraits"/> </textField> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xdQ-Ec-12V"> - <rect key="frame" x="45" y="194" width="285" height="39"/> + <rect key="frame" x="45" y="214" width="285" height="39"/> <constraints> <constraint firstAttribute="width" constant="285" id="F6x-VP-pj1"/> <constraint firstAttribute="height" constant="39" id="eMs-1w-UTL"/> @@ -2046,7 +2047,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="涓嶈秴杩�50涓瓧绗�" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xj6-wT-AiB"> - <rect key="frame" x="9" y="145" width="216" height="21"/> + <rect key="frame" x="9" y="165" width="216" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="H5l-ew-D4h"/> </constraints> @@ -2188,7 +2189,7 @@ <rect key="frame" x="0.0" y="32" width="375" height="635"/> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sid-Ff-mRw"> - <rect key="frame" x="0.0" y="44" width="375" height="211"/> + <rect key="frame" x="0.0" y="64" width="375" height="211"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <gestureRecognizers/> <constraints> @@ -2199,7 +2200,7 @@ </connections> </view> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IqR-oy-XmU"> - <rect key="frame" x="147.5" y="54" width="80" height="24"/> + <rect key="frame" x="147.5" y="74" width="80" height="24"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="80" id="57P-5k-0tb"/> @@ -2210,7 +2211,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XID-G7-Q1F"> - <rect key="frame" x="0.0" y="44" width="40" height="40"/> + <rect key="frame" x="0.0" y="64" width="40" height="40"/> <constraints> <constraint firstAttribute="width" constant="40" id="AOT-6h-sls"/> <constraint firstAttribute="height" constant="40" id="JO7-Hb-1i7"/> @@ -2222,7 +2223,7 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b60-F5-UgT"> - <rect key="frame" x="0.0" y="195" width="375" height="60"/> + <rect key="frame" x="0.0" y="215" width="375" height="60"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a6a-IS-kTU"> <rect key="frame" x="0.0" y="23" width="60" height="37"/> @@ -2311,7 +2312,7 @@ </constraints> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="es2-2O-C6T"> - <rect key="frame" x="197.5" y="355" width="100" height="100"/> + <rect key="frame" x="197.5" y="375" width="100" height="100"/> <constraints> <constraint firstAttribute="height" constant="100" id="ggm-qd-KNb"/> <constraint firstAttribute="width" constant="100" id="sET-Nc-aei"/> @@ -2329,7 +2330,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uxM-3S-gu1"> - <rect key="frame" x="77.5" y="355" width="100" height="100"/> + <rect key="frame" x="77.5" y="375" width="100" height="100"/> <constraints> <constraint firstAttribute="width" constant="100" id="76E-yD-MgD"/> <constraint firstAttribute="height" constant="100" id="YTu-Ca-QiC"/> @@ -2408,7 +2409,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ol-dw-GX9"> - <rect key="frame" x="45" y="260" width="285" height="39"/> + <rect key="frame" x="45" y="280" width="285" height="39"/> <constraints> <constraint firstAttribute="width" constant="285" id="ZIE-YP-8dt"/> <constraint firstAttribute="height" constant="39" id="t3Q-fl-sHA"/> @@ -2420,7 +2421,7 @@ </connections> </button> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ex5-eL-x0h"> - <rect key="frame" x="0.0" y="80" width="375" height="150"/> + <rect key="frame" x="0.0" y="100" width="375" height="150"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="150" id="azy-6S-UKf"/> @@ -2429,10 +2430,10 @@ <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> </textView> <progressView hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jcN-yM-fWF"> - <rect key="frame" x="20" y="313" width="335" height="4"/> + <rect key="frame" x="20" y="333" width="335" height="4"/> </progressView> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姝e湪鏇存柊..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ckd-hd-wtP"> - <rect key="frame" x="20" y="269" width="335" height="21"/> + <rect key="frame" x="20" y="289" width="335" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="hMV-z6-oh2"/> </constraints> diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a b/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a index 9d85218..9ddb4dd 100644 --- a/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a +++ b/EZDemo/HDLEZDemo/HDLEZDemo/libEZSDK.a Binary files differ diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/AddDevice.strings b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/AddDevice.strings new file mode 100644 index 0000000..9d18b31 --- /dev/null +++ b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/AddDevice.strings @@ -0,0 +1,74 @@ + +/* Class = "UILabel"; text = "姝e湪鏌ヨ璁惧淇℃伅锛岃绋嶅悗..."; ObjectID = "5rP-JO-eZs"; */ +"5rP-JO-eZs.text" = "姝e湪鏌ヨ璁惧淇℃伅锛岃绋嶅悗..."; + +/* Class = "UILabel"; text = "灏氭湭杩炴帴缃戠粶"; ObjectID = "8qO-si-Tda"; */ +"8qO-si-Tda.text" = "灏氭湭杩炴帴缃戠粶"; + +/* Class = "UILabel"; text = "瀵嗙爜"; ObjectID = "KAV-Sk-wEc"; */ +"KAV-Sk-wEc.text" = "瀵嗙爜"; + +/* Class = "UIButton"; normalTitle = "娣诲姞"; ObjectID = "Qbm-8l-KeG"; */ +"Qbm-8l-KeG.normalTitle" = "娣诲姞"; + +/* Class = "UILabel"; text = "濡傛灉浣犱娇鐢ㄧ殑鏄弻棰戣矾鐢卞櫒锛岃涓嶈璁╂憚鍍忔満杩炴帴5G棰戞鐨刉i-Fi"; ObjectID = "R5v-Qf-L5p"; */ +"R5v-Qf-L5p.text" = "濡傛灉浣犱娇鐢ㄧ殑鏄弻棰戣矾鐢卞櫒锛岃涓嶈璁╂憚鍍忔満杩炴帴5G棰戞鐨刉i-Fi"; + +/* Class = "UITextField"; placeholder = "璁惧鏈鸿韩涓婄殑9浣嶅簭鍒楀彿"; ObjectID = "bPa-tw-WRa"; */ +"bPa-tw-WRa.placeholder" = "璁惧鏈鸿韩涓婄殑9浣嶅簭鍒楀彿"; + +/* Class = "UIButton"; normalTitle = "涓嬩竴姝�"; ObjectID = "hA9-0Y-3Qf"; */ +"hA9-0Y-3Qf.normalTitle" = "涓嬩竴姝�"; + +/* Class = "UILabel"; text = "璁惧浜岀淮鐮�"; ObjectID = "jzO-DN-MQp"; */ +"jzO-DN-MQp.text" = "璁惧浜岀淮鐮�"; + +/* Class = "UIButton"; normalTitle = "涓嬩竴姝�"; ObjectID = "x6F-l5-dhJ"; */ +"x6F-l5-dhJ.normalTitle" = "涓嬩竴姝�"; + +/* Class = "UILabel"; text = "缃戠粶"; ObjectID = "xrj-ZU-1Ue"; */ +"xrj-ZU-1Ue.text" = "缃戠粶"; + + +/* Class = "UILabel"; text = "寰呰繛鎺ョ殑璁惧Wi-Fi淇℃伅濡備笅锛�"; ObjectID = "0PQ-gp-JOK"; */ +"0PQ-gp-JOK.text" = "寰呰繛鎺ョ殑璁惧Wi-Fi淇℃伅濡備笅锛�"; + +/* Class = "UILabel"; text = "1"; ObjectID = "2fV-EH-7VO"; */ +"2fV-EH-7VO.text" = "1"; + +/* Class = "UILabel"; text = "瀵嗙爜锛�"; ObjectID = "BBf-mw-P8e"; */ +"BBf-mw-P8e.text" = "瀵嗙爜锛�"; + +/* Class = "UILabel"; text = "2"; ObjectID = "SyB-zd-gzt"; */ +"SyB-zd-gzt.text" = "2"; + +/* Class = "UILabel"; text = "鍚嶇О锛�"; ObjectID = "bzO-cY-bUs"; */ +"bzO-cY-bUs.text" = "鍚嶇О锛�"; + +/* Class = "UIButton"; normalTitle = "澶嶅埗瀵嗙爜"; ObjectID = "iaq-GW-DZt"; */ +"iaq-GW-DZt.normalTitle" = "澶嶅埗瀵嗙爜"; + +/* Class = "UIButton"; normalTitle = "杩涘叆璁剧疆鐣岄潰"; ObjectID = "hOb-L4-rkc"; */ +"hOb-L4-rkc.normalTitle" = "杩涘叆璁剧疆鐣岄潰"; + +/* Class = "UILabel"; text = "璇烽�氳繃涓嬪垪姝ラ灏嗘墜鏈鸿繛鎺ュ埌璁惧Wi-Fi锛�"; ObjectID = "hz9-ZE-6rg"; */ +"hz9-ZE-6rg.text" = "璇烽�氳繃涓嬪垪姝ラ灏嗘墜鏈鸿繛鎺ュ埌璁惧Wi-Fi锛�"; + +/* Class = "UITextField"; placeholder = "楠岃瘉鐮�"; ObjectID = "j8t-kq-eaK"; */ +"j8t-kq-eaK.placeholder" = "璁惧楠岃瘉鐮�"; + +/* Class = "UILabel"; text = "3"; ObjectID = "utk-BE-uLK"; */ +"utk-BE-uLK.text" = "3"; + +/* Class = "UIButton"; normalTitle = "閲嶈瘯"; ObjectID = "RaQ-FQ-QZ1"; */ +"RaQ-FQ-QZ1.normalTitle" = "閲嶈瘯"; + +/* Class = "UIButton"; normalTitle = "娣诲姞璁惧"; ObjectID = "b2S-tK-xqv"; */ +"b2S-tK-xqv.normalTitle" = "娣诲姞璁惧"; + +/* Class = "UILabel"; text = "娣诲姞璁惧涓紝璇风◢鍚�..."; ObjectID = "spS-wV-76P"; */ +"spS-wV-76P.text" = "娣诲姞璁惧涓紝璇风◢鍚�..."; + + +/* Class = "UIButton"; normalTitle = "瀹屾垚"; ObjectID = "mDU-NX-CXb"; */ +"mDU-NX-CXb.normalTitle" = "瀹屾垚"; diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/EZMain.strings b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/EZMain.strings new file mode 100644 index 0000000..3f48d05 --- /dev/null +++ b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/EZMain.strings @@ -0,0 +1,147 @@ + +/* Class = "UILabel"; text = "9:00"; ObjectID = "0SD-HE-m6y"; */ +"0SD-HE-m6y.text" = "9:00"; + +/* Class = "UIButton"; normalTitle = "瀵硅"; ObjectID = "4Eh-hh-84T"; */ +"4Eh-hh-84T.normalTitle" = "瀵硅"; + +/* Class = "UIButton"; normalTitle = "鏇存柊"; ObjectID = "4ol-dw-GX9"; */ +"4ol-dw-GX9.normalTitle" = "鏇存柊"; + +/* Class = "UILabel"; text = "00:00"; ObjectID = "68c-It-TWh"; */ +"68c-It-TWh.text" = "00:00"; + +/* Class = "UIBarButtonItem"; title = "鍙栨秷"; ObjectID = "6Za-cr-nzm"; */ +"6Za-cr-nzm.title" = "鍙栨秷"; + +/* Class = "UIBarButtonItem"; title = "鍒犻櫎"; ObjectID = "6yZ-4A-Vvl"; */ +"6yZ-4A-Vvl.title" = "鍒犻櫎"; + +/* Class = "UILabel"; text = "璁惧鍚�"; ObjectID = "8Y3-zX-Cnw"; */ +"8Y3-zX-Cnw.text" = "璁惧鍚�"; + +/* Class = "UIButton"; normalTitle = "鎺ュ彛璋冪敤D"; ObjectID = "9VU-hP-zCR"; */ +"9VU-hP-zCR.normalTitle" = "璺宠浆娴嬭瘯"; + +/* Class = "UILabel"; text = "123456789"; ObjectID = "9VV-np-Xv9"; */ +"9VV-np-Xv9.text" = "123456789"; + +/* Class = "UILabel"; text = "鍙戠敓浜轰綋鎰熷簲浜嬩欢"; ObjectID = "AUI-sk-GM6"; */ +"AUI-sk-GM6.text" = "鍙戠敓浜轰綋鎰熷簲浜嬩欢"; + +/* Class = "UIButton"; normalTitle = "SD鍗″綍鍍�"; ObjectID = "Bu9-Qz-3Ij"; */ +"Bu9-Qz-3Ij.normalTitle" = "SD鍗″綍鍍�"; + +/* Class = "UIButton"; normalTitle = "浜戝瓨鍌�"; ObjectID = "E3a-LC-jG1"; */ +"E3a-LC-jG1.normalTitle" = "浜戝瓨鍌�"; + +/* Class = "UITabBarItem"; title = "Item"; ObjectID = "EOh-Lf-fJU"; */ +"EOh-Lf-fJU.title" = "Item"; + +/* Class = "UILabel"; text = "00:00"; ObjectID = "ESG-x4-J8R"; */ +"ESG-x4-J8R.text" = "00:00"; + +/* Class = "UIButton"; normalTitle = "灞�鍩熺綉D"; ObjectID = "EWl-dl-v7z"; */ +"EWl-dl-v7z.normalTitle" = "灞�鍩熺綉D"; + +/* Class = "UISegmentedControl"; F62-D9-UTh.segmentTitles[0] = "鎴戠殑"; ObjectID = "F62-D9-UTh"; */ +"F62-D9-UTh.segmentTitles[0]" = "鎴戠殑"; + +/* Class = "UISegmentedControl"; F62-D9-UTh.segmentTitles[1] = "鍒嗕韩"; ObjectID = "F62-D9-UTh"; */ +"F62-D9-UTh.segmentTitles[1]" = "鍒嗕韩"; + +/* Class = "UILabel"; text = " 00:00"; ObjectID = "IqR-oy-XmU"; */ +"IqR-oy-XmU.text" = " 00:00"; + +/* Class = "UIButton"; normalTitle = "楂樻竻"; ObjectID = "JEB-Q6-XNh"; */ +"JEB-Q6-XNh.normalTitle" = "楂樻竻"; + +/* Class = "UIButton"; normalTitle = "鍔犲叆钀ょ煶寮�鏀惧钩鍙颁氦娴佺兢"; ObjectID = "Jqc-fA-IF7"; */ +"Jqc-fA-IF7.normalTitle" = "钀ょ煶鐧诲綍"; + +/* Class = "UIButton"; normalTitle = "娑堟伅褰曞儚"; ObjectID = "MZk-cJ-Fkp"; */ +"MZk-cJ-Fkp.normalTitle" = "娑堟伅褰曞儚"; + +/* Class = "UILabel"; text = "2015/11/18 19:12:22"; ObjectID = "QVM-WI-RUj"; */ +"QVM-WI-RUj.text" = "2015/11/18 19:12:22"; + +/* Class = "UILabel"; text = "鏉ヨ嚜:123456789"; ObjectID = "SpQ-pQ-wyI"; */ +"SpQ-pQ-wyI.text" = "鏉ヨ嚜:123456789"; + +/* Class = "UIBarButtonItem"; title = "娉ㄩ攢"; ObjectID = "TXG-Z3-M8g"; */ +"TXG-Z3-M8g.title" = "娉ㄩ攢"; + +/* Class = "UILabel"; text = "9:00"; ObjectID = "UHi-Q3-DiS"; */ +"UHi-Q3-DiS.text" = "9:00"; + +/* Class = "UIButton"; normalTitle = "娴佺晠"; ObjectID = "UlQ-aK-1VP"; */ +"UlQ-aK-1VP.normalTitle" = "娴佺晠"; + +/* Class = "UIButton"; normalTitle = "鍧囪 "; ObjectID = "WSh-Ao-McO"; */ +"WSh-Ao-McO.normalTitle" = "鍧囪 "; + +/* Class = "UILabel"; text = " 00:00"; ObjectID = "Yrc-c9-rvb"; */ +"Yrc-c9-rvb.text" = " 00:00"; + +/* Class = "UILabel"; text = "00:00"; ObjectID = "arc-1g-3CP"; */ +"arc-1g-3CP.text" = "00:00"; + +/* Class = "UIBarButtonItem"; title = "纭畾"; ObjectID = "cQF-0W-PL0"; */ +"cQF-0W-PL0.title" = "纭畾"; + +/* Class = "UILabel"; text = "姝e湪鏇存柊..."; ObjectID = "ckd-hd-wtP"; */ +"ckd-hd-wtP.text" = "姝e湪鏇存柊..."; + +/* Class = "UIBarButtonItem"; title = "娴嬭瘯"; ObjectID = "eaB-Su-wjk"; */ +"eaB-Su-wjk.title" = "娴嬭瘯"; + +/* Class = "UIButton"; normalTitle = "褰曞儚"; ObjectID = "es2-2O-C6T"; */ +"es2-2O-C6T.normalTitle" = "褰曞儚"; + +/* Class = "UIButton"; normalTitle = "浜戝彴"; ObjectID = "fUI-tR-jyG"; */ +"fUI-tR-jyG.normalTitle" = "浜戝彴"; + +/* Class = "UILabel"; text = "浜轰綋鎰熷簲浜嬩欢"; ObjectID = "oq1-TQ-afe"; */ +"oq1-TQ-afe.text" = "浜轰綋鎰熷簲浜嬩欢"; + +/* Class = "UIButton"; normalTitle = "浜掕仈缃慏"; ObjectID = "p2R-3f-bRm"; */ +"p2R-3f-bRm.normalTitle" = "浜掕仈缃慏"; + +/* Class = "UILabel"; text = "绌虹┖濡備篃"; ObjectID = "pg3-8C-ucI"; */ +"pg3-8C-ucI.text" = "绌虹┖濡備篃"; + +/* Class = "UITextField"; placeholder = "璇疯緭鍏ヨ澶囧悕绉�"; ObjectID = "r1W-d8-Rg7"; */ +"r1W-d8-Rg7.placeholder" = "璇疯緭鍏ヨ澶囧悕绉�"; + +/* Class = "UILabel"; text = "00:00"; ObjectID = "ruu-Hg-3Tx"; */ +"ruu-Hg-3Tx.text" = "00:00"; + +/* Class = "UIButton"; normalTitle = "楂樻竻"; ObjectID = "skK-Ar-y6h"; */ +"skK-Ar-y6h.normalTitle" = "楂樻竻"; + +/* Class = "UIBarButtonItem"; title = "鏍囪宸茶"; ObjectID = "tHi-Fa-i4d"; */ +"tHi-Fa-i4d.title" = "鏍囪宸茶"; + +/* Class = "UILabel"; text = "鏆傛棤娑堟伅"; ObjectID = "u19-7q-vxu"; */ +"u19-7q-vxu.text" = "鏆傛棤娑堟伅"; + +/* Class = "UIButton"; normalTitle = "鎴浘"; ObjectID = "uxM-3S-gu1"; */ +"uxM-3S-gu1.normalTitle" = "鎴浘"; + +/* Class = "UIButton"; normalTitle = "鎴浘"; ObjectID = "wEO-O3-gSJ"; */ +"wEO-O3-gSJ.normalTitle" = "鎴浘"; + +/* Class = "UIButton"; normalTitle = "褰曞儚"; ObjectID = "xQS-rQ-Xez"; */ +"xQS-rQ-Xez.normalTitle" = "褰曞儚"; + +/* Class = "UIButton"; normalTitle = "淇濆瓨"; ObjectID = "xdQ-Ec-12V"; */ +"xdQ-Ec-12V.normalTitle" = "淇濆瓨"; + +/* Class = "UILabel"; text = "涓嶈秴杩�50涓瓧绗�"; ObjectID = "xj6-wT-AiB"; */ +"xj6-wT-AiB.text" = "涓嶈秴杩�50涓瓧绗�"; + +/* Class = "UILabel"; text = "鏉ヨ嚜锛欳2mini"; ObjectID = "xta-Lo-bjB"; */ +"xta-Lo-bjB.text" = "鏉ヨ嚜锛欳2mini"; + +/* Class = "UILabel"; text = "C2S"; ObjectID = "yuu-Ju-MKr"; */ +"yuu-Ju-MKr.text" = "C2S"; diff --git a/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/Localizable.strings b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/Localizable.strings new file mode 100644 index 0000000..5a741a3 --- /dev/null +++ b/EZDemo/HDLEZDemo/HDLEZDemo/resources/zh-Hans.lproj/Localizable.strings @@ -0,0 +1,168 @@ +/* + Localizable.strings + EZOpenSDK + + Created by linyong on 2017/9/7. + Copyright 漏 2017骞� Ezviz. All rights reserved. +*/ + + +"done"="纭畾"; +"cancel"="鍙栨秷"; +"retry"="閲嶈瘯"; +"alert_title"="鎻愮ず"; +"delete"="鍒犻櫎"; +"complete"="瀹屾垚"; +"push_slider_msg"="浣犻渶鑷澶勭悊婊戝姩杩涘叆鐨勬帹閫佹秷鎭�"; + +"api_mirror_test"="闀滃儚缈昏浆鎺ュ彛娴嬭瘯"; +"api_getting_device_list"="姝e湪鑾峰彇鐢ㄦ埛璁惧鍒楄〃..."; +"api_get_device_list_fail"="璁惧鍒楄〃鑾峰彇澶辫触"; +"api_flip_over"="姝e湪鎿嶄綔璁惧閫氶亾鐢婚潰缈昏浆..."; +"api_flip_over_result"="鐢婚潰缈昏浆缁撴灉"; +"ad_scan_qr_title"="鎵弿浜岀淮鐮�"; +"ad_allow_camera"="璇峰湪璁惧鐨刞璁剧疆-闅愮-鐩告満`涓厑璁歌闂浉鏈恒��"; +"ad_not_support_scan"="涓嶆敮鎸佺殑浜岀淮鐮佺被鍨嬶紝杞敤鎵嬪姩杈撳叆"; +"ad_result_title"="缁撴灉"; +"ad_adding_msg"="姝e湪娣诲姞锛岃绋嶅��..."; +"ad_connect_net"="杩炴帴缃戠粶"; +"ad_add"="娣诲姞"; +"ad_restart_title"="閲嶅惎璁惧"; +"ad_restart_tip"="闀挎寜璁惧涓婄殑reset閿�10绉掑悗鏉惧紑锛屽苟绛夊緟澶х害30绉掔洿鍒拌澶囧惎鍔ㄥ畬鎴�"; +"ad_restart_done"="鎴戝凡閲嶅惎濂�"; +"ad_get_device_info_msg"="姝e湪鏌ヨ璁惧淇℃伅锛岃绋嶅悗..."; +"ad_already_added"="姝よ澶囧凡琚坊鍔�"; +"ad_added_by_others"="姝よ澶囧凡琚埆浜烘坊鍔�"; +"get_info_fail"="鏌ヨ澶辫触锛岀綉缁滀笉缁欏姏"; +"ad_input_manual"="鎵嬪姩杈撳叆"; + +"device_camera_list_title"="璁惧閫氶亾鍒楄〃"; +"device_input_vierify_code"="璇疯緭鍏ヨ澶囬獙璇佺爜"; +"device_verify_code_wrong"="楠岃瘉鐮侀敊璇�"; +"device_scan_function_tip"="iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"; +"device_upgrade_title"="璁惧鍗囩骇"; +"device_upgrade_success"="鍗囩骇鎴愬姛"; +"device_upgrading"="姝e湪鍗囩骇涓�"; +"device_modify_name_title"="淇敼璁惧鍚嶇О"; +"device_quality_high"="楂樻竻"; +"device_quality_median"="鍧囪 "; +"device_quality_low"="娴佺晠"; +"device_quality_super"="瓒呮竻"; +"device_play_fail"="鎾斁澶辫触"; +"device_input_verify_code"="璇疯緭鍏ヨ棰戝浘鐗囧姞瀵嗗瘑鐮�"; +"device_verify_code_tip"="鎮ㄧ殑瑙嗛宸插姞瀵嗭紝璇疯緭鍏ュ瘑鐮佽繘琛屾煡鐪嬶紝鍒濆瀵嗙爜涓烘満韬爣绛句笂鐨勯獙璇佺爜锛屽鏋滄病鏈夐獙璇佺爜锛岃杈撳叆ABCDEF锛堝瘑鐮佸尯鍒嗗ぇ灏忓啓)"; +"device_tip_title"="娓╅Θ鎻愮ず"; +"device_verify_code_wrong"="璁惧瀵嗙爜閿欒"; +"device_restart_talk"="姝e湪寮�鍚璁诧紝璇风◢鍊�..."; +"device_save_gallery"="宸蹭繚瀛樿嚦鎵嬫満鐩稿唽"; +"device_analogue_camera"="妯℃嫙閫氶亾"; +"device_digital_camera"="鏁板瓧閫氶亾"; +"device_lan_device_list_title"="灞�鍩熺綉璁惧鍒楄〃"; +"device_active_device"="婵�娲昏澶�"; +"device_set_pw_tip"="璇疯缃瘑鐮�,瀵嗙爜涓�8-16浣嶇殑瀛楃"; +"device_set_pw"="璁剧疆瀵嗙爜"; +"device_pw_empty"="瀵嗙爜涓嶈兘涓虹┖"; +"device_pw_length_error"="瀵嗙爜闀垮害涓嶆纭�"; +"device_active_fail"="婵�娲诲け璐�"; +"device_login_fail"="鐧诲綍澶辫触"; +"device_login_device"="鐧诲綍璁惧"; +"device_input_account_pw"="璇疯緭鍏ュ笎鍙峰拰瀵嗙爜"; +"device_account"="甯愬彿"; +"device_password"="瀵嗙爜"; +"device_account_pw_empty"="甯愬彿鎴栧瘑鐮佷笉鑳戒负绌�"; +"device_lan_preview_title"="灞�鍩熺綉棰勮"; + +"dmessage_title"="娑堟伅"; +"message_read"="鏍囪宸茶"; +"message_deleting"="姝e湪鍒犻櫎锛岃绋嶅��..."; +"message_count_limit"="鏁伴噺涓嶈兘瓒呰繃10"; +"message_setting"="姝e湪璁剧疆宸茶锛岃绋嶅��..."; +"message_sunday"="鍛ㄦ棩"; +"message_monday"="鍛ㄤ竴"; +"message_tuesday"="鍛ㄤ簩"; +"message_wednesday"="鍛ㄤ笁"; +"message_thursday"="鍛ㄥ洓"; +"message_friday"="鍛ㄤ簲"; +"message_saturday"="鍛ㄥ叚"; +"message_today"="浠婂ぉ"; +"message_from"="鏉ヨ嚜"; +"message_detail"="娑堟伅璇︽儏"; +"message_file_search_fail"="鏂囦欢鏌ヨ澶辫触"; +"message_square_test"="瑙嗛骞垮満绫诲埆鍗曞厓娴嬭瘯"; + +"setting_device_set_title"="璁惧璁剧疆"; +"setting_device_name"="璁惧鍚�"; +"setting_device_serial"="搴忓垪鍙�"; +"setting_device_version"="褰撳墠鐗堟湰"; +"setting_device_new_version"="鏈�鏂扮増鏈�"; +"setting_defense_status"="闃叉姢鐘舵�侊細"; +"setting_sleep_mode"="鐫$湢妯″紡"; +"setting_home_mode"="鍦ㄥ妯″紡"; +"setting_out_mode"="澶栧嚭妯″紡"; +"setting_ignore_code"="鍛婅涓绘満鏃犺棰戝浘鐗囧姞瀵嗗姛鑳�"; +"setting_action_detect"="娲诲姩妫�娴嬫彁閱�"; +"setting_secure_code"="瑙嗛鍥剧墖鍔犲瘑"; +"setting_cloud_storage"="浜戝瓨鍌�"; +"setting_hardware_decoding" = "纭В鐮�"; +"setting_opration_fail"="鎿嶄綔澶辫触"; +"setting_opration_success"="鎿嶄綔鎴愬姛"; +"setting_switching"="姝e湪鍒囨崲锛岃绋嶅��..."; +"setting_device_security_check"="璁惧鎿嶄綔瀹夊叏楠岃瘉"; +"setting_input_code_plz"="璇疯緭鍏ヨ璁惧鐨勮澶囬獙璇佺爜锛堣澶囨爣绛句笂鐨�6浣嶅瓧姣嶏級"; +"wifi_add_device_title"="绗笁姝ワ紝娣诲姞璁惧"; +"wifi_connecting_net"="钀ゅ皬鐭虫鍦ㄥ姫鍔涜繛鎺i-Fi缃戠粶"; +"wifi_register_server"="娉ㄥ唽骞冲彴鏈嶅姟鍣�"; +"wifi_bind_account"="缁戝畾浣犵殑璐﹀彿"; +"wifi_already_configed"="宸查厤缃ソWi-Fi缃戠粶"; +"wifi_registering_server"="蹇簡蹇簡,姝e湪娉ㄥ唽骞冲彴鏈嶅姟鍣�"; +"wifi_bind_account_result"="缁戝埌浣犵殑璐﹀彿涓嬪氨澶у姛鍛婃垚浜嗗摝"; +"wifi_already_registered_server"="宸叉敞鍐屽埌钀ょ煶骞冲彴"; +"wifi_config_fail"="閰嶇疆Wi-Fi澶辫触锛岃閲嶈瘯鎴栬繑鍥炴鏌i-Fi瀵嗙爜鏄惁杈撳叆姝g‘"; +"wifi_register_fail"="Wi-Fi閰嶇疆鎴愬姛,娉ㄥ唽骞冲彴澶辫触,璇锋鏌ヨ澶囩綉缁滃悗閲嶈瘯"; +"wifi_bind_fail"="Wi-Fi閰嶇疆鎴愬姛,缁戝畾璐﹀彿澶辫触,璇烽噸璇�"; +"wifi_add_fail"="娣诲姞澶辫触"; +"wifi_add_success"="娣诲姞鎴愬姛"; +"wifi_connecting_net"="姝e湪杩炴帴Wi-Fi缃戠粶"; +"wifi_connect_wifi_title"="绗簩姝ワ紝杩炴帴WiFi"; +"wifi_prepare_title"="绗竴姝ワ紝鍑嗗濂借澶�"; +"wifi_device_power_tip"="璇峰皢璁惧鎻掍笂鐢靛悗绛夊緟澶х害30绉掞紝鐩村埌璁惧鍚姩瀹屾垚"; +"wifi_device_start_ready"="璁惧宸插惎鍔ㄥソ锛屼笖鏄涓�娆¢厤缃綉缁�"; +"wifi_config_wifi_ago"="杩欏彴璁惧浠ュ墠閰嶈繃缃戠粶"; + +"ui_last_update"="鏈�鍚庢洿鏂帮細"; +"ui_last_update_empty"="鏈�鍚庢洿鏂帮細鏃犺褰�"; +"ui_just_now"="鍒氬垰"; +"ui_min_ago"="鍒嗛挓鍓�"; +"ui_hour_ago"="灏忔椂鍓�"; +"ui_day_ago"="澶╁墠"; +"ui_month_ago"="鏈堝墠"; +"ui_year_ago"="骞村墠"; + +//鏂板 +"device_mine"="鎴戠殑"; +"device_shared"="鍒嗕韩"; + +//4.8.3鏂板 +"no_mic_permission" = "鏈紑鍚害鍏嬮鏉冮檺"; +"not_support_talk" = "璁惧涓嶆敮鎸佸璁�"; + +//ap閰嶇綉鏂板 +"wifi_info_no_wifi_msg" = "鏈繛鎺i-Fi,璇疯缃悎閫傜殑Wi-Fi"; +"wifi_info_setting" = "璁剧疆"; +"wifi_mode_select_msg" = "璇烽�夋嫨閰嶇綉妯″紡"; +"wifi_mode_ap" = "鐑偣閰嶇綉(钃濈伅闂儊)"; +"wifi_mode_normal" = "涓�鑸厤缃�(绾㈣摑闂儊)"; +"wifi_mode_wifi_connect" = "杩炴帴鍒拌澶嘩i-Fi"; +"wifi_step_two_msg" = "杩涘叆鎵嬫満绯荤粺Wi-Fi璁剧疆鐣岄潰锛岄�夋嫨鍚嶇О涓�%@鐨勭綉缁滐紝鐢ㄦ彁绀虹殑瀵嗙爜杩涜杩炴帴"; +"wifi_ap_add_device_title"="娣诲姞璁惧"; +"wifi_mode_sound" = "澹版尝閰嶇綉(绾㈣摑闂儊)"; +"wifi_mode_line" = "鏈夌嚎杩炴帴"; + +"璇峰紑鍚畾浣嶆湇鍔�"="璇峰紑鍚畾浣嶆湇鍔�"; +"瀹氫綅鏈嶅姟鏈紑鍚紝璇疯繘鍏ョ郴缁燂蓟璁剧疆锛�> [闅愮] > [瀹氫綅鏈嶅姟]涓墦寮�寮�鍏筹紝骞跺厑璁镐娇鐢ㄥ畾浣嶆湇鍔�"="瀹氫綅鏈嶅姟鏈紑鍚紝璇疯繘鍏ョ郴缁燂蓟璁剧疆锛�> [闅愮] > [瀹氫綅鏈嶅姟]涓墦寮�寮�鍏筹紝骞跺厑璁镐娇鐢ㄥ畾浣嶆湇鍔�"; +"绔嬪嵆寮�鍚�"="绔嬪嵆寮�鍚�"; +"鏆備笉"="鏆備笉"; + +//2021-01-27 鏂板 +"Devicelist"="璁惧鍒楄〃"; +"Logout"="娉ㄩ攢"; diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m index 7835c22..fdd73f4 100644 --- a/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m +++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZLivePlayViewController.m @@ -32,6 +32,7 @@ { NSOperation *op; BOOL _isPressed; + BOOL _landscape; // 鏄惁鏃嬭浆 } @property (nonatomic) BOOL isOpenSound; @@ -89,7 +90,7 @@ @property (weak, nonatomic) IBOutlet UILabel *streamTypeLabel; @property (weak, nonatomic) IBOutlet UIScrollView *scrollView; @property (weak, nonatomic) IBOutlet UILabel *zoomSizeLabel; - +@property (weak, nonatomic) IBOutlet NSLayoutConstraint *scrollViewWHRatio; // 婊氬姩瑙嗗浘瀹介珮姣� @property (nonatomic, strong) HDLEZButton *unlockButton;//寮�閿佹寜閽� @property (nonatomic, copy) NSString *streamToken; @@ -528,9 +529,22 @@ } } -- (UIInterfaceOrientationMask)supportedInterfaceOrientations -{ - return UIInterfaceOrientationMaskAllButUpsideDown; +//- (UIInterfaceOrientationMask)supportedInterfaceOrientations +//{ +// return UIInterfaceOrientationMaskAllButUpsideDown; +//} +- (UIInterfaceOrientationMask)supportedInterfaceOrientations { + if (@available(iOS 16.0, *)) { + if (_landscape) { + //妯睆 + return UIInterfaceOrientationMaskLandscape; + } else { + //绔栧睆 + return UIInterfaceOrientationMaskPortrait; + } + } else { + return UIInterfaceOrientationMaskAllButUpsideDown; + } } - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation @@ -542,6 +556,17 @@ self.bottomView.hidden = NO; self.largeTitleLabel.hidden = YES; self.localRecrodContraint.constant = 10; + + [self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; + [self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO]; + [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio]]; + self.scrollViewWHRatio = [NSLayoutConstraint constraintWithItem:self.scrollView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.scrollView attribute:NSLayoutAttributeHeight multiplier:16/9. constant:0]; + [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio]]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self.scrollView layoutIfNeeded]; + [self.toolBar layoutIfNeeded]; + }); + if(toInterfaceOrientation == UIInterfaceOrientationLandscapeLeft || toInterfaceOrientation == UIInterfaceOrientationLandscapeRight) { @@ -551,6 +576,20 @@ self.largeTitleLabel.hidden = NO; self.largeBackButton.hidden = NO; self.bottomView.hidden = YES; + + 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; + + + [self.scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; + [self.toolBar setTranslatesAutoresizingMaskIntoConstraints:NO]; + [NSLayoutConstraint deactivateConstraints:@[self.scrollViewWHRatio]]; + self.scrollViewWHRatio = [NSLayoutConstraint constraintWithItem:self.scrollView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.scrollView attribute:NSLayoutAttributeHeight multiplier:tureScreenH/tureScreenW constant:0]; + [NSLayoutConstraint activateConstraints:@[self.scrollViewWHRatio]]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self.scrollView layoutIfNeeded]; + [self.toolBar layoutIfNeeded]; + }); } } @@ -819,14 +858,56 @@ - (IBAction)large:(id)sender { - NSNumber *value = [NSNumber numberWithInt:UIInterfaceOrientationLandscapeLeft]; - [[UIDevice currentDevice] setValue:value forKey:@"orientation"]; + NSLog(@"######杩涘叆妯睆锛�"); + if (@available(iOS 16.0, *)) { + _landscape = YES; + if (self.navigationController) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self.navigationController setNeedsUpdateOfSupportedInterfaceOrientations]; + }); + } else { + dispatch_async(dispatch_get_main_queue(), ^{ + [self setNeedsUpdateOfSupportedInterfaceOrientations]; + }); + } + NSArray *array = [[[UIApplication sharedApplication] connectedScenes] allObjects]; + UIWindowScene *ws = (UIWindowScene *)array.firstObject; + UIWindowSceneGeometryPreferencesIOS *geometryPreferences = [[UIWindowSceneGeometryPreferencesIOS alloc] init]; + geometryPreferences.interfaceOrientations = UIInterfaceOrientationMaskLandscape; + [ws requestGeometryUpdateWithPreferences:geometryPreferences errorHandler:^(NSError * _Nonnull error) { + NSLog(@"iOS 16 Error: %@",error); + }]; + } else { + NSNumber *value = [NSNumber numberWithInt:UIInterfaceOrientationLandscapeLeft]; + [[UIDevice currentDevice] setValue:value forKey:@"orientation"]; + } } - (IBAction)largeBack:(id)sender { - NSNumber *value = [NSNumber numberWithInt:UIInterfaceOrientationPortrait]; - [[UIDevice currentDevice] setValue:value forKey:@"orientation"]; + NSLog(@"######鏀跺洖妯睆锛�"); + if (@available(iOS 16.0, *)) { + _landscape = NO; + if (self.navigationController) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self.navigationController setNeedsUpdateOfSupportedInterfaceOrientations]; + }); + } else { + dispatch_async(dispatch_get_main_queue(), ^{ + [self setNeedsUpdateOfSupportedInterfaceOrientations]; + }); + } + NSArray *array = [[[UIApplication sharedApplication] connectedScenes] allObjects]; + UIWindowScene *ws = (UIWindowScene *)array.firstObject; + UIWindowSceneGeometryPreferencesIOS *geometryPreferences = [[UIWindowSceneGeometryPreferencesIOS alloc] init]; + geometryPreferences.interfaceOrientations = UIInterfaceOrientationMaskPortrait; + [ws requestGeometryUpdateWithPreferences:geometryPreferences errorHandler:^(NSError * _Nonnull error) { + NSLog(@"iOS 16 Error: %@",error); + }]; + } else { + NSNumber *value = [NSNumber numberWithInt:UIInterfaceOrientationPortrait]; + [[UIDevice currentDevice] setValue:value forKey:@"orientation"]; + } } - (IBAction)capture:(id)sender -- Gitblit v1.8.0