From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 132 +++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 55 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a959ecc..afefbca 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -26,8 +26,8 @@
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
- <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>On+Dev-20210616-1</CodesignProvision>
+ <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
+ <CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
@@ -59,7 +59,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro230308-3-Dev</CodesignProvision>
+<CodesignProvision>OnPro230630-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -69,7 +69,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
@@ -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>
@@ -143,11 +143,11 @@
<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>
+ <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
+ <Version>0.2.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -461,6 +461,14 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -1289,30 +1297,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" />
@@ -1540,8 +1524,46 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\securityipcamimou.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.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\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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorfulBar.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_white.png" />
<BundleResource Include="Resources\h5\index.html" />
- <BundleResource Include="Resources\h5\static\index.b0707a6a.css" />
+ <BundleResource Include="Resources\h5\static\index.63b34199.css" />
<BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
<BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
<BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
@@ -1559,17 +1581,17 @@
<BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
<BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
<BundleResource Include="Resources\h5\static\images\left-icon.png" />
- <BundleResource Include="Resources\h5\static\js\index.2e54df77.js" />
- <BundleResource Include="Resources\h5\static\js\pages-inverter-index.c7bff58c.js" />
- <BundleResource Include="Resources\h5\static\js\chunk-vendors.c6df545a.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.e7dd0a58.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
+ <BundleResource Include="Resources\h5\static\js\index.cf368d6e.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.cfb4b30d.js" />
<BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
<BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
<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\MusicIcon\currentPlayList.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockUserManager.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1596,10 +1618,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>
@@ -1614,6 +1632,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