From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs | 77 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
index 005e279..26b318e 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
@@ -137,10 +137,10 @@
tList.Add($"{i} {Language.StringByID(R.MyInternationalizationString.Second)}");
}
//1-60绉�
- PickerView.Show(tList, (obj) =>
- {
- targetDevice.DelayTime = int.Parse(obj.Split(' ')[0]);
- }, Language.StringByID(R.MyInternationalizationString.Confrim));
+ //PickerView.Show(tList, (obj) =>
+ //{
+ //targetDevice.DelayTime = int.Parse(obj.Split(' ')[0]);
+ //}, Language.StringByID(R.MyInternationalizationString.Confrim));
};
devRight.MouseUpEventHandler += (sender, e) =>
{
@@ -202,10 +202,10 @@
//鏃堕棿闂撮殧
else if (targetDevice.Type == 1)
{
- var delayTimeView = new CategorySceneSelectedDelayTime();
+ var delayTimeView = new SelectDelayTime();
UserView.HomePage.Instance.AddChidren(delayTimeView);
UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
+ //delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
}
//鍦烘櫙
else if (targetDevice.Type == 2)
@@ -236,7 +236,19 @@
{
CurrentRoom = room;
#region topview
- var topBGView = new FrameLayout()鈥� {鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor鈥� };鈥� AddChidren(topBGView);鈥� var topView = new FrameLayout()鈥� {鈥� Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,鈥� };鈥� AddChidren(topView);
+ var topBGView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor
+ };
+ AddChidren(topBGView);
+ var topView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
+ };
+ AddChidren(topView);
var title = new Button()
{
@@ -249,7 +261,16 @@
};
topView.AddChidren(title);
- var back = new Button()鈥� {鈥� X = Application.GetRealWidth(CommonPage.Navigation_X),鈥� Height = Application.GetMinRealAverage(110),鈥� Width = Application.GetMinRealAverage(110),鈥� UnSelectedImagePath = "Item/Back.png",鈥� SelectedImagePath = "Item/BackSelected.png",鈥� Gravity = Gravity.CenterVertical鈥� };鈥� topView.AddChidren(back);
+ var back = new Button()
+ {
+ X = Application.GetRealWidth(CommonPage.Navigation_X),
+ Height = Application.GetMinRealAverage(110),
+ Width = Application.GetMinRealAverage(110),
+ UnSelectedImagePath = "Item/Back.png",
+ SelectedImagePath = "Item/BackSelected.png",
+ Gravity = Gravity.CenterVertical
+ };
+ topView.AddChidren(back);
back.MouseUpEventHandler += (sender, e) =>
{
this.RemoveFromParent();
@@ -370,46 +391,44 @@
Y = zoneFL.Bottom,
Height = Application.GetRealHeight(170),
};
- midFL.AddChidren(targetFL);
- var targetTip = new Button()
+
+ var targetAddFL = new FrameLayout()
{
- X = Application.GetRealWidth(50),
- Height = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(300),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = 12,
- TextColor = ZigbeeColor.Current.GXCButtonTipColor,
- //TextID = R.MyInternationalizationString.BelongModel,
+ Y = zoneFL.Bottom,
+ Height = Application.GetRealHeight(170),
};
- //targetFL.AddChidren(targetTip);
+ midFL.AddChidren(targetFL);
+
var target = new Button()
{
X = Application.GetRealWidth(50),
- //Y = deviceNameTip.Bottom,
Height = Application.GetRealHeight(100) - 1,
Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
TextSize = 20,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextID=R.MyInternationalizationString.AddRoomScentTargetAction,
+ TextID=R.MyInternationalizationString.AddScentTargetAction,
Gravity=Gravity.CenterVertical
};
- targetFL.AddChidren(target);
+ targetAddFL.AddChidren(target);
var targetAdd = new Device.CommonForm.SelectedStatuButton()
{
X = Application.GetRealWidth(CommonPage.AppRealWidth - 150),
- Width = Application.GetMinRealAverage(110),
- Height = Application.GetMinRealAverage(110),
+ Width = Application.GetMinRealAverage(72),
+ Height = Application.GetMinRealAverage(72),
UnSelectedImagePath = "Item/Add.png",
SelectedImagePath="Item/AddSelected.png",
Gravity = Gravity.CenterVertical
};
targetFL.AddChidren(targetAdd);
+
var targetLine = new Button()
{
Y = targetFL.Height-1,
Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCLineColor
+ Width=Application.GetRealWidth(965),
+ Gravity=Gravity.CenterHorizontal,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
};
targetFL.AddChidren(targetLine);
@@ -422,7 +441,7 @@
};
midFL.AddChidren(TargetListScrolView);
- confirmBtn = new CommonForm.CompleteButton()
+ confirmBtn = new CommonForm.CompleteButton(1,2,3)
{
TextID = R.MyInternationalizationString.ConfirmAdd,
};
@@ -449,9 +468,9 @@
Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
localPic.Show();
- localPic.action = () =>
+ localPic.action = (imgPath) =>
{
- backGround.UnSelectedImagePath = ImagePath;
+ backGround.UnSelectedImagePath = imgPath;
IconType = 0;
};
@@ -685,10 +704,10 @@
selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
- var delayTimeView = new CategorySceneSelectedDelayTime();
+ var delayTimeView = new SelectDelayTime();
UserView.HomePage.Instance.AddChidren(delayTimeView);
UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show(-1,"",-1,true);
+ //delayTimeView.Show(-1,"",-1,true);
};
cancelBtn.MouseUpEventHandler += (send, ee) =>
{
--
Gitblit v1.8.0