2019-10-14-3

WJC

2019-10-14 9cac199733346374567e184395ae5c45c1b9e3c0

2019-10-14-3

修复楼层bug

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

@@ -1,28 +1,22 @@
<Properties StartupConfiguration="{7D463846-A275-4A2E-930F-B5EA7200CEAA}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.28D65668-1785-4D5D-8282-1EAD504036BE" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="375" Column="36" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="326" Column="62" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="680" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="688" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="327" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceAction.cs" Line="328" Column="26" />
      <File FileName="Shared/Common/Room.cs" Line="676" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="20" Column="48" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="373" Column="71" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="207" Column="23" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="199" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceAction.cs" Line="211" Column="44" />
      <File FileName="Shared/Common/Room.cs" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="1" Column="1" />
    </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="Phone" expanded="True" />
              </Node>
              <Node name="Properties" expanded="True" />
            </Node>
            <Node name="GateWay.Ios" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-shm

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs

@@ -205,6 +205,8 @@
                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                    {
                        roomhorizontalScrol.RemoveAll();
                        devicetypehorizontalScrol.RemoveAll();
                        middle.RemoveAll();
                        foolrname.Text = btnfoolrname.Text;
                        flMain.RemoveFromParent();
                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());

 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs

@@ -208,6 +208,8 @@
                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                    {
                        roomhorizontalScrol.RemoveAll();
                        devicetypehorizontalScrol.RemoveAll();
                        middle.RemoveAll();
                        foolrname.Text = btnfoolrname.Text;
                        flMain.RemoveFromParent();
                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());

 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs

@@ -207,6 +207,8 @@
                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                    {
                        roomhorizontalScrol.RemoveAll();
                        devicetypehorizontalScrol.RemoveAll();
                        middle.RemoveAll();
                        foolrname.Text = btnfoolrname.Text;
                        flMain.RemoveFromParent();
                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());

 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs

@@ -202,6 +202,8 @@
                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                    {
                        roomhorizontalScrol.RemoveAll();
                        devicetypehorizontalScrol.RemoveAll();
                        middle.RemoveAll();
                        foolrname.Text = btnfoolrname.Text;
                        flMain.RemoveFromParent();
                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());