From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs | 88 ++-----------------------------------------
1 files changed, 5 insertions(+), 83 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs b/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
index 101cdda..db26b57 100755
--- a/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
@@ -16,91 +16,13 @@
/// </summary>
public void Show()
{
- var topFrameLayout = new FrameLayout()
+ var sceneBtn = new ImageView()
{
- Y = Application.GetRealHeight(60),
- Height = Application.GetRealHeight(127),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ Width=Application.GetMinRealAverage(1080),
+ Height=Application.GetMinRealAverage(1920),
+ ImagePath="Logo/2.jpg"
};
- AddChidren(topFrameLayout);
-
- var floor = new Button
- {
- X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Width = Application.GetMinRealAverage(69),
- Height = Application.GetMinRealAverage(69),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Floor.png"
- };
- topFrameLayout.AddChidren(floor);
-
- var messageBtn = new Button()
- {
- X = Application.GetRealWidth(953),
- Width = Application.GetMinRealAverage(69),
- Height = Application.GetMinRealAverage(69),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Message.png",
- SelectedImagePath = "Item/MessageSelected.png"
- };
- topFrameLayout.AddChidren(messageBtn);
-
- var roomBG = new Button()
- {
- Y = Application.GetRealHeight(302),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- Height = Application.GetMinRealAverage(550),
- Gravity = Gravity.CenterHorizontal,
- UnSelectedImagePath = "RoomIcon/1.JPG",
- };
- AddChidren(roomBG);
-
-
- var functionSceneView = new FrameLayout()
- {
- Y = Application.GetRealHeight(861),
- Width = Application.GetRealWidth(832),
- Height = Application.GetRealHeight(167),
- Gravity = Gravity.CenterHorizontal,
- BackgroundImagePath = "Item/SceneFunctionBG.png"
- };
- AddChidren(functionSceneView);
-
- var sceneBtn = new Button()
- {
- X = Application.GetRealWidth(30),
- Y = Application.GetRealHeight(12),
- Width = Application.GetRealWidth(350),
- Height = Application.GetRealHeight(100),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
- SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextID = R.MyInternationalizationString.Scence,
- IsSelected = true
- };
- functionSceneView.AddChidren(sceneBtn);
-
- var functionBtn = new Button()
- {
- X = Application.GetRealWidth(430),
- Y = Application.GetRealHeight(12),
- Width = Application.GetRealWidth(360),
- Height = Application.GetRealHeight(100),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
- SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextID = R.MyInternationalizationString.Function,
- IsSelected = false
- };
- functionSceneView.AddChidren(functionBtn);
-
- var functionSceneBodyView = new FrameLayout()
- {
- Y = functionSceneView.Bottom,
- Height = Application.GetRealHeight(750),
- Gravity = Gravity.CenterHorizontal,
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
- };
- AddChidren(functionSceneBodyView);
-
+ AddChidren(sceneBtn);
}
}
}
--
Gitblit v1.8.0