2020-05-07-1

陈嘉乐

2020-05-07 caf9d97d5c445fa459b777c5569625bbfd0ff5fc

2020-05-07-1

虚拟设备

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

@@ -1,42 +1,17 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="802" Column="43" />
      <File FileName="Shared/Phone/ZigBee/Common/Config.cs" Line="138" Column="29" />
      <File FileName="Shared/Common/House.cs" Line="41" Column="47" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="457" Column="46" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1223" Column="28" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="850" Column="26" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1212" Column="47" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="38" Column="30" />
      <File FileName="Shared/Phone/ZigBee/Common/Config.cs" />
      <File FileName="Shared/Common/House.cs" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="833" Column="74" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="LogicIfon.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />

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

Binary files differ

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

@@ -766,11 +766,18 @@

            if (Config.Instance.Home.IsVirtually)
            {
                if (Common.Logic.LogicList.Count == 0)
                {
                    CurrentLogic.LogicId = 1;
                    Common.Logic.LogicList.Add(CurrentLogic);
                }

                if (CurrentLogic.LogicId == 0)
                {
                    bool d = false;
                    for (int i = 1; i < 50; i++)
                    {
                       
                        for (int j = 0; j < Common.Logic.LogicList.Count; j++)
                        {
                            if (i != Common.Logic.LogicList[j].LogicId)
@@ -792,7 +799,7 @@
                {
                    for (int j = 0; j < Common.Logic.LogicList.Count; j++)
                    {
                        if (j == Common.Logic.LogicList[j].LogicId)
                        if (CurrentLogic.LogicId == Common.Logic.LogicList[j].LogicId)
                        {
                            Common.Logic.LogicList.RemoveAt(j);
                            Common.Logic.LogicList.Insert(j,CurrentLogic);