2020-05-15-1

陈嘉乐

2020-05-15 d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36

2020-05-15-1

 .DS_Store

Binary files differ

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

@@ -1,23 +1,13 @@
<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/DoorLockLogic/LockLogicList.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="728" Column="34" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="503" Column="76" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1040" Column="27" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="282" Column="114" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="850" Column="35" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="392" Column="79" />
      <File FileName="Shared/Common/Logic.cs" Line="46" Column="33" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs" Line="543" Column="18" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="25" Column="23" />
      <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="21" Column="23" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="300" Column="32" />
      <File FileName="Shared/Phone/UserCenter/Residence/ResidenceListForm.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="267" Column="35" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="101" Column="65" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="323" Column="92" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="52" Column="62" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="63" Column="61" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="618" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="891" Column="60" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -27,16 +17,17 @@
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="LockLogicList.cs" selected="True" />
                    </Node>
                    <Node name="LogicView" expanded="True" />
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="SoneLogicList.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Residence" expanded="True" />
                  <Node name="CommonBase" expanded="True">
                    <Node name="Controls" expanded="True">
                      <Node name="MessageControls" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>

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

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -108,12 +108,10 @@
                        //        //查找是否是那个门锁；
                        //        //如果不是该门锁联动事件不显示出来;
                        //        yes = false;

                        //    }
                        //    else
                        //    {
                        //        yes = true;

                        //    }
                        //    //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
                        //    //{

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

@@ -163,6 +163,9 @@
                actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
                actionsInfo.Add("Epoint", "200");
                actionsInfo.Add("PassData", "055704010113");//默认门锁常关
                Dictionary<string, string> accounts = new Dictionary<string, string>();
                accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁;
                accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
                //new一个新逻辑对象；
                //新增门锁常开模式自动化入口；
                Common.Logic.CurrentLogic = new Common.Logic();
@@ -171,6 +174,7 @@
                Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
                Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//添加条件
                Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
                Common.Logic.CurrentLogic.Accounts.Add(accounts);
                var oneLogic = new OneLogic();
                UserView.HomePage.Instance.AddChidren(oneLogic);
                UserView.HomePage.Instance.PageIndex += 1;
@@ -371,7 +375,6 @@
                 {

                     LogicView.TipView.ShowConfrimTip(() =>

                     {///再次确认
                        LogicView.TipView.ShowInputTip(true, async (str) =>
                         {///确认发送命令
@@ -460,11 +463,14 @@
                            {
                                continue;
                            }
                            if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
                            {
                            Common.Logic.SoneLogicList.Add(logic);
                        }
                    }
                }
            }
            }
            catch (Exception e)
            {
                var dd = e.Message;