From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 255 ++++++++++++++++++++++++++------------------------
1 files changed, 133 insertions(+), 122 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 0d14059..8d78e92 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -25,6 +25,7 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
+<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -52,13 +53,16 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
- <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
-<CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
-<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
+<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
+<MtouchLink>SdkOnly</MtouchLink>
+<CodesignProvision>ComEvoyoHomeDevelopment</CodesignProvision>
+<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
+<MtouchFastDev>true</MtouchFastDev>
+<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -69,11 +73,12 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchI18n>cjk</MtouchI18n>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
- <CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
+ <MtouchLink>SdkOnly</MtouchLink>
+<CodesignProvision>ComEvoyoHomeAppStore0301</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -82,12 +87,6 @@
<Reference Include="Xamarin.iOS" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
- <Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.TBL">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
- </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -95,8 +94,17 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
- <Reference Include="Shared.IOS.ESVideoPhoneSDK">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.ESVideoPhoneSDK.dll</HintPath>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\..\..\Library\Shared.IOS.TBL\bin\Debug\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Elian.iOS">
+ <HintPath>..\Shared\DLL\Elian.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLFVSDK">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -111,10 +119,13 @@
<Version>2.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter">
- <Version>2.6.1</Version>
+ <Version>3.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>2.6.1</Version>
+ </PackageReference>
+ <PackageReference Include="kyub.org.bouncycastle.dtlssrtp">
+ <Version>1.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -146,118 +157,66 @@
<Compile Include="ESVideo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
- <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project>
- <Name>Elian.iOS</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <ImageAsset Include="Assets.xcassets\.DS_Store" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688_XS Max.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792_XR.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*2732-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴828*1792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2688*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1792*828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1125*2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2436*1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2208*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768*1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536*2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024*768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴750_1334澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴320_480澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1004澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2008澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1024澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2048澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_748澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1496澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_768澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1536澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-2.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -268,6 +227,8 @@
<BundleResource Include="Resources\Phone\Guide\WorkRoomIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Arrows2.png" />
<BundleResource Include="Resources\Phone\Guide\Arrows1.png" />
+ <BundleResource Include="Resources\Phone\Video\VideoTempPwdBackground.png" />
+ <BundleResource Include="Resources\Phone\Video\VideoQRCodeBackground.png" />
<BundleResource Include="Resources\Phone\Room\RoomCardView.png" />
<BundleResource Include="Resources\Phone\Room\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected.png" />
@@ -292,6 +253,7 @@
<BundleResource Include="Resources\Phone\Instruct\SensorInfrared.png" />
<BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorTemperatureHumidity.png" />
+ <BundleResource Include="Resources\Phone\Instruct\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueTwoButton.png" />
<BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
@@ -299,6 +261,7 @@
<BundleResource Include="Resources\Phone\Instruct\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\Instruct\Airer.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
@@ -399,6 +362,25 @@
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_5.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_4.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_6.png" />
+ <BundleResource Include="Resources\Phone\Airer\WindOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Stop.png" />
+ <BundleResource Include="Resources\Phone\Airer\LightSelected.png" />
+ <BundleResource Include="Resources\Phone\Airer\StopOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Up.png" />
+ <BundleResource Include="Resources\Phone\Airer\Dry.png" />
+ <BundleResource Include="Resources\Phone\Airer\Down.png" />
+ <BundleResource Include="Resources\Phone\Airer\DetailAirerPic.png" />
+ <BundleResource Include="Resources\Phone\Airer\DisinfectOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Wind.png" />
+ <BundleResource Include="Resources\Phone\Airer\LightOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Airer216.png" />
+ <BundleResource Include="Resources\Phone\Airer\DryOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\AirerOnrange108.png" />
+ <BundleResource Include="Resources\Phone\Airer\AirerFunPic.png" />
+ <BundleResource Include="Resources\Phone\Airer\UpOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\DownOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\DisinfectSelected.png" />
+ <BundleResource Include="Resources\Phone\Airer\FunctionPic.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\8.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\9.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\12.png" />
@@ -440,12 +422,11 @@
<BundleResource Include="Resources\Phone\Navigation\SettingSelected.png" />
<BundleResource Include="Resources\Phone\SmartSound\PullDown.png" />
<BundleResource Include="Resources\Phone\SmartSound\Xiaodu.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\Sibici.png" />
<BundleResource Include="Resources\Phone\SmartSound\Xiaoai.png" />
<BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
<BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
<BundleResource Include="Resources\Phone\SmartSound\Tianmao.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxDef.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxSel.png" />
<BundleResource Include="Resources\Phone\RollerShade\Stop.png" />
<BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -526,6 +507,7 @@
<BundleResource Include="Resources\Phone\DoorLock\DooorLockPicOpen.png" />
<BundleResource Include="Resources\Phone\DoorLock\DelBackground.png" />
<BundleResource Include="Resources\Phone\DoorLock\Password.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\faceIdOn.png" />
<BundleResource Include="Resources\Phone\DoorLock\UnselectedIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\AddIcCardTipPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\Switch.png" />
@@ -542,8 +524,10 @@
<BundleResource Include="Resources\Phone\DoorLock\UnlockFailed.png" />
<BundleResource Include="Resources\Phone\DoorLock\AddPasswordTicPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\AllMethodOn.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\AddFaceIDTipPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\NormallyOpenOn.png" />
<BundleResource Include="Resources\Phone\DoorLock\VolumeIcon.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\faceId.png" />
<BundleResource Include="Resources\Phone\DoorLock\SettingIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\DoorlockIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\SideslipPic.png" />
@@ -572,6 +556,7 @@
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustSuccessIcon.png" />
<BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
@@ -608,6 +593,7 @@
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
+ <BundleResource Include="Resources\Phone\Item\TransferOfResidenceIcon.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -652,12 +638,14 @@
<BundleResource Include="Resources\Phone\Item\DeviceLimitGround.png" />
<BundleResource Include="Resources\Phone\Item\Switch.png" />
<BundleResource Include="Resources\Phone\Item\GwSwitchIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\ReplaceIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
<BundleResource Include="Resources\Phone\Item\videoIntercomNext.png" />
<BundleResource Include="Resources\Phone\Item\Floor.png" />
<BundleResource Include="Resources\Phone\Item\videoIntercom.png" />
<BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustFailIcon.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -796,6 +784,7 @@
<BundleResource Include="Resources\Phone\Device\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLight.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightTemperatureSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected2.png" />
@@ -839,6 +828,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindowSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoadSelected.png" />
<BundleResource Include="Resources\Phone\Device\DryContactSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtain.png" />
@@ -866,6 +856,7 @@
<BundleResource Include="Resources\Phone\Device\IntelligentLocks.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
@@ -894,6 +885,7 @@
<BundleResource Include="Resources\Phone\Device\AirConditioner.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLight.png" />
+ <BundleResource Include="Resources\Phone\Device\AirerSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected.png" />
<BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\Switch.png" />
@@ -906,6 +898,7 @@
<BundleResource Include="Resources\Phone\Device\DryContact.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\Airer.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCeilingGas.png" />
@@ -944,6 +937,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorSphericalMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
+ <BundleResource Include="Resources\Phone\Device\AirerSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorMotionSelected2.png" />
@@ -990,6 +984,14 @@
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" />
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" />
<BundleResource Include="Resources\Phone\Floor\Floor.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LedSelected.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LED72.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LEDLogic1.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\light.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\Led.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LED84.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\CO2Pic.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\lightOn.png" />
<BundleResource Include="Resources\Phone\RoomIcon\8.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
@@ -1128,6 +1130,7 @@
<BundleResource Include="Resources\Phone\RealDevice\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorTemperatureHumidity.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
@@ -1136,6 +1139,7 @@
<BundleResource Include="Resources\Phone\RealDevice\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\Airer.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
@@ -1149,6 +1153,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueTwo.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorWater.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon.png" />
<BundleResource Include="Resources\Phone\Gateway\MiniGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\MiniGateway.png" />
@@ -1156,15 +1161,21 @@
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon_6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon10.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessApDirection.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon11.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon1.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon13.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon12.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon16.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessApGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon15.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway11.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
+ <BundleResource Include="Resources\Phone\Center\FaceManagement.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
--
Gitblit v1.8.0