陈嘉乐
2020-06-29 9a6f9cfe3ddcf564261ddae823eda21d4539515c
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -16,7 +16,7 @@
        string selectedDeviceStatus = "";
        Dictionary<string, object> actionsInfo = null;
        List<Dictionary<string, string>> TaskList = null;
        public void Show(CommonDevice common, bool edit, Dictionary<string, object> editdeviceActionInfo = null)
        public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null)
        {
            actionsInfo = editdeviceActionInfo;
            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
@@ -91,10 +91,22 @@
                    }
                }
                if (str_if == "logic")
                {
                var logicCommunalPage = new LogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
                }
                else if (str_if == "lockaction")
                {
                    //门锁联动事件
                    var lockLogicCommunalPage = new DoorLockLogic.LockLogicCommunalPage();
                    UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    lockLogicCommunalPage.Show(() => { });
                }
            };
@@ -146,7 +158,7 @@
                                    case "8":
                                        {
                                            var intvalue = int.Parse(tasks["Data1"]);
                                            var lightbrightnessvalue = intvalue / 100;
                                            var lightbrightnessvalue = 1000000 / (intvalue * 100);
                                            colorTemperatureView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "K";
                                        }
                                        break;
@@ -336,7 +348,7 @@
                        EventHandler<int> progressclick = (sender, e) =>
                        {
                            selectedDeviceStatus = "8";
                            var lightbrightnessvalue = (100 * horizontalSeekBarVol.Progress);
                            var lightbrightnessvalue = 1000000 / (100 * horizontalSeekBarVol.Progress);
                            Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
                            DicValue("8", brightnessDictionary);
                            status = horizontalSeekBarVol.Progress.ToString() + "K";
@@ -352,7 +364,7 @@
                                if (value["TaskType"] == "8")
                                {
                                    var intvalue = int.Parse(value["Data1"]);
                                    var lightbrightnessvalue = intvalue / 100;
                                    var lightbrightnessvalue = 1000000 / (intvalue * 100);
                                    horizontalSeekBarVol.Progress = lightbrightnessvalue;
                                    break;
                                }