1

wxr

2023-03-31 d53e6af2c5f17838fa79659614b15a2a1f383399

 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs

@@ -627,6 +627,8 @@
                        return;
                    }
                }
                // 2021-03-30 先清空，再重新统计
                timerTemp.whichDay = new List<int>();

                if (btnMonday.IsSelected == true && btnFriday.IsSelected == true && btnThursday.IsSelected == true && btnSunday.IsSelected == true && btnTuesday.IsSelected == true && btnSaturday.IsSelected == true && btnWednesday.IsSelected == true) {
                    timerTemp.timerType = TimerType.EveryDay;
@@ -708,20 +710,18 @@
                                string id = "";
                                if (!isEdit) {
                                    var jObject = JObject.Parse (revertObj.Data.ToString ());
                                     id = jObject ["id"].ToString ();
                                    id = jObject ["id"].ToString ();
                                    timerTemp.id = id;
                                }
                                this.RemoveFromParent ();
                                action (timerTemp);



                            } else if (revertObj.Code == "10107") {
                                new Alert ("", "Timer name already exists.", "Close").Show ();
                            } else {
                                //提示错误
                                SmartHome.Method method = new SmartHome.Method ();
                                if (revertObj.Data != null) {
                                    method.ShowGetTimerListErrorInfo (revertObj.Data.ToString ());
                                }
                                IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);

                            }
                        });
                    } catch (Exception ex) {
@@ -1163,17 +1163,23 @@

                                        };
                                        deviceRowView.AddChidren (fanLevel);
                                        //刚开始默认显示1档
                                        value = "2";
                                        SetFanButtonState (btnFanLevel, value);

                                        fanLevel.ProgressChanged += (sender, e) => {
                                            if (!btnChoose.IsSelected) {
                                                btnChoose.IsSelected = true;
                                            }
                                            value = e.ToString ();
                                            if (value == "0") {
                                                btnFanLevel.Text = "OFF";
                                            } else {
                                                btnFanLevel.Text = value;
                                            }
                                            //if (value == "0") {
                                            //    btnFanLevel.Text = "OFF";
                                            //} else {
                                            //    btnFanLevel.Text = value;
                                            //}

                                            SetFanButtonState (btnFanLevel, value);

                                            DeviceDateFun (btnChoose.Tag as Function, value, btnChoose.IsSelected);
                                        };

@@ -1192,11 +1198,12 @@
                                                        var fundev = dev.attributes [a];
                                                        if (fundev.key == "fan_speed_percent") {
                                                            fanLevel.Progress = int.Parse (fundev.value);
                                                            if (fundev.value == "0") {
                                                                btnFanLevel.Text = "OFF";
                                                            } else {
                                                                btnFanLevel.Text = fundev.value;
                                                            }
                                                            //if (fundev.value == "0") {
                                                            //    btnFanLevel.Text = "OFF";
                                                            //} else {
                                                            //    btnFanLevel.Text = fundev.value;
                                                            //}
                                                            SetFanButtonState (btnFanLevel, fundev.value);
                                                        }
                                                    }
                                                }
@@ -1226,6 +1233,23 @@
                }
            });
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="btnFanLevel"></param>
        /// <param name="value"></param>
        void SetFanButtonState (Button btnFanLevel, string value)
        {
            if (btnFanLevel == null) return;

            if (value == "0") {
                btnFanLevel.Text = "OFF";
            } else {
                btnFanLevel.Text = value;
            }
        }

        /// <summary>
        /// 设备数据转换
        /// </summary>