2020-04-28-1

陈嘉乐

2020-04-28 3272ca5b51e19f7f8a827b0f68400570a547fe60

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

@@ -155,7 +155,8 @@
                    TextSize = 15,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = "时效性常开设置",
                   // Text = "时效性常开设置",
                    TextID=MyInternationalizationString.timeSetSone,
                };
                modeFl.AddChidren(modeTextBtn);
                ///下一级菜单图标控件
@@ -168,6 +169,21 @@
                    UnSelectedImagePath = "ZigeeLogic/next.png",
                };
                modeFl.AddChidren(nextIconBtn);

                var clickBtn = new Button
                {
                    Y = Application.GetRealHeight(478),
                    X = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(138),
                    Width = Application.GetRealWidth(1022),
                };
                modeFl.AddChidren(clickBtn);


                clickBtn.MouseUpEventHandler += async (sender, e) =>
                {
                    var d = await SkipView.LockAddModifyLogic(12, Send.CurrentDoorLock);
                };
            }

            #endregion
@@ -202,7 +218,8 @@
                TextSize = 24,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                Text = "常开自动化",
                //Text = "常开自动化",
                TextID = MyInternationalizationString.openAutomationSone,
            };
            addLogicfL.AddChidren(addTextBtn);
            ///添加自动化图标的控件
@@ -217,18 +234,7 @@
            addLogicfL.AddChidren(addIconBtn);
            addIconBtn.MouseUpEventHandler += (sender, e) =>
            {
                ZigBee.Device.DoorLock doorLock = null;
                if (doorLock == null)
                {
                    ///防止抛异常

                    doorLock = new ZigBee.Device.DoorLock();
                }
                Send.CurrentDoorLock = doorLock;
                Common.Logic.LogicDviceList.Clear();
                if (Common.Logic.LogicDviceList.Count == 0)
                {
                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                }
               
                //读取系统当前时间：时-分
                //读取系统当前时间：时-分
                var h = DateTime.Now.ToString("HH");
@@ -245,7 +251,7 @@
                timeConditionsInfo.Add("StartMin", m);
                Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
                actionsInfo.Add("LinkType", 8);
                actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
                actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
                actionsInfo.Add("Epoint", "200");
                actionsInfo.Add("PassData", "055704010113");//默认门锁常关
                //new一个新逻辑对象；