2020-09-02-4

陈嘉乐

2020-09-02 652243206427f35a256400a149a1734085824cb9

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

@@ -69,8 +69,9 @@
                ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                ProgressTextSize = 9,//显示百分比字体大小12
                SeekBarViewHeight = Application.GetRealHeight(5),//进度条的高度10
                ProgressTextSize = 12,//显示百分比字体大小12
                SeekBarViewHeight = Application.GetRealHeight(6),//进度条的高度10
                SeekBarPadding = 30,
            };
            #endregion
            #endregion
@@ -108,17 +109,6 @@

                        }
                    }
                    //foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
                    //{
                    //    if (deviceinfo["Type"] == "1")
                    //    {
                    //        if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
                    //        {
                    //            devices = deviceinfo;
                    //            break;
                    //        }
                    //    }
                    //}
                }
                else
                {
@@ -131,17 +121,7 @@
                            TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
                        }
                    }
                    //foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
                    //{
                    //    if (deviceinfo["LinkType"].ToString() == "0")
                    //    {
                    //        if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
                    //        {
                    //            TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
                    //            break;
                    //        }
                    //    }
                    //}
                  
                }
            }
            #endregion
@@ -329,7 +309,7 @@
                                closeView.selectedIconBtn.Visible = true;
                            }
                            Send.dictionary(deviceConditionsInfo, "Range", "5");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//支持1和2;1+2=3
                        };
                        ///点击取消事件
                        closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -339,8 +319,8 @@
                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            openView.selectedIconBtn.Visible = false;
                            closeView.selectedIconBtn.Visible = true;
                            Send.dictionary(deviceConditionsInfo, "Range", "1");
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                            Send.dictionary(deviceConditionsInfo, "Range", "8");//1
                            Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
                            if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
                            {
                                SelectedDeviceStatus = "";
@@ -510,13 +490,13 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices.ContainsKey("IgnoreTime"))
                                if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
                                {
                                    timeValue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices["AttriButeData1"] == "1")
                                    if (devices["Range"]== "5")
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;