From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码，别 合并
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 0a54106..941a5d6 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -87,6 +87,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 +135,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,9 +197,63 @@
<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\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" />
+ <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" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
+ <BundleResource Include="Resources\DeviceName.ini" />
<BundleResource Include="Resources\Phone\Guide\RightIcon.png" />
<BundleResource Include="Resources\Phone\Guide\LeftIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Finger.png" />
@@ -562,6 +620,7 @@
<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" />
@@ -581,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" />
@@ -645,6 +706,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nightLight.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicclose.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\function.png" />
@@ -688,6 +750,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\iconBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor44.png" />
@@ -1043,9 +1106,9 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
<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\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
- <BundleResource Include="Resources\Phone\RealDevice\SensorTemperatrueHumidity.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
--
Gitblit v1.8.0