From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 172 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 117 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index a018d8a..3f63e2a 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">
@@ -140,62 +152,70 @@
</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\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" />
+ <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 +250,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" />
@@ -373,12 +394,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" />
@@ -403,13 +423,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" />
@@ -486,14 +515,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" />
@@ -530,6 +562,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" />
@@ -555,8 +588,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" />
@@ -573,8 +609,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" />
@@ -609,6 +648,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 +659,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 +672,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 +687,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 +700,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 +720,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 +729,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 +760,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" />
@@ -764,6 +815,7 @@
<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" />
@@ -771,6 +823,7 @@
<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" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected.png" />
@@ -781,6 +834,8 @@
<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" />
@@ -802,6 +857,7 @@
<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" />
@@ -838,12 +894,15 @@
<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" />
@@ -909,14 +968,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" />
@@ -1023,12 +1083,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" />
@@ -1054,6 +1115,7 @@
<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\GatewayIcon16.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessApGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway11.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
--
Gitblit v1.8.0