From bbbfbb1fff6d2520c3f7c85d834b166e813a8a74 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 06 四月 2023 10:34:49 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll 2.增加使用app中定位隐私描述 3.更新添加萤石设备storyboard 4.更改萤石门锁页面适配
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 108 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index db8fc14..5cda6b8 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>
@@ -86,35 +86,35 @@
<HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="MJRefresh_Xamarin">
- <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.JLCountryCode">
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
</Reference>
- <Reference Include="EZSDK.IOS">
- <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.ESVideoOnSDK">
- <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.LCVideoOnSDK">
- <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
- </Reference>
<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="Shared.IOS.HDLFVSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.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.HDLLinphoneSDK">
+ <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
+ </Reference>
+ <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.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>
@@ -141,6 +141,12 @@
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.0</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
+ <Version>0.2.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.MJRefresh">
+ <Version>3.2.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1282,30 +1288,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
<BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
<BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
@@ -1562,6 +1544,38 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockClose.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\RTV.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Cell.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocking.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\HistoryList.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocked.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1588,10 +1602,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>
@@ -1606,6 +1616,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" />
--
Gitblit v1.8.0