From a7ab4b610972e20753dfedb3e5d80e4d9f017d07 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 14 八月 2020 10:39:08 +0800 Subject: [PATCH] 临时备份,测试1 --- ZigbeeApp/Home.Ios/Home.IOS.csproj | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj index a018d8a..0a2ee62 100644 --- a/ZigbeeApp/Home.Ios/Home.IOS.csproj +++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj @@ -52,6 +52,7 @@ <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> <CodesignProvision>Home_Dev</CodesignProvision> +<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler> </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,9 +198,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\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" /> </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" /> @@ -230,6 +289,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" /> @@ -403,13 +463,22 @@ <BundleResource Include="Resources\Phone\SceneIcon\3.png" /> <BundleResource Include="Resources\Phone\SceneIcon\1.png" /> <BundleResource Include="Resources\Phone\SceneIcon\0.png" /> + <BundleResource Include="Resources\Phone\BindPic\EmptyTargets.png" /> <BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" /> + <BundleResource Include="Resources\Phone\BindPic\Curtain.png" /> + <BundleResource Include="Resources\Phone\BindPic\TemperaTureReduction.png" /> <BundleResource Include="Resources\Phone\BindPic\BindLeft.png" /> <BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" /> + <BundleResource Include="Resources\Phone\BindPic\Roller.png" /> <BundleResource Include="Resources\Phone\BindPic\BindAdd.png" /> <BundleResource Include="Resources\Phone\BindPic\BindDown.png" /> + <BundleResource Include="Resources\Phone\BindPic\EmptyTargetsSelected.png" /> <BundleResource Include="Resources\Phone\BindPic\BindRoomColor.png" /> + <BundleResource Include="Resources\Phone\BindPic\Switch.png" /> + <BundleResource Include="Resources\Phone\BindPic\TemperaTureAdd.png" /> <BundleResource Include="Resources\Phone\BindPic\BindRight.png" /> + <BundleResource Include="Resources\Phone\BindPic\CorrectTemperatureBackGround.png" /> + <BundleResource Include="Resources\Phone\BindPic\TemperaTureAttention.png" /> <BundleResource Include="Resources\Phone\BindPic\BindRoomColorOn.png" /> <BundleResource Include="Resources\Phone\DoorLock\DistributeUnlockIcon.png" /> <BundleResource Include="Resources\Phone\DoorLock\TypeIcon.png" /> @@ -488,6 +557,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" /> @@ -555,8 +625,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" /> @@ -573,7 +645,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" /> @@ -609,6 +683,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" /> @@ -619,6 +694,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" /> @@ -631,9 +707,12 @@ <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" /> + <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" /> <BundleResource Include="Resources\Phone\ZigeeLogic\Ddmmablelight.png" /> @@ -643,6 +722,8 @@ <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\temperature.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\AddSelected.png" /> + <BundleResource Include="Resources\Phone\ZigeeLogic\nightLightSelected.png" /> + <BundleResource Include="Resources\Phone\ZigeeLogic\seek.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\light_1.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\sign.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\selected.png" /> @@ -654,6 +735,8 @@ <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" /> <BundleResource Include="Resources\Phone\ZigeeLogic\panel.png" /> @@ -672,6 +755,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" /> @@ -680,6 +764,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" /> @@ -710,6 +795,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" /> @@ -781,6 +867,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" /> @@ -841,6 +928,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" /> @@ -1023,12 +1111,13 @@ <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" /> + <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" /> -- Gitblit v1.8.0