From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 31 三月 2023 10:04:58 +0800 Subject: [PATCH] 1 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 80 +++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 22 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs index 6046110..0ef1cff 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs @@ -451,7 +451,7 @@ Height = Application.GetRealHeight (60), TextAlignment = TextAlignment.CenterLeft, TextColor = SkinStyle.Current.TextColor1, - Text = "ALL", + Text = timerTemp.RoomName, }; roomContenView.AddChidren (btnRoomChoose); @@ -485,7 +485,7 @@ MainPage.Loading.Start ("Please wait..."); SmartHome.Method mMthod = new SmartHome.Method (); - var devList = mMthod.GetRoomDeviceList ("ALL"); + var devList = mMthod.GetRoomDeviceList (timerTemp.RoomName); InitDeviceListView (devList); #region -----Room 鐐瑰嚮浜嬩欢 btnRoomChoose.MouseUpEventHandler += (sender, e) => { @@ -540,6 +540,8 @@ roomListView.AddChidren (btnLine); btnRoomNameChoose.MouseUpEventHandler += (sd, ds) => { + //鍒囨崲鎴块棿娓呯┖涔嬪墠閫夋嫨鏁版嵁; + selectedDeviceList.Clear (); btnRoomChoose.Text = (sd as Button).Text; //鑾峰彇璁惧鍒楄〃 var deviceList = mMthod.GetRoomDeviceList (btnRoomChoose.Text); @@ -625,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; @@ -706,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) { @@ -746,16 +748,22 @@ }; dialog.AddChidren (chooseTimeBodyView); - var chooseTime = new UIPickerView () { + var timeView = new FrameLayout () { Y = Application.GetRealHeight (1136 - 420 - 90), Height = Application.GetRealHeight (420), - BackgroundColor = 0xFFD7D7D7, - //BackgroundColor = SkinStyle.Current.ViewColor, + BackgroundColor = SkinStyle.Current.ViewColor, }; - chooseTimeBodyView.AddChidren (chooseTime); + chooseTimeBodyView.AddChidren (timeView); + + var chooseTime = new UIPickerView () { + Height = Application.GetRealHeight (400), + BackgroundColor = SkinStyle.Current.Transparent, + Gravity = Gravity.CenterVertical + }; + timeView.AddChidren (chooseTime); var bottomView = new FrameLayout () { - Y = chooseTime.Bottom, + Y = timeView.Bottom, Height = Application.GetRealHeight (90) + 1, BackgroundColor = 0xFFD7D7D7, }; @@ -1119,6 +1127,7 @@ TextColor = SkinStyle.Current.TextColor1, SelectedTextColor = SkinStyle.Current.TextColor1, Text = "OFF", + //Text = "", TextAlignment = TextAlignment.CenterLeft, }; deviceRowView.AddChidren (btnFanLevel); @@ -1154,12 +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; + //} + + SetFanButtonState (btnFanLevel, value); + DeviceDateFun (btnChoose.Tag as Function, value, btnChoose.IsSelected); }; @@ -1177,15 +1197,14 @@ for (int a = 0; a < dev.attributes.Count; a++) { var fundev = dev.attributes [a]; if (fundev.key == "fan_speed_percent") { - // if (fundev.value == "0") { - // btnLevel.Text = "OFF"; - // } else { - fanLevel.Progress = int.Parse (fundev.value); - // } + fanLevel.Progress = int.Parse (fundev.value); + //if (fundev.value == "0") { + // btnFanLevel.Text = "OFF"; + //} else { + // btnFanLevel.Text = fundev.value; + //} + SetFanButtonState (btnFanLevel, fundev.value); } - - - } } } catch { } @@ -1214,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> -- Gitblit v1.8.0