2020-6-29-1

陈嘉乐

2020-06-29 9a6f9cfe3ddcf564261ddae823eda21d4539515c

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

@@ -1003,11 +1003,11 @@
                                                        {
                                                            if (tasks["Data1"] == "0")
                                                            {
                                                                state = Language.StringByID(MyInternationalizationString.close) + ";";
                                                                state += Language.StringByID(MyInternationalizationString.close) + ";";
                                                            }
                                                            else
                                                            {
                                                                state = Language.StringByID(MyInternationalizationString.open) + ";";
                                                                state += Language.StringByID(MyInternationalizationString.open) + ";";
                                                            }
                                                        }
                                                        break;
@@ -1038,11 +1038,11 @@
                                                        {
                                                            if (tasks["Data1"] == "0")
                                                            {
                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.close + ";";
                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
                                                            }
                                                            else
                                                            {
                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.open + ";";
                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
                                                            }
                                                        }
                                                        break;
@@ -1057,12 +1057,14 @@
                                                    case "8":
                                                        {
                                                            var intvalue = int.Parse(tasks["Data1"]);
                                                            var lightbrightnessvalue = intvalue / 100;
                                                            state += Language.StringByID(MyInternationalizationString.colorTemperature) + lightbrightnessvalue.ToString() + "K";
                                                            var colorTemperatureValue = 1000000/(intvalue *100);
                                                            state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
                                                        }
                                                        break;
                                                }
                                            }

                                            state=state.TrimEnd(';');//去掉最后那个";"
                                        }
                                        break;
                                }
@@ -1210,7 +1212,7 @@
                                        var nightlight = new Nightlight();
                                        UserView.HomePage.Instance.AddChidren(nightlight);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        nightlight.Show(deviceinof, true, actions);
                                        nightlight.Show(deviceinof, true, "logic", actions);
                                    }
                                }
                                break;