合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 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" />
@@ -412,6 +416,7 @@
      <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" />
@@ -504,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" />
@@ -514,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" />