Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -1,18 +1,18 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.56440ECD-0D65-4AAC-BE0E-D340F917B617" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/CategoryAddScene.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/DeviceUI.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="706" Column="1" />
      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" Line="408" Column="15" />
      <File FileName="Shared/Common/Room.cs" />
      <File FileName="Shared/Common/House.cs" />
      <File FileName="Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Room/RoomCommon.cs" />
      <File FileName="Shared/R.cs" />
      <File FileName="Shared/R.cs" Line="546" Column="15" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/CommonForm/DeviceInfoRow.cs" />
      <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">
@@ -22,28 +22,27 @@
              <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="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Common" expanded="True">
                <Node name="DeviceUI.cs" selected="True" />
              </Node>
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="AC" expanded="True" />
                  <Node name="Category" expanded="True">
                    <Node name="CategoryAddScene.cs" selected="True" />
                  </Node>
                  <Node name="Category" expanded="True" />
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Curtain" expanded="True" />
                  <Node name="Light" expanded="True" />
                  <Node name="Room" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Device" expanded="True">
                    <Node name="Curtain" expanded="True" />
                  </Node>
                  <Node name="Residence" 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>
          </Node>