From c26d742cef5ac268ca902b6605512b6476a26bc2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 05 十二月 2019 15:22:27 +0800
Subject: [PATCH] 2019.12.5
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 138 +++++++---------------------------------------
1 files changed, 21 insertions(+), 117 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 6747f9f..b6746a7 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -476,7 +476,7 @@
var tempHomeBtn = send as Button;
if (Config.Instance.HomeFilePathList.Count == 0)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
+ var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
alert.ResultEventHandler += (senderHouse, eHouse) =>
{
@@ -503,7 +503,7 @@
Y = Application.GetRealHeight(248),
Width = Application.GetMinRealAverage(449),
Height = Application.GetMinRealAverage(478),
- UnSelectedImagePath = "Item/SelectHouse"
+ UnSelectedImagePath = "Item/SelectHouse.png"
};
closeBGview.AddChidren(bg);
@@ -511,8 +511,8 @@
{
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(271),
- Height = Application.GetRealHeight(449),
- Width = Application.GetRealWidth(440),
+ Height = Application.GetMinRealAverage(449),
+ Width = Application.GetMinRealAverage(440),
Radius = CommonPage.BigFormRadius,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
@@ -624,7 +624,7 @@
//娑堟伅
messageBtn.MouseUpEventHandler += (send, e) =>
{
-
+
};
#endregion
@@ -650,114 +650,12 @@
Room.CurrentRoom = rList[0];
foreach (var room in rList)
{
- var roomBackView = new FrameLayout()
+ var roomView = new Device.CommonForm.RoomView(0, 0);
+ roomPageView.AddChidren(roomView);
+ roomView.Init(room);
+ roomView.action += () =>
{
- Width = Application.GetRealWidth(717),
- Height=Application.GetRealHeight(478)
- };
- roomPageView.AddChidren(roomBackView);
-
- var roomImg = new ImageView()
- {
- ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage),
- Radius = (uint)Application.GetRealHeight(17)
- };
- roomBackView.AddChidren(roomImg);
-
- var roomNameBackground = new FrameLayout
- {
- X = Application.GetRealWidth(29),
- Y = Application.GetRealHeight(282),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(80),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
- };
- roomBackView.AddChidren(roomNameBackground);
- roomNameBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);
-
- var roomName = new Button()
- {
- X = Application.GetRealWidth(5),
- Width = Application.GetRealWidth(190),
- Text = room.Name,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- };
- roomNameBackground.AddChidren(roomName);
-
-
- var roomTemperatureBackground = new FrameLayout
- {
- X = Application.GetRealWidth(29),
- Y = Application.GetRealHeight(374),
- Width = Application.GetRealWidth(340),
- Height = Application.GetRealHeight(80),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
- };
- roomBackView.AddChidren(roomTemperatureBackground);
- roomTemperatureBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);
-
- var temperatureIcon = new Button
- {
- X = Application.GetRealWidth(12),
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Room/Temperature.png"
- };
- roomTemperatureBackground.AddChidren(temperatureIcon);
-
- var temperatureText = new Button
- {
- X = Application.GetRealWidth(69),
- Width = Application.GetRealWidth(86),
- Height = Application.GetRealHeight(58),
- Gravity = Gravity.CenterVertical,
- Text="26鈩�"
- };
- roomTemperatureBackground.AddChidren(temperatureText);
-
- var humidityIcon = new Button
- {
- X = Application.GetRealWidth(179),
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Room/Humidity.png"
- };
- roomTemperatureBackground.AddChidren(humidityIcon);
-
- var humidityText = new Button
- {
- X = Application.GetRealWidth(236),
- Width = Application.GetRealWidth(86),
- Height = Application.GetRealHeight(58),
- Gravity = Gravity.CenterVertical,
- Text = "13%"
- };
- roomTemperatureBackground.AddChidren(humidityText);
-
-
- var roomListBtn = new Button()
- {
- X = roomBackView.Width - Application.GetRealWidth(100 + 20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(100),
- Height = Application.GetMinRealAverage(100),
- UnSelectedImagePath = "Room/List.png",
- };
- roomBackView.AddChidren(roomListBtn);
-
- roomListBtn.MouseUpEventHandler += (send, e) =>
- {
- CommonPage.Instance.IsDrawerLockMode = true;
- var editRoom = new Device.Room.EditRoom();
- HomePage.Instance.AddChidren(editRoom);
- HomePage.Instance.PageIndex += 1;
- editRoom.Show(room);
- editRoom.action += () =>
- {
- Show();
- };
+ Show();
};
}
@@ -781,7 +679,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
- IsSelected = false
+ IsSelected = true,
+ TextSize=16
};
functionSceneView.AddChidren(sceneBtn);
@@ -795,7 +694,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Function,
- IsSelected = false
+ IsSelected = false,
+ TextSize=14
};
functionSceneView.AddChidren(functionBtn);
@@ -814,6 +714,8 @@
{
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
+ sceneBtn.TextSize = 14;
+ functionBtn.TextSize = 16;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -821,6 +723,8 @@
{
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
+ sceneBtn.TextSize = 16;
+ functionBtn.TextSize = 14;
RefreshBodyView();
};
@@ -1116,7 +1020,7 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
- (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
((sender as Button).Parent as FunctionMainView).IsSelected = true;
@@ -1142,7 +1046,7 @@
zbGateway.ReportAction += UpdateDeviceControllStatu;
AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
- (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
+ (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
((sender as Button).Parent as FunctionMainView).IsSelected = false;
@@ -1751,7 +1655,7 @@
for (int i = 0; i < sceneList.Count; i++)
{
var scene = sceneList[i];
- int xx = 43 + i % 2 * (20 + 487);
+ int xx = 33 + i % 2 * (40 + 487);
int yy = 14;
if (scene == null)
{
--
Gitblit v1.8.0