2020-05-06-3

陈嘉乐

2020-05-06 f11472b25796a83f70d526b13f2b0cba24c665f2

2020-05-06-3

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

@@ -1,14 +1,16 @@
<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/Method.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.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="397" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1223" Column="29" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="743" Column="24" />
      <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" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -20,7 +22,7 @@
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="Method.cs" selected="True" />
                    <Node name="LogicIfon.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">

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

Binary files differ

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

@@ -766,9 +766,43 @@

            if (Config.Instance.Home.IsVirtually)
            {
                Send.Zj(LogicView.IfString.Tag, Common.Logic.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)
                            {
                                CurrentLogic.LogicId = i;
                                Common.Logic.LogicList.Add(CurrentLogic);
                                d = true;
                                break;
                            }
                        }
                        if (d)
                        {
                            break;
                        }
                    }

                }
                else
                {
                    for (int j = 0; j < Common.Logic.LogicList.Count; j++)
                    {
                        if (j == Common.Logic.LogicList[j].LogicId)
                        {
                            Common.Logic.LogicList.RemoveAt(j);
                            Common.Logic.LogicList.Insert(j,CurrentLogic);
                            break;
                        }
                    }

                }

                //自动化逻辑列表
                Common.Logic.LogicList.Add(CurrentLogic);
            }
            else
            {