From 5d358b10622504ad02b042f9b1fdc74bb25d465e Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期二, 28 三月 2023 11:05:26 +0800 Subject: [PATCH] 1.更新HDLFVSDK 2.更新EZSDK.IOS --- HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 22 +++ HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib | 20 +- HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 58 ++++---- HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 5 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 87 +++++++----- HDL-ON_iOS/HDL-ON_iOS.csproj | 34 ++-- HDL_ON/Common/ApiUtlis.cs | 13 + DLL/IOS/EZSDK.IOS.dll | 0 DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0 HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 9 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 3 HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings | 3 HDL_ON/DAL/Server/NewAPI.cs | 5 HDL-ON_iOS/Resources/en.lproj/Localizable.strings | 43 ++++++ HDL_ON/Common/HDLCommon.cs | 4 HDL_ON/Entity/Room.cs | 3 HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard | 22 +- HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 23 ++- HDL_ON/DAL/Server/HttpServerRequest.cs | 20 ++ HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 14 +- HDL-ON_iOS/BlueWifi.cs | 3 21 files changed, 260 insertions(+), 131 deletions(-) diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll index 5d1bcdc..b153b0d 100644 --- a/DLL/IOS/EZSDK.IOS.dll +++ b/DLL/IOS/EZSDK.IOS.dll Binary files differ diff --git a/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/DLL/IOS/Shared.IOS.HDLFVSDK.dll index 885c7d7..1f38208 100644 --- a/DLL/IOS/Shared.IOS.HDLFVSDK.dll +++ b/DLL/IOS/Shared.IOS.HDLFVSDK.dll Binary files differ diff --git a/HDL-ON_iOS/BlueWifi.cs b/HDL-ON_iOS/BlueWifi.cs index aad7a0c..e0217f9 100644 --- a/HDL-ON_iOS/BlueWifi.cs +++ b/HDL-ON_iOS/BlueWifi.cs @@ -30,13 +30,14 @@ //public string GetPer() //{ //share. - //} + //}1 /// <summary> /// 鎼滅储鍒拌摑鐗欒澶囦箣鍚庡埌浠g悊浜嬩欢 /// </summary> FBYBleDeviceBackBlock getBlufiDeviceDelegate; + /// <summary> /// 璁惧鎼滅储鍒拌摑鐗欒澶囦箣鍚庡埌浠g悊浜嬩欢 /// </summary> diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 5e5a37e..ef8ad4d 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -26,7 +26,7 @@ <MtouchLink>Full</MtouchLink> <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> - <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> + <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <CodesignProvision>On+Dev-20210616-1</CodesignProvision> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> @@ -93,29 +93,29 @@ <Reference Include="Shared.IOS.HDLSceneSiri"> <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath> </Reference> - <Reference Include="Shared.IOS.HDLLinphoneSDK"> - <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> - </Reference> <Reference Include="HDL.Shared.IOS.ScanQRCode"> <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath> </Reference> <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> </Reference> - <Reference Include="Shared.IOS.HDLFVSDK"> - <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> + <Reference Include="Shared.IOS.HDLLinphoneSDK"> + <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> - <Reference Include="Shared.IOS.ESVideoOnSDK"> - <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> - </Reference> - <Reference Include="EZSDK.IOS"> - <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> + <Reference Include="Shared.IOS.LCVideoOnSDK"> + <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLCNVRSDK"> <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath> </Reference> - <Reference Include="Shared.IOS.LCVideoOnSDK"> - <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> + <Reference Include="Shared.IOS.ESVideoOnSDK"> + <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> + </Reference> + <Reference Include="Shared.IOS.HDLFVSDK"> + <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> + </Reference> + <Reference Include="EZSDK.IOS"> + <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -1595,10 +1595,6 @@ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> - <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> - <Name>Blufi</Name> - </ProjectReference> <ProjectReference Include="..\SiriIntents\SiriIntents.csproj"> <IsAppExtension>true</IsAppExtension> <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project> @@ -1613,6 +1609,10 @@ <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project> <Name>SiriKit</Name> </ProjectReference> + <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> + <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> + <Name>Blufi</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Content Include="Base.lproj\Intents.intentdefinition" /> diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard index f5af9fc..d802080 100644 --- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard +++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -984,8 +985,8 @@ </scenes> <inferredMetricsTieBreakers> <segue reference="9TP-S2-hhI"/> - <segue reference="9Lc-Kx-oZS"/> - <segue reference="ikM-Zn-H8f"/> + <segue reference="Lmt-j9-vhw"/> + <segue reference="VYk-37-nb6"/> </inferredMetricsTieBreakers> <resources> <image name="addDevice_success" width="320" height="185"/> diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard index 0db5c3a..63dec62 100644 --- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard +++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" 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="20037" 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="17505"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -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="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="44.5" 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"/> @@ -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="28" width="375" height="73"/> + <rect key="frame" x="0.0" y="44.5" 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"/> @@ -356,7 +356,7 @@ </tableView> <navigationItem key="navigationItem" id="QiI-QE-qqY"> <rightBarButtonItems> - <barButtonItem systemItem="add" id="yGh-cj-oPZ"> + <barButtonItem id="yGh-cj-oPZ"> <connections> <action selector="go2AddDevice:" destination="PUV-T9-WXJ" id="D58-zZ-Ox4"/> </connections> @@ -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="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="44.5" 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"/> @@ -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="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="44.5" 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="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="44.5" 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"/> @@ -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="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="44.5" 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"/> @@ -1809,7 +1809,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="28" width="375" height="75"/> + <rect key="frame" x="0.0" y="44.5" 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 +1927,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="55.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="49.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"/> diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib index 3d57751..904768e 100644 --- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib +++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina5_9" orientation="portrait" appearance="light"/> <dependencies> <deployment version="2304" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> + <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -26,7 +27,7 @@ <rect key="frame" x="195" y="64" width="160" height="160"/> <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </view> - <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ko-k4-F0N"> + <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ko-k4-F0N"> <rect key="frame" x="20" y="302" width="85" height="30"/> <color key="backgroundColor" red="0.80782043147208116" green="0.80782043147208116" blue="0.80782043147208116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="鍒涘缓鎴块棿"> @@ -42,7 +43,7 @@ <action selector="createRoomAction:" destination="333-bP-4tK" eventType="touchUpInside" id="rAq-LO-B2O"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiF-2z-Rwj"> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiF-2z-Rwj"> <rect key="frame" x="145" y="302" width="85" height="30"/> <color key="backgroundColor" red="0.80782043150000005" green="0.80782043150000005" blue="0.80782043150000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="鍔犲叆鎴块棿"> @@ -73,7 +74,7 @@ <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> </textField> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YO9-MU-r4L"> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YO9-MU-r4L"> <rect key="frame" x="270" y="302" width="85" height="30"/> <color key="backgroundColor" red="0.80782043150000005" green="0.80782043150000005" blue="0.80782043150000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="绂诲紑鎴块棿"> @@ -90,7 +91,8 @@ </connections> </button> </subviews> - <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> + <viewLayoutGuide key="safeArea" id="gRk-Lv-awz"/> + <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="YO9-MU-r4L" firstAttribute="height" secondItem="9ko-k4-F0N" secondAttribute="height" id="3hn-CA-7hn"/> <constraint firstItem="3UU-E8-PbA" firstAttribute="leading" secondItem="gRk-Lv-awz" secondAttribute="leading" constant="20" id="4Rd-ZV-SEq"/> @@ -116,7 +118,6 @@ <constraint firstItem="6Wf-7i-TE6" firstAttribute="centerY" secondItem="jc8-E1-NYw" secondAttribute="centerY" id="r2S-JH-0Bo"/> <constraint firstItem="qiF-2z-Rwj" firstAttribute="leading" secondItem="9ko-k4-F0N" secondAttribute="trailing" constant="40" id="rkn-HZ-QQp"/> </constraints> - <viewLayoutGuide key="safeArea" id="gRk-Lv-awz"/> </view> <connections> <outlet property="localView" destination="3UU-E8-PbA" id="JEa-Cq-Kuk"/> @@ -126,4 +127,9 @@ <point key="canvasLocation" x="-143.19999999999999" y="131.52709359605913"/> </viewController> </objects> + <resources> + <systemColor name="systemBackgroundColor"> + <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </systemColor> + </resources> </document> diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings index 0e4e516..13d6889 100644 --- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings +++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings @@ -28,6 +28,9 @@ "get_info_fail"="Searching for failed. Poor network."; "ad_input_manual"="Manual Input"; +"ad_result_verify_local_lock"="Please verify the added primary user fingerprint, key or sensor card within 2 minutes. Click the Verified button after verification"; +"ad_verified"="Verified"; + "device_camera_list_title"="Device Channel List"; "device_input_vierify_code"="Input the device verification code."; "device_verify_code_wrong"="Incorrect verification code."; @@ -64,6 +67,46 @@ "device_account_pw_empty"="The user name or password is required."; "device_lan_preview_title"="Live View via LAN"; +"device_open"="Open"; +"device_open_success"="Success to open the door!"; +"device_please_input_door_password"="Input the unlock password"; +"device_history"="History"; +"device_his_no_more_data"="No more data"; +"device_temp_pass"="Temporary password"; +"device_temp_year"="."; +"device_temp_month"="."; +"device_temp_date"="."; +"device_temp_left"="Left"; +"device_temp_times"="times"; +"device_temp_save"="Save"; +"device_temp_valid_date"="Term of validity"; +"device_temp_valid_begin"="Begin"; +"device_temp_valid_end"="End"; +"device_temp_use_times"="Use times"; +"device_temp_user"="User"; +"device_temp_please_select"="Please select"; +"device_temp_unlimited_times"="Unlimited"; +"device_temp_sure"="Sure"; +"device_temp_cancle"="Cancle"; +"device_temp_please_input"="Please input"; +"device_temp_input_use_count_describe"="Enter an integer from 1 to 100. Null means unlimited times"; +"device_temp_input_pure_number"="Please enter a pure number"; +"device_temp_input_valid_number"="Please enter a number between 1-100"; +"device_temp_unit_year"="Y"; +"device_temp_unit_month"="M"; +"device_temp_unit_date"="D"; +"device_temp_unit_hour"="h"; +"device_temp_unit_minute"="m"; +"device_temp_please_input_user_name"="Please input a user name"; +"device_temp_please_select_begin_time"="Please select the start time"; +"device_temp_please_select_end_time"="Please select the end time"; +"device_temp_please_end_time_should_later"="The end time cannot be earlier than the start time"; +"device_temp_unlimited_use_times"="Unlimited times"; +"device_temp_total"="Total "; +"device_temp_copied"="Copied"; +"device_temp_long_tap_copy"="Long press to copy"; +"device_temp_sure_to_delete"="Are you sure to delete the temporary password?"; + "dmessage_title"="Message"; "message_read"="Mark as Read"; "message_deleting"="Deleting. Please wait..."; diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings index 7eac42e..bd2e958 100644 --- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings +++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings @@ -69,6 +69,9 @@ "device_open"="寮�闂�"; "device_open_success"="寮�闂ㄦ垚鍔燂紒"; +"device_please_input_door_password"="璇疯緭鍏ュ紑閿佸瘑鐮�"; +"device_history"="鍘嗗彶璁板綍"; +"device_his_no_more_data"="娌℃湁鏇村鏁版嵁"; "device_temp_pass"="涓存椂瀵嗙爜"; "device_temp_year"="骞�"; "device_temp_month"="鏈�"; diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs index a53b729..faa53af 100644 --- a/HDL_ON/Common/ApiUtlis.cs +++ b/HDL_ON/Common/ApiUtlis.cs @@ -314,9 +314,18 @@ //======================鐧诲綍鍏ㄨ閫�==================== if (isInterphoneType_FREEVIEW) { + #if __IOS__ - //鐧诲綍鍏ㄨ閫� - Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id); + var extUserResult = Ins.HttpRequest.GetExtUserId(DB_ResidenceData.Instance.CurrentRegion.id); + if (extUserResult.Code == StateCode.SUCCESS) + { + var data = JsonConvert.DeserializeObject<extUserInfo>(deviceResult.Data.ToString()); + + //鐧诲綍鍏ㄨ閫� + //Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664"); + } + + #endif } diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index afe7b93..ba5977a 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -687,8 +687,8 @@ EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id); //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken); - //Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString); - //Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken); + Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString); + Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken); ////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈� diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index ac5de30..621846c 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -2868,9 +2868,25 @@ } -#endregion + /// <summary> + /// 鑾峰彇绗笁鏂规敞鍐岀殑id + /// </summary> + /// <param homeId="homeId">浣忓畢id</param> + /// <returns></returns> + public ResponsePackNew GetExtUserId(string homeId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", homeId); -#region 鈻� 闂ㄩ攣鐩稿叧____________________________ + var requestJson = HttpUtil.GetSignRequestJson(d); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetExtUserId, requestJson); + + return pack; + } + + #endregion + + #region 鈻� 闂ㄩ攣鐩稿叧____________________________ /// <summary> /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�) diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs index e7e96bd..b8cca27 100644 --- a/HDL_ON/DAL/Server/NewAPI.cs +++ b/HDL_ON/DAL/Server/NewAPI.cs @@ -790,7 +790,10 @@ /// </summary> public const string Api_Post_GetListHomeFace = "/home-wisdom/app/logic/listHomeFace"; - + /// <summary> + /// 鑾风涓夋柟娉ㄥ唽userId + /// </summary> + public const string Api_Post_GetExtUserId = "/community-wisdom/app/visitor/freeview/getExtMemberInfo"; #endregion diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs index 37fc391..ca12ddc 100644 --- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs +++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs @@ -82,7 +82,7 @@ if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { //涔愭鍙瀵硅 - //1.鍒濆鍖朙COpenSDK_Api + //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK) LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland(); LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken); LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken; @@ -98,12 +98,11 @@ } else if(interphoneType == InterphoneType.FLVI.ToString()) { + //Shared.IOS.ESVideoOnSDK ESOnMonitorViewController vc = new ESOnMonitorViewController(); vc.MESVideoID = mESVideoInfo.ESVideoUUID; vc.MESRoomID = roomID; vc.DeviceName = mESVideoInfo.DeviceName; - //vc.RoomName = mESVideoInfo.RoomName; - //vc.MESCallDelegate = new OnESCallDelegate(this); Shared.Application.currentVC.NavigationController.PushViewController(vc, true); } else if (interphoneType == InterphoneType.HDL.ToString()) @@ -188,7 +187,7 @@ if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { //涔愭鍙瀵硅 - //1.鍒濆鍖朙COpenSDK_Api + //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK) LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland(); LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken); //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼� @@ -226,6 +225,7 @@ } else if (interphoneType == InterphoneType.FLVI.ToString()) { + //Shared.IOS.ESVideoOnSDK ESOnIntercomViewController vc = new ESOnIntercomViewController(); vc.MESVideoID = mESVideoInfo.ESVideoUUID; vc.MESRoomID = roomID; @@ -568,7 +568,7 @@ #if __IOS__ #region OnESCallDelegate /////// <summary> - /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢 + /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.ESVideoOnSDK) /////// </summary> OnESCallDelegate mOnESCallDelegate; @@ -644,7 +644,7 @@ #region OnLCCallDelegate /////// <summary> - /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢 + /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.LCVideoOnSDK) /////// </summary> OnLCCallDelegate mOnLCCallDelegate; @@ -712,7 +712,7 @@ #endregion - + #endif ///// <summary> diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs index d7f4105..896b8fe 100644 --- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs +++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs @@ -95,7 +95,7 @@ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().InitalLinPhone(); //璁剧疆鏀跺埌鏉ョ數鍚庛�佹槸鍚﹂渶鑷姩璺宠浆鍛煎彨椤甸潰鏂规 Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsAutoJumpCallView = IsAutoJumpCallView; - //璁剧疆Listener鐩戝惉 + //璁剧疆Listener鐩戝惉(Shared.IOS.HDLLinphoneSDK) mOnHDLLinphoneCallDelegate = new OnHDLLinphoneCallDelegate(this); Console.WriteLine(UserInfo.Current.ID); Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().HdlLinphoneCallDelegate = mOnHDLLinphoneCallDelegate; @@ -125,8 +125,7 @@ #if __IOS__ - //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("1003", "123456", "192.168.31.194:5060"); - //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("6666", "85521566", "116.62.26.215:5060"); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm); #else if (mInterphoneType == InterphoneType.FREEVIEW.ToString()) @@ -163,7 +162,7 @@ this.mHDLCallVideoInfo = null; #if __IOS__ - HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser(); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser(); #else HDLLinphoneKit.Instance.Logout(); #endif @@ -176,7 +175,7 @@ { #if __IOS__ - HDLLinPhoneSDK.Instance().ClearAllConfigs(); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().ClearAllConfigs(); #else HDLLinphoneKit.Instance.ClearProxyConfig(); #endif @@ -427,7 +426,7 @@ #if __IOS__ - HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName); #else //1.鍏堝懠鍙澶� @@ -495,7 +494,7 @@ { #if __IOS__ //鑷爺鍙瀵硅 - HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName, mHDLCallVideoInfo.DeviceSipAccount); #else var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity)); if (mHDLCallVideoInfo != null) @@ -513,7 +512,7 @@ if (IsAutoJumpCallView) return; //鍏堢粨鏉熸帀涔嬪墠鐨勭嚎绋� EndCheckIncomingCallThread(); - //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂� + //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂�(Shared.IOS.HDLLinphoneSDK) if (IsIncomingReceivedCallState()) { Utlis.WriteLine("CALL 宸茬粡鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰"); @@ -530,12 +529,13 @@ } /// <summary> - /// 鏄惁鏉ョ數鐘舵�� + /// 鏄惁鏉ョ數鐘舵��(Shared.IOS.HDLLinphoneSDK) /// </summary> /// <returns></returns> - bool IsIncomingReceivedCallState() { + bool IsIncomingReceivedCallState() + { #if __IOS__ - return HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState; + return Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState; #else return HDLLinphoneKit.Instance.IsIncomingReceivedCallState; #endif @@ -548,7 +548,7 @@ #if __IOS__ - HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName); + Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName); #else var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity)); @@ -597,7 +597,7 @@ threadTime--; Utlis.WriteLine("CALL 妫�娴嬩腑...." + threadTime); Thread.Sleep(1000); - //鏉ョ數浜嗭紝璺宠浆鍛煎彨椤甸潰 + //鏉ョ數浜嗭紝璺宠浆鍛煎彨椤甸潰(Shared.IOS.HDLLinphoneSDK) if (IsIncomingReceivedCallState()) { Utlis.WriteLine("CALL 鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰"); @@ -649,10 +649,10 @@ return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running; } -#endregion + #endregion -#region 鈻� -- Android鐩稿叧鎿嶄綔_______________________________ + #region 鈻� -- Android鐩稿叧鎿嶄綔_______________________________ #if __Android__ @@ -747,23 +747,23 @@ } #endif -#endregion + #endregion -#region 鈻� -- iOS鐩稿叧鎿嶄綔_______________________________ + #region 鈻� -- iOS鐩稿叧鎿嶄綔_______________________________ #if __IOS__ -#region OnHDLLinphoneCallDelegate + #region OnHDLLinphoneCallDelegate /// <summary> /// /// </summary> OnHDLLinphoneCallDelegate mOnHDLLinphoneCallDelegate; - + /// <summary> /// /// </summary> public class OnHDLLinphoneCallDelegate : HDLLinphoneCallDelegate - { + { [Weak] HDLLinphone hdlLinphone; public OnHDLLinphoneCallDelegate(HDLLinphone mHDLLinphone) @@ -802,12 +802,12 @@ /// <param name="image"></param> //public override void OnScreenshotSuccessfulAction(UIImage image) //{ - ////NSData imageData = UIImagePNGRepresentation(image); UIImage - //NSData imageData = image.AsPNG(); - //byte[] dataBytes = new byte[imageData.Length]; - //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length)); - ////image.g - ////hdlLinphone.ScreenshotSuccessfulAction(dataBytes); + ////NSData imageData = UIImagePNGRepresentation(image); UIImage + //NSData imageData = image.AsPNG(); + //byte[] dataBytes = new byte[imageData.Length]; + //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length)); + ////image.g + ////hdlLinphone.ScreenshotSuccessfulAction(dataBytes); //} /// <summary> @@ -825,15 +825,15 @@ { Utlis.WriteLine("OnIncomingCall :" + userName); } - + } -#endregion + #endregion #endif -#endregion + #endregion } diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs index 2c1680d..36ad814 100644 --- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs +++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs @@ -174,4 +174,26 @@ //} + + /// <summary> + /// 绗笁鏂规敞鍐屼俊鎭� + /// </summary> + public class extUserInfo + { + + public string extUserId = ""; + + public string extPlatform = ""; + + public string homeId = ""; + + public string extServerIp = ""; + + public string extTenantCode = ""; + + public string extUUID = ""; + + public string extra = ""; + + } } diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs index 609e788..1fdebfd 100644 --- a/HDL_ON/Entity/Room.cs +++ b/HDL_ON/Entity/Room.cs @@ -568,5 +568,6 @@ scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid)); } } - + + } \ No newline at end of file diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs index 25f51a0..971203f 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs @@ -235,7 +235,8 @@ case SPK.IpCam_Imou: #if __IOS__ - if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken==null) {//鏈垵濮嬪寲鎽勫儚澶� + if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null) + {//鏈垵濮嬪寲鎽勫儚澶� Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; @@ -244,8 +245,6 @@ } //璺宠浆澶у崕鎽勫儚澶� Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList(); - //Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name); - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC); #else FunctionList.List.GetIpCamImouList(); diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs index 21466f5..a6fd0d2 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs @@ -19,6 +19,7 @@ #if __ANDROID__ public class dddxx { } #else + //澶у崕鎽勫儚澶磗dk浠g悊锛圫hared.IOS.HDLCNVRSDK) hdlLCNVRSDKDelegate hdlLCNVRDelegate; public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate { @@ -193,7 +194,7 @@ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id; - //璺宠浆娣诲姞鎽勫儚澶� + //璺宠浆娣诲姞鎽勫儚澶�(Shared.IOS.HDLCNVRSDK) hdlLCNVRDelegate = new hdlLCNVRSDKDelegate(() => {//娣诲姞鎴愬姛杩斿洖浜嬩欢 refreshView.BeginHeaderRefreshing(); diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs index b4b4f4a..c46f3a9 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs @@ -824,10 +824,14 @@ //璺宠浆鏈嶅姟鍣ㄤ俊鎭� Action selectAction = () => { - var myServerInfoPage = new MyServerInfoPage(); - MainPage.BasePageView.AddChidren(myServerInfoPage); - myServerInfoPage.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //var myServerInfoPage = new MyServerInfoPage(); + //MainPage.BasePageView.AddChidren(myServerInfoPage); + //myServerInfoPage.LoadPage(); + //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + + //钀ょ煶涓存椂瀵嗙爜 + EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView("1638782606240137218"); + }; myServerInfoCellView.GoAction = selectAction; myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation); @@ -844,10 +848,13 @@ //娉ㄩ攢璐﹀彿鐣岄潰 Action logOffAction = () => { - var myServerInfoPage = new CancelAccountPage(); - MainPage.BasePageView.AddChidren(myServerInfoPage); - myServerInfoPage.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //var myServerInfoPage = new CancelAccountPage(); + //MainPage.BasePageView.AddChidren(myServerInfoPage); + //myServerInfoPage.LoadPage(); + //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + + //钀ょ煶鍘嗗彶璁板綍 + EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView("1638782606240137218"); }; logOffView.GoAction = logOffAction; logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount); diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs index ce10df7..23fd1d4 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs @@ -4,6 +4,11 @@ using HDL_ON.Entity; using Shared; +#if __IOS__ +using UIKit; +using Foundation; +#endif + namespace HDL_ON.UI { public partial class PersonalDataPage @@ -434,12 +439,14 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { - //鎴戠殑浜岀淮鐮� - var aep = new MyQRCodePage(); - MainPage.BasePageView.AddChidren(aep); - aep.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + ////鎴戠殑浜岀淮鐮� + //var aep = new MyQRCodePage(); + //MainPage.BasePageView.AddChidren(aep); + //aep.LoadPage(); + //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //钀ょ煶璺宠浆瑙嗛椤� + EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial("J92513662", "1638782606240137218", "security.door.ezviz"); }; _QRcodeView.MouseUpEventHandler = eventHandler; btnQRcode.MouseUpEventHandler = eventHandler; @@ -447,7 +454,7 @@ btnQRcodeRight.MouseUpEventHandler = eventHandler; } - #region 淇敼缁戝畾閭 +#region 淇敼缁戝畾閭 /// <summary> /// 淇敼缁戝畾閭 /// </summary> @@ -459,6 +466,7 @@ { btnUserEmailInfo.Text = GetBindAccountText(email); + }; if (CheckIfUnbound(btnUserEmailInfo.Text)) @@ -490,26 +498,32 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { - Action<string> action = (phone) => - { - btnUserPhoneInfo.Text = GetBindAccountText(phone); - }; + //Action<string> action = (phone) => + //{ + // btnUserPhoneInfo.Text = GetBindAccountText(phone); - if (CheckIfUnbound(btnUserPhoneInfo.Text)) - { - //鏈粦瀹�,璺宠浆鏂扮粦瀹氶〉闈� - var aep = new NewBindAccountPage(); - MainPage.BasePageView.AddChidren(aep); - aep.LoadPage(action, true); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - } - else - { - var aep = new AccountBindInfoPage(); - MainPage.BasePageView.AddChidren(aep); - aep.LoadPage(action, 2, StringId.PhoneInfo); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - } + //}; + + //if (CheckIfUnbound(btnUserPhoneInfo.Text)) + //{ + // //鏈粦瀹�,璺宠浆鏂扮粦瀹氶〉闈� + // var aep = new NewBindAccountPage(); + // MainPage.BasePageView.AddChidren(aep); + // aep.LoadPage(action, true); + // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //} + //else + //{ + // var aep = new AccountBindInfoPage(); + // MainPage.BasePageView.AddChidren(aep); + // aep.LoadPage(action, 2, StringId.PhoneInfo); + // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //} + + //钀ょ煶璺宠浆璁惧鍒楄〃 + NSObject[] types = new NSObject[1]; + types[0] = new NSString("DL30V"); + EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types); }; @@ -517,9 +531,9 @@ btnUserPhoneRight.MouseUpEventHandler = eventHandler; userPhoneInfoView.MouseUpEventHandler = eventHandler; } - #endregion +#endregion - #region 瑙i攣璁剧疆鍖哄煙 +#region 瑙i攣璁剧疆鍖哄煙 //void LoadEvent_SkipInterpretationSettings() //{ // EventHandler<MouseEventArgs> eventHandler = (sender, e) => @@ -535,7 +549,7 @@ // btnInterpretationSettingsTip.MouseUpEventHandler = eventHandler; //} - #endregion +#endregion /// <summary> /// 璺宠浆淇敼瀵嗙爜鐣岄潰 @@ -544,15 +558,18 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { - //var page = new ResetPasswordOptionPage(); - //MainPage.BasePageView.AddChidren(page); - //page.LoadPage(); + ////var page = new ResetPasswordOptionPage(); + ////MainPage.BasePageView.AddChidren(page); + ////page.LoadPage(); + ////MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + + //var vcp = new ResetPasswordPage(); + //MainPage.BasePageView.AddChidren(vcp); + //vcp.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - var vcp = new ResetPasswordPage(); - MainPage.BasePageView.AddChidren(vcp); - vcp.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //钀ょ煶娣诲姞璁惧 + EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType("security.door.ezviz"); }; btnResetPasswordRight.MouseUpEventHandler = eventHandler; -- Gitblit v1.8.0