From ba30f4585670341ef85d38fa6545d8e037c6abcd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 17:08:48 +0800
Subject: [PATCH] 2021-3-26-3
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index dc2fb48..fd52b68 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);
@@ -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,
};
--
Gitblit v1.8.0