2019-11-04-1

WJC

2019-11-04 e5f993f52e09eb46878baced83bb8492f147d41c

 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;
                                        }
                                    }
                                }
                            }

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

                        }
                        else