From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 5777f00..b77a7b7 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -25,6 +25,8 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
+ <CodesignProvision>Home_Dev2</CodesignProvision>
+ <CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -51,7 +53,6 @@
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
-<CodesignProvision>Home_Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -87,6 +88,9 @@
<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>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
@@ -132,6 +136,7 @@
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
<Compile Include="ZXingOverlayView.cs" />
+ <Compile Include="ESVideo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
@@ -193,6 +198,59 @@
<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_XS Max-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792_XR-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60-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\120_120-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -230,6 +288,7 @@
<BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueFourButton.png" />
+ <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\SensorCeilingGas.png" />
@@ -493,6 +552,7 @@
<BundleResource Include="Resources\Phone\Item\Check.png" />
<BundleResource Include="Resources\Phone\Item\MessageManagement.png" />
<BundleResource Include="Resources\Phone\Item\Add_GW.png" />
+ <BundleResource Include="Resources\Phone\Item\Battery.png" />
<BundleResource Include="Resources\Phone\Item\Switch2.png" />
<BundleResource Include="Resources\Phone\Item\MessageSelected.png" />
<BundleResource Include="Resources\Phone\Item\PhoneBook.png" />
@@ -560,8 +620,10 @@
<BundleResource Include="Resources\Phone\Item\ShardMenu.png" />
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
+ <BundleResource Include="Resources\Phone\Item\SynchronizationSelected.png" />
<BundleResource Include="Resources\Phone\Item\BottomButtonGround.png" />
<BundleResource Include="Resources\Phone\Item\AutoBackup.png" />
+ <BundleResource Include="Resources\Phone\Item\BatterySelected.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBGSelected.png" />
<BundleResource Include="Resources\Phone\Item\NoFunction.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2.png" />
@@ -578,7 +640,9 @@
<BundleResource Include="Resources\Phone\Item\GwSwitchIcon.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\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
@@ -614,6 +678,7 @@
<BundleResource Include="Resources\Phone\PM2.5Sensor\TemperaturePic.png" />
<BundleResource Include="Resources\Phone\PM2.5Sensor\HumidityPic.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\sensor541.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\add.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor13.png" />
@@ -624,6 +689,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\function1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selecteddoorlock.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj2.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\lesLuminositys.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nosecurity.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\time.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsenor.png" />
@@ -636,6 +702,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\doorlock.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nodelay.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\addLuminosity.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
@@ -662,6 +729,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor44.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor541.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\back1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedpanel.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nofunction.png" />
@@ -689,6 +757,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\timepoint.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor40.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\humidity.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\tipIcon.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedac.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\openMode.png" />
@@ -719,6 +788,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPir.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSphericalMotionSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" />
<BundleResource Include="Resources\Phone\Device\LightSelected.png" />
@@ -790,6 +860,7 @@
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected.png" />
@@ -850,6 +921,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<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\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
@@ -1038,6 +1110,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
+ <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\SensorCeilingGas.png" />
@@ -1069,7 +1142,6 @@
<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\Item\SynchronizationSelected.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