Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -2,41 +2,48 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/DeviceUI.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Account/AccountLogin.cs" Line="604" Column="18" />
      <File FileName="Shared/R.cs" Line="667" Column="22" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="574" Column="1" />
      <File FileName="GateWay.Droid/Application.cs" />
      <File FileName="Shared/Phone/Device/Account/AccountRegister.cs" />
      <File FileName="Shared/Phone/Device/Account/AccountRegisterSuccess.cs" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" />
      <File FileName="Shared/R.cs" Line="546" Column="15" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
      <File FileName="Shared/Phone/Device/AC/ACControl.cs" />
      <File FileName="Shared/Phone/Device/Category/CategorySceneSelectDevice.cs" />
      <File FileName="Shared/Common/DeviceUI.cs" Line="415" Column="1" />
      <File FileName="Shared/Phone/Device/AC/ACControlBase.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/AC.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
              <Node name="Properties" expanded="True" />
              <Node name="Resources" expanded="True" />
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="Item" expanded="True" />
                  <Node name="Light" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="GateWay.Ios" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True">
                <Node name="ResponseEntity" expanded="True" />
                <Node name="DeviceUI.cs" selected="True" />
              </Node>
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Account" expanded="True" />
                  <Node name="AC" expanded="True" />
                  <Node name="Category" expanded="True" />
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Curtain" expanded="True" />
                  <Node name="Light" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
              <Node name="R.cs" selected="True" />
            </Node>
          </Node>
        </State>
@@ -46,12 +53,7 @@
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs" relfile="Shared/Phone/Device/Account/AccountRegisterSuccess.cs" line="114" column="1" />
      <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs" relfile="Shared/Phone/Device/Account/AccountLogin.cs" line="545" column="1" />
      <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs" relfile="Shared/Phone/Device/Account/AccountLogin.cs" line="521" column="1" />
      <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Room.cs" relfile="Shared/Common/Room.cs" line="286" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>