请合并最新代码（优化设备不支持的功能）

xm

2019-12-20 3291885285dfd5d4f665c20676307878dc3163bc

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,39 +1,58 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.8KE0219611017704" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs">
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs">
    <Files>
      <File FileName="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" Line="539" Column="5" />
      <File FileName="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs" />
      <File FileName="Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/Panel.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/BindObj.cs" />
      <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" />
      <File FileName="Shared/Common/Room.cs" Line="208" Column="30" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="153" Column="18" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="585" Column="111" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" Line="298" Column="1" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2257" Column="1" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs" Line="288" Column="47" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs" Line="160" Column="1" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs" Line="160" Column="1" />
      <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" Line="454" Column="18" />
      <File FileName="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs" Line="542" Column="25" />
      <File FileName="Home.Ios/Main.cs" Line="12" Column="1" />
      <File FileName="Home.Ios/Main.cs" Line="12" Column="1" />
      <File FileName="Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs" Line="106" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" selected="True">
              <Node name="References" expanded="True" />
              <Node name="Packages" expanded="True" />
            <Node name="Home.IOS" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="UserCenter" expanded="True">
                  <Node name="Device" expanded="True">
                    <Node name="Bind" expanded="True">
                      <Node name="ChooseKeyModePage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.39ab2514bebabc070f31fc17888b031af9b437ba" />
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <DisabledProjects>
    <String>GateWay.Ios/GateWay.Ios.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/hdl/Desktop/HomeApp20191206/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" relfile="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" line="547" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/HomeApp20191206/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" relfile="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" line="533" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/HomeApp20191206/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" relfile="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" line="694" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/HomeApp20191206/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" relfile="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" line="554" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191206/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs" relfile="Shared/Phone/ZigBee/Device/DoorLock.cs" line="2253" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191206/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs" relfile="Shared/Phone/ZigBee/Device/DoorLock.cs" line="2248" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" relfile="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" line="146" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191206/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" relfile="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" line="148" column="1" />
      <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191206/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs" relfile="Shared/Phone/ZigBee/Device/DoorLock.cs" line="2258" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />