2020-03-11-1

WJC

2020-03-11 8ee8336485e98ba9722c5feb1cafacd93c6b5c1a

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

@@ -9,7 +9,7 @@
    {
        public AddCondition()
        {
            Tag = "LockLogic";
            Tag = "Logic";
        }
        Button selectedIcon = new Button();
        VerticalRefreshLayout middle;
@@ -17,62 +17,16 @@

        public void Show()
        {
            #region  最上面的布局代码
            var topRowLayout = new RowLayout
            {
                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
                Height = Application.GetRealHeight(184),
                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
            };
            this.AddChidren(topRowLayout);

            var titleName = new Button
            {
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
                IsBold = true,
                //Text = "选择用户",
            };
            topRowLayout.AddChidren(titleName);

            var clickBtn = new Button
            {
                Width = Application.GetRealWidth(81 + 51),
                Height = Application.GetRealHeight(58 + 40),
                Y = Application.GetRealHeight(98 - 40),
            };
            topRowLayout.AddChidren(clickBtn);
            clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                RemoveFromParent();
            };

            var back = new Button
            {
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealHeight(51),
                X = Application.GetRealWidth(81),
                Y = Application.GetRealHeight(98),
                //Gravity = Gravity.CenterVertical;
                UnSelectedImagePath = "ZigeeLogic/back.png",
            };
            topRowLayout.AddChidren(back);
            back.MouseDownEventHandler += (sender, e) =>
            {
                RemoveFromParent();
            };

            
            #region  上面的布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
            view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
            view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
            #endregion

            middle = new VerticalRefreshLayout
            {
                Y = topRowLayout.Bottom,
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
@@ -325,29 +279,6 @@
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userIdmode.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = strname + "ID" + userIdmode.UserId;
                }

                var doorlockSelected = new Button
                {
@@ -373,12 +304,36 @@
                        //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                        attriButeId = userIdmode.OpenMode.ToString();
                    attriButeData2 = userIdmode.UserId;
                    modeName = doorlockBtn.Text;
                    modeName = userIdmode.ModeName;
                };
                doorlockRow.MouseUpEventHandler += doorlockclick;
                doorlockBtn.MouseUpEventHandler += doorlockclick;
                doorlockSelected.MouseUpEventHandler += doorlockclick;
                doorlockfra.MouseUpEventHandler += doorlockclick;

                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userIdmode.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = userIdmode.UserId + strname;
                }
                ///显示之前的状态
                if (conditionsIndex != -1)
                {
@@ -409,8 +364,7 @@
                lockConditionsInfo.Add("Range", "0");
                var accounts = new Dictionary<string, string>();
                accounts.Add("Type", "1");
                accounts.Add("Account", Config.Instance.Guid);
                accounts.Add("AccountName", membershipIfon.UserName + modeName);//用来显示名称
                accounts.Add("Account", membershipIfon.UserName + modeName);
                accounts.Add("UserId", attriButeData2);
                if (SelectedLockStatus != "")
                {