From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 163 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 108 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index d8838be..308ee69 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -131,6 +131,7 @@
</Compile>
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
@@ -141,48 +142,57 @@
<ItemGroup>
<ImageAsset Include="Assets.xcassets\.DS_Store" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -209,6 +219,7 @@
<BundleResource Include="Resources\Phone\Room\RoomShadow.png" />
<BundleResource Include="Resources\Phone\Room\AddBackground.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
+ <BundleResource Include="Resources\Phone\Instruct\PanelFreshAir.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorPir.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
@@ -317,6 +328,20 @@
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_5.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_4.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_6.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\2.png" />
+ <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\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueEightButtonTable.png" />
@@ -349,16 +374,20 @@
<BundleResource Include="Resources\Phone\RollerShade\Open.png" />
<BundleResource Include="Resources\Phone\RollerShade\CloseSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Close.png" />
- <BundleResource Include="Resources\Phone\SceneIcon\8.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\9.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\4.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\5.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\7.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\6.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\2.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\3.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\1.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\SceneIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\2.png" />
+ <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\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" />
@@ -434,7 +463,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.jpg" />
+ <BundleResource Include="Resources\Phone\Logo\2.png" />
<BundleResource Include="Resources\Phone\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -465,6 +494,7 @@
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\LogicMsgIcon.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\NormallyOpen.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Item\UnLockSuccess.png" />
<BundleResource Include="Resources\Phone\Item\GarrisonList.png" />
@@ -501,6 +531,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" />
@@ -546,6 +577,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" />
@@ -667,6 +699,7 @@
<BundleResource Include="Resources\Phone\Device\Relay.png" />
<BundleResource Include="Resources\Phone\Device\SensorWaterSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfrared.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAir.png" />
<BundleResource Include="Resources\Phone\Device\Curtain.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContr.png" />
@@ -687,6 +720,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxideSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAirSelected.png" />
<BundleResource Include="Resources\Phone\Device\Repeater.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfraredSelected2.png" />
@@ -809,12 +843,28 @@
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" />
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" />
<BundleResource Include="Resources\Phone\Floor\Floor.png" />
- <BundleResource Include="Resources\Phone\RoomIcon\4.JPG" />
- <BundleResource Include="Resources\Phone\RoomIcon\5.JPG" />
- <BundleResource Include="Resources\Phone\RoomIcon\2.JPG" />
- <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\RoomIcon\8.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
+ <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\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
@@ -926,6 +976,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFourNotPower.png" />
<BundleResource Include="Resources\Phone\RealDevice\CurtainAutoOpen.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorInfrared.png" />
+ <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\ButtonPanelCurtain.png" />
@@ -935,6 +986,7 @@
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
@@ -945,6 +997,7 @@
<BundleResource Include="Resources\Phone\RealDevice\SensorWater.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.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" />
--
Gitblit v1.8.0