From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
old mode 100755
new mode 100644
index ae9e623..6abbf03
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -211,6 +211,7 @@
<BundleResource Include="Resources\Phone\AC\Swing_1Selected.png" />
<BundleResource Include="Resources\Phone\AC\Mode_Dry.png" />
<BundleResource Include="Resources\Phone\AC\Group.png" />
+ <BundleResource Include="Resources\Phone\AC\AC_TIP.png" />
<BundleResource Include="Resources\Phone\AC\Swing_2.png" />
<BundleResource Include="Resources\Phone\AC\Swing_3.png" />
<BundleResource Include="Resources\Phone\AC\Fan_Low.png" />
@@ -295,10 +296,16 @@
<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\4.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\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\BindPic\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\BindAdd.png" />
@@ -428,6 +435,7 @@
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
<BundleResource Include="Resources\Phone\Item\BottomButtonGround.png" />
+ <BundleResource Include="Resources\Phone\Item\AutoBackup.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBGSelected.png" />
<BundleResource Include="Resources\Phone\Item\NoFunction.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2.png" />
@@ -617,6 +625,7 @@
<BundleResource Include="Resources\Phone\Floor\FloorSelected.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" />
@@ -635,6 +644,7 @@
<BundleResource Include="Resources\Phone\Account\Logo_loginBG.png" />
<BundleResource Include="Resources\Phone\Account\Back.png" />
<BundleResource Include="Resources\Phone\Account\UnhidePwd.png" />
+ <BundleResource Include="Resources\Phone\Scene\Delaying.png" />
<BundleResource Include="Resources\Phone\Scene\Selected.png" />
<BundleResource Include="Resources\Phone\Scene\SceneIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\17Icon.png" />
--
Gitblit v1.8.0