2020-7-1-2

陈嘉乐

2020-07-01 2ec9898778d3beda89278e2a53ac0e68b3035d29

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

@@ -12,7 +12,7 @@
        /// 选中该设备功能作为条件或者目标的视图方法
        /// </summary>
        /// <param name="common">Common.</param>
        public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str)
        public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str,int intValue)
        {
            #region  -------界面布局部分
            //不让当前界面滑动
@@ -99,33 +99,49 @@
            {
                if (_if[0]== "condition")
                {
                    foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
                    var deviceinfo = Common.Logic.CurrentLogic.Conditions[intValue];
                    if (deviceinfo["Type"] == "1")
                    {
                        if (deviceinfo["Type"] == "1")
                        if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
                        {
                            if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
                            {
                                devices = deviceinfo;
                                break;
                            devices = deviceinfo;

                            }
                        }
                    }
                    //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
                {
                    foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
                    var deviceinfo = Common.Logic.CurrentLogic.Actions[intValue];
                    if (deviceinfo["LinkType"].ToString() == "0")
                    {
                        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;
                            }
                        if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
                        {
                            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
@@ -299,7 +315,6 @@
                        Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        int timeValue = 0;
                        int progressValue = 0;
                        ///点击确认事件
                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
                        {
@@ -448,7 +463,7 @@
                                            var illumination = new Illumination();
                                            UserView.HomePage.Instance.AddChidren(illumination);
                                            UserView.HomePage.Instance.PageIndex += 1;
                                            illumination.Show(common, takebackView.titleBtn.Text, progressValue, true);
                                            illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
                                        }
                                        else
                                        {
@@ -470,7 +485,7 @@
                                        var illumination = new Illumination();
                                        UserView.HomePage.Instance.AddChidren(illumination);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        illumination.Show(common,takebackView.titleBtn.Text, progressValue, false);
                                        illumination.Show(common,takebackView.titleBtn.Text, 0, false);

                                    };
                                }
@@ -513,10 +528,7 @@


                            }
                            else if (devices["AttriButeId"] == "0")
                            {
                                progressValue = int.Parse(devices["AttriButeData1"]);
                            }
                            
                        }

                    }