From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 166 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index ebef266..575a8c7 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -36,6 +36,9 @@
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
+ <ConsolePause>true</ConsolePause>
+ <MtouchInterpreter></MtouchInterpreter>
+ <IpaMetadata></IpaMetadata>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -51,7 +54,11 @@
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
-<CodesignProvision>Home_Dev</CodesignProvision>
+<CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
+<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
+<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
+<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
+<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -62,10 +69,11 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchI18n>cjk</MtouchI18n>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
+ <CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -87,6 +95,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 +143,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 +205,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" />
@@ -227,13 +293,18 @@
<BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueTwoButton.png" />
+ <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" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorFire.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelThreeButton.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Instruct\DimmableLightOneLoad.png" />
@@ -342,6 +413,7 @@
<BundleResource Include="Resources\Phone\SceneCardIcon\3.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\1.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\0.png" />
+ <BundleResource Include="Resources\Phone\DeviceItem\MiniNightLightDevice.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueEightButtonTable.png" />
@@ -358,12 +430,20 @@
<BundleResource Include="Resources\Phone\Center\MainBack1.png" />
<BundleResource Include="Resources\Phone\Center\Admin.png" />
<BundleResource Include="Resources\Phone\Center\SafetyManagement.png" />
+ <BundleResource Include="Resources\Phone\FreshAir\FreshAirRealDevicePic.png" />
+ <BundleResource Include="Resources\Phone\FreshAir\FreshAirPic.png" />
<BundleResource Include="Resources\Phone\Navigation\CategorySelected.png" />
<BundleResource Include="Resources\Phone\Navigation\Category.png" />
<BundleResource Include="Resources\Phone\Navigation\HomeSelected.png" />
<BundleResource Include="Resources\Phone\Navigation\Home.png" />
<BundleResource Include="Resources\Phone\Navigation\Setting.png" />
<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\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\RollerShade\Stop.png" />
<BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -388,13 +468,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" />
@@ -463,7 +552,7 @@
<BundleResource Include="Resources\Phone\DoorLock\UnLockSideslipIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\UndistributeIcon.png" />
<BundleResource Include="Resources\Phone\Logo\Logo.png" />
- <BundleResource Include="Resources\Phone\Logo\2.png" />
+ <BundleResource Include="Resources\Phone\Logo\StartBackGroud.png" />
<BundleResource Include="Resources\Phone\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -471,14 +560,17 @@
<BundleResource Include="Resources\Phone\Item\Switch1.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\Check.png" />
+ <BundleResource Include="Resources\Phone\Item\ScanQrCodeGroud.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" />
<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" />
@@ -493,6 +585,7 @@
<BundleResource Include="Resources\Phone\Item\QRCode.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\LogicMsgIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\ColorTemperatureBar.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIcon.png" />
<BundleResource Include="Resources\Phone\Item\NormallyOpen.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
@@ -514,6 +607,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" />
@@ -531,6 +625,7 @@
<BundleResource Include="Resources\Phone\Item\Point.png" />
<BundleResource Include="Resources\Phone\Item\Search.png" />
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\Check1.png" />
<BundleResource Include="Resources\Phone\Item\NextSelected.png" />
<BundleResource Include="Resources\Phone\Item\SafetyShortcut_itemSelected.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
@@ -538,8 +633,11 @@
<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\TransferOfResidence.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" />
@@ -556,8 +654,11 @@
<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\AdjustFailIcon.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -576,6 +677,7 @@
<BundleResource Include="Resources\Phone\Item\MinusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected1.png" />
<BundleResource Include="Resources\Phone\Item\SceneMsgIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\Check1Selected.png" />
<BundleResource Include="Resources\Phone\Item\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\Message.png" />
<BundleResource Include="Resources\Phone\Item\FixedPosition.png" />
@@ -587,16 +689,22 @@
<BundleResource Include="Resources\Phone\Item\SelectHouse.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\PmPic.png" />
+ <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" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\noMode.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\athome.png" />
<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" />
@@ -609,9 +717,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" />
@@ -621,6 +732,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" />
@@ -632,6 +745,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" />
@@ -650,6 +765,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" />
@@ -658,9 +774,12 @@
<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" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor21.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\nextIconSone.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\3.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\back.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedtemperature.png" />
@@ -678,15 +797,21 @@
<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\ColorLightTemperatureSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected2.png" />
+ <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" />
<BundleResource Include="Resources\Phone\Device\RelaySelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ColorLightTemperatureSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ColorLightTemperature.png" />
<BundleResource Include="Resources\Phone\Device\SensorWaterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoad.png" />
@@ -695,6 +820,7 @@
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\Relay.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpoint.png" />
<BundleResource Include="Resources\Phone\Device\SensorWaterSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfrared.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAir.png" />
@@ -708,6 +834,7 @@
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxideSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGasSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected2.png" />
@@ -726,14 +853,19 @@
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected.png" />
<BundleResource Include="Resources\Phone\Device\Sensor.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGasSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected.png" />
<BundleResource Include="Resources\Phone\Device\RelaySelected.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected.png" />
<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\ColorLightSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
@@ -747,36 +879,47 @@
<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\SensorMotion.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" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpoint.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DryContactSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected.png" />
<BundleResource Include="Resources\Phone\Device\Converter.png" />
<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\AirConditionerZbGatewaySelected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\Switch.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanel.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwoSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<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\ButtonPanelOneSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected2.png" />
<BundleResource Include="Resources\Phone\Device\LightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected2.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOne.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected2.png" />
@@ -788,18 +931,24 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoadSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwoSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpoint.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoadSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThree.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfraredSelected.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorEmergencyButtonSelected2.png" />
<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" />
+ <BundleResource Include="Resources\Phone\Device\SensorMotionSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpoint.png" />
@@ -808,6 +957,7 @@
<BundleResource Include="Resources\Phone\Device\SensorWater.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAirSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFourSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" />
@@ -863,14 +1013,15 @@
<BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\Account\Logo_WhiteHome.png" />
<BundleResource Include="Resources\Phone\Account\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
<BundleResource Include="Resources\Phone\Account\Account.png" />
<BundleResource Include="Resources\Phone\Account\Cat.png" />
<BundleResource Include="Resources\Phone\Account\Password.png" />
- <BundleResource Include="Resources\Phone\Account\Logo_White.png" />
<BundleResource Include="Resources\Phone\Account\QQ.png" />
+ <BundleResource Include="Resources\Phone\Account\Logo_Evoyo.png" />
<BundleResource Include="Resources\Phone\Account\PhoneEmail_White.png" />
<BundleResource Include="Resources\Phone\Account\ChangeSuccess.png" />
<BundleResource Include="Resources\Phone\Account\Wechat.png" />
@@ -977,32 +1128,40 @@
<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" />
<BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelThree.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\RealDevice\DimmableLightOneLoad.png" />
<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\MiniGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\MiniGateway.png" />
+ <BundleResource Include="Resources\Phone\Gateway\MiniGatewayDirection.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon_6.png" />
- <BundleResource Include="Resources\Phone\Gateway\RealGateway6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway.png" />
- <BundleResource Include="Resources\Phone\Gateway\RealGateway1.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.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\WirelessApGatewaySearching.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" />
--
Gitblit v1.8.0