From 383e792a45268d220cb0e2bf1e9823ba451c428f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 29 三月 2021 18:30:53 +0800
Subject: [PATCH] 2021-03-29 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index dc2fb48..6a71454 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);
@@ -706,20 +708,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 +746,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,
};
--
Gitblit v1.8.0