From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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..7bca522
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -48,6 +48,7 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
+ <MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -59,6 +60,9 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
+ <MtouchI18n>cjk</MtouchI18n>
+ <DeviceSpecificBuild>true</DeviceSpecificBuild>
+ <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -177,9 +181,12 @@
<BundleResource Include="Resources\Phone\Room\ItemUnSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected_Black.png" />
<BundleResource Include="Resources\Phone\Room\FavoriteRoom.png" />
+ <BundleResource Include="Resources\Phone\Room\Temperature.png" />
+ <BundleResource Include="Resources\Phone\Room\List.png" />
<BundleResource Include="Resources\Phone\Room\NoNameRoom.png" />
<BundleResource Include="Resources\Phone\Room\Room_Rectangle.png" />
<BundleResource Include="Resources\Phone\Room\RoomCardView_Name.png" />
+ <BundleResource Include="Resources\Phone\Room\Humidity.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
@@ -211,6 +218,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 +303,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" />
@@ -376,6 +390,7 @@
<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\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
<BundleResource Include="Resources\Phone\Item\DownLoad.png" />
@@ -401,10 +416,10 @@
<BundleResource Include="Resources\Phone\Item\Down.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected.png" />
<BundleResource Include="Resources\Phone\Item\Room.png" />
+ <BundleResource Include="Resources\Phone\Item\SeekBarIcon.png" />
<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\BottomShadow.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -424,10 +439,12 @@
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
<BundleResource Include="Resources\Phone\Item\NextSelected.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
+ <BundleResource Include="Resources\Phone\Item\PlusSign2Selected.png" />
<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\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" />
@@ -444,6 +461,7 @@
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
<BundleResource Include="Resources\Phone\Item\Floor.png" />
+ <BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -459,6 +477,7 @@
<BundleResource Include="Resources\Phone\Item\FunctionCardViewSelected.png" />
<BundleResource Include="Resources\Phone\Item\More.png" />
<BundleResource Include="Resources\Phone\Item\PswSettion.png" />
+ <BundleResource Include="Resources\Phone\Item\MinusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected1.png" />
<BundleResource Include="Resources\Phone\Item\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\Message.png" />
@@ -472,6 +491,7 @@
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.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\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
@@ -489,6 +509,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\ac.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\curtain.png" />
<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\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
@@ -499,6 +520,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\security1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\delay.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sunrise.png" />
+ <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\light_1.png" />
@@ -528,6 +550,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor40.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceunselectedbackgroundcolor.png" />
<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\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
@@ -617,6 +640,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,7 +659,9 @@
<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\Background.png" />
<BundleResource Include="Resources\Phone\Scene\SceneIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\17Icon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\4Icon.png" />
--
Gitblit v1.8.0