2020-12-30-1

陈嘉乐

2020-12-30 81307af66465a6b5ba189b0fb9b347787f004a4e

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

@@ -17,6 +17,8 @@
        }
        /// 给徐梅刷新界面用的
        public Action<bool> action;
        // 刷新上报界面的Action
        public Action<string, bool> updateCurrentDoorlockActionTemp;
        ///第二块第一级父控件
        FrameLayout fLayout = new FrameLayout();
        ///第三块第一级父控件
@@ -130,8 +132,8 @@
            ///添加自动化图标的控件
            var addIconBtn = new Button
            {
                Width = Application.GetMinRealAverage(69),
                Height = Application.GetMinRealAverage(69),
                Width = Application.GetRealWidth(69),
                Height = Application.GetRealWidth(69),
                X = Application.GetRealWidth(890),
                Y = Application.GetRealHeight(60),
                UnSelectedImagePath = "ZigeeLogic/add.png",
@@ -221,23 +223,25 @@
                catch { }
            };

         //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
         //{
         //   var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
         //   if (DoorlockKey == key)
         //   {
         //      try
         //      {
         //         Application.RunOnMainThread(() =>
         //         {
         //            Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
         //            ModeView();
         //         });
         //      }
         //      catch { }
         //   }
         //};
      }
            updateCurrentDoorlockActionTemp = (DoorlockKey, _bool) =>
            {
                
                var key = Send.CurrentDoorLock.DeviceAddr;
                if (DoorlockKey == key)
                {
                    try
                    {
                        Application.RunOnMainThread(() =>
                        {
                            Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
                            ModeView();
                        });
                    }
                    catch { }
                }
            };
            UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += updateCurrentDoorlockActionTemp;
        }
        /// <summary>
        /// 常开模式开关切换图标界面
        /// </summary>
@@ -250,8 +254,8 @@
            {
                X = Application.GetRealWidth(395),
                Y = Application.GetRealHeight(92),
                Width = Application.GetMinRealAverage(294),
                Height = Application.GetMinRealAverage(294),
                Width = Application.GetRealWidth(294),
                Height = Application.GetRealWidth(294),
            };
            fLayout.AddChidren(modeIconBtn);
            if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
@@ -347,16 +351,15 @@
                        ///有时效性常开才显示时间条件文本
                        year = datetime.Year.ToString();//那一年
                        month = datetime.Month.ToString();//那一月
                        var d = int.Parse(datetime.ToString("dd"));//那一天
                        var h = int.Parse(datetime.ToString("HH"));//小时
                        int dayInt = (h + timeValue) / 24;//设置时间+当前系统时间是否超出24小时
                        hour = (h + timeValue) % 24;//设置时间+当前系统时间是否超出24小时剩下多少小时
                        days = d + dayInt;//当前系统天数+执行后天数
                        days = int.Parse(datetime.ToString("dd"));//那一天
                        hour = int.Parse(datetime.ToString("HH"));//小时
                        minute = datetime.Minute;//分钟
                        timeLong = 0;
                    }
                    else
                    {
                        ///读取系统时间
                        year = DateTime.Now.Year.ToString();//那一年
                        ///读取系统时间
                        year = DateTime.Now.Year.ToString();//那一年
                        month = DateTime.Now.Month.ToString();//那一月
                        var d = DateTime.Now.ToString("dd");//那一天
                        var h = int.Parse(DateTime.Now.ToString("HH"));//小时
@@ -403,8 +406,8 @@
                ///下一级菜单图标控件
                var nextIconBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(104),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealWidth(104),
                    X = Application.GetRealWidth(861),
                    Y = Application.GetRealHeight(17),
                    UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
@@ -588,7 +591,7 @@
                    selectedRow = logicRow;
                };
                a++;
                ///显示逻辑名称的控件

                ///显示逻辑名称的控件
                var nameBtn = new Button
                {
                    Height = Application.GetRealHeight(58),
@@ -604,8 +607,8 @@
                ///显示目标功能背景颜色的控件
                var typeBjBtn = new FrameLayout
                {
                    Width = Application.GetMinRealAverage(82),
                    Height = Application.GetMinRealAverage(82),
                    Width = Application.GetRealWidth(82),
                    Height = Application.GetRealWidth(82),
                    X = Application.GetRealWidth(17),
                    Y = Application.GetRealHeight(84),
                    Radius = (uint)Application.GetMinRealAverage(41),
@@ -615,16 +618,16 @@
                ///显示目标功能图标的控件
                var typeIconBtn = new Button
                {
                    Width = Application.GetMinRealAverage(58),
                    Height = Application.GetMinRealAverage(58),
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealWidth(58),
                    Gravity = Gravity.Center,
                };
                typeBjBtn.AddChidren(typeIconBtn);
                ///逻辑开关图标的控件
                var switchBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(63),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealWidth(63),
                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                    SelectedImagePath = "ZigeeLogic/logicopen.png",
                    X = Application.GetRealWidth(815),
@@ -704,19 +707,19 @@
                ///删除点击事件
                del.MouseUpEventHandler += (sender, e) =>
                {
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                    var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                    Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                    Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();

                    alert.ConfirmClickEvent += () =>

                    Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    alert.ConfirmClickEvent += () =>
                    {
                        Common.Logic.SoneLogicList.Remove(logic);
                        //logicRow.Parent.RemoveFromParent();
                        fLayoutLogic.RemoveFromParent();
                        Send.DelLogic(logic.LogicId);

                        Send.DelLogic(logic.LogicId);
                    };

                };

                };
            }
        }
        /// <summary>