2019-11-04-1

WJC

2019-11-04 e5f993f52e09eb46878baced83bb8492f147d41c

2019-11-04-1

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

@@ -2,25 +2,32 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <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/Category/Category.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="793" Column="55" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="45" Column="31" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1929" Column="22" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="17" Column="33" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="905" Column="14" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="718" Column="47" />
    </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="Category" expanded="True">
                    <Node name="Category.cs" selected="True" />
                  </Node>
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="LogicCommunalPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>

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

Binary files differ

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

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

@@ -1413,6 +1413,7 @@
                        UserView.HomePage.Instance.AddChidren(memberList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        MemberList.action += () => { flMain.RemoveFromParent(); };
                        MemberList.edit = false;
                        memberList.Show(common);
                    }
                    break;

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

@@ -341,8 +341,28 @@
                {
                    if (conditionsIndex == -1)
                    {
                        bool add = false;
                        for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
                        {
                            if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
                            {
                                if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == Send.CurrentDoorLock.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == Send.CurrentDoorLock.DeviceEpoint.ToString()))
                                {
                                    if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == lockConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == lockConditionsInfo["AttriButeData2"])
                                    {
                                        add = true;
                                        break;
                                    }
                                }
                            }
                        }
                        
                        if (!add)
                        {
                        Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
                    }

                    }
                    else
                    {
                        Common.Logic.CurrentLogic.Conditions.RemoveAt(conditionsIndex);

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

@@ -541,7 +541,7 @@
                                        UserView.HomePage.Instance.AddChidren(memberList);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        MemberList.edit = true;
                                        memberList.Show(deviceinof);
                                        memberList.Show(deviceinof, conditions);
                                    }

                                };

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

@@ -9,6 +9,10 @@
{
    public class MemberList : FrameLayout
    {
        public MemberList()
        {
            Tag = "Logic";
        }
        Button selectedIcon = new Button();
        public static Action action;
        public static bool edit=false;
@@ -17,6 +21,7 @@

        public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
        {
         
            if (!edit)
            {
                deviceConditionsInfo.Add("Type", "1");
@@ -312,14 +317,14 @@
                        doorlockBtn.MouseUpEventHandler += doorlockclick;
                        doorlockSelected.MouseUpEventHandler += doorlockclick;
                        doorlockfra.MouseUpEventHandler += doorlockclick;
                        if (edit)
                        if (edit&&editdeviceConditionsInfo!=null)
                        {
                            if (editdeviceConditionsInfo["AttriButeData2"] == userifon.OpenMode.ToString())
                            deviceConditionsInfo = editdeviceConditionsInfo;
                            if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
                            {
                                selectedIcon.Visible = false;
                                selectedIcon = doorlockSelected;
                                doorlockSelected.Visible = true;

                            }
                          
                        }
@@ -329,9 +334,10 @@

                    Btncomplete.MouseUpEventHandler += (sender3, e3) =>
                    {
                    
                        if (SelectedDeviceStatuscondition != "")
                        {

                            bool add = false;
                            for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
                            {
                                if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
@@ -350,14 +356,17 @@
                                                    Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
                                                }
                                            }
                                            return;
                                            add = true;
                                            break;
                                        }
                                    }
                                }
                            }

                            if (!add)
                            {
                            Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
                            Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
                            }

                        }
                        else