From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs | 155 +++++++++++++++++++++++++++++++--------------------
1 files changed, 94 insertions(+), 61 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
old mode 100644
new mode 100755
index 5a10b1d..9811dc5
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
@@ -1,78 +1,111 @@
锘縰sing System;
using Shared.Common;
+using Shared.Phone.Device.CommonForm;
+
namespace Shared.Phone.Device.Category
{
public class CategorySceneSelectImgByLocal:FrameLayout
{
- public Action action;
+
+ /// <summary>
+ /// bodyFrameLayout
+ /// </summary>
+ private FrameLayout bodyFrameLayout;
+
+ public Action<string> action;
+
public CategorySceneSelectImgByLocal()
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
+
public void Show()
{
- #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 title = new Button()
- {
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.SelectPic,
- TextSize = 20,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - 500),
- Gravity = Gravity.CenterHorizontal
- };
- topView.AddChidren(title);
+ AddTop();
- var back = new Device.CommonForm.BackButton() { };鈥� topView.AddChidren(back);
-
- back.MouseUpEventHandler += (sender, e) =>
- {
- this.RemoveFromParent();
- };
- #endregion
-
- #region midFL
- var midFl = new VerticalScrolViewLayout()
- {
- Height = Application.GetRealHeight(CommonPage.AppRealHeight - CommonPage.Navigation_Height),
- Y = topView.Bottom,
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- };
- this.AddChidren(midFl);
-
- for (int i = 0; i < 17; i++)
- {
- var RoomRowView = new FrameLayout()
- {
- Y=midFl.Bottom,
- Height = Application.GetRealHeight(430),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- midFl.AddChidren(RoomRowView);
-
- var backGroundBtn = new Button()
- {
-
- Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- Height = Application.GetMinRealAverage(400),
- Gravity=Gravity.CenterHorizontal,
- UnSelectedImagePath = "Scene/Scene" + i.ToString() + ".png",
- Radius = CommonPage.BigFormRadius
- };
- RoomRowView.AddChidren(backGroundBtn);
-
- backGroundBtn.MouseUpEventHandler += (sender, e) =>
- {
- CategoryAddScene.ImagePath = backGroundBtn.UnSelectedImagePath;
- Room.AddRoomScene.ImagePath = backGroundBtn.UnSelectedImagePath;
- action?.Invoke();
- this.RemoveFromParent();
- };
- }
- #endregion
+ AddBodyView();
}
+
+
+ #region Add____________________________________
+
+ /// <summary>
+ /// AddTop
+ /// </summary>
+ public void AddTop()
+ {
+ var top = new TopFrameLayout();
+ AddChidren(top);
+ top.InitTopview();
+ top.SetTopTitle(R.MyInternationalizationString.SelectScenePic);
+ top.backButton.MouseUpEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+ }
+
+ /// <summary>
+ /// AddBodyView
+ /// </summary>
+ public void AddBodyView()
+ {
+ bodyFrameLayout = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(184),
+ Height = Application.GetRealHeight(1737),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
+ };
+ AddChidren(bodyFrameLayout);
+
+ //FunctionIconButton
+ var scrollView = new VerticalScrolViewLayout()
+ {
+ Height = Application.GetRealHeight(1737),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
+ };
+ bodyFrameLayout.AddChidren(scrollView);
+
+ int k = 0;
+ for (int j = 0; j < 5; j++)
+ {
+ var itemView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(311 + CommonPage.XLeft)
+ };
+ scrollView.AddChidren(itemView);
+ for (int i = 0; i < 2; i++)
+ {
+ var icon = new Button()
+ {
+ X=Application.GetRealWidth(CommonPage.XLeft+i*(467+32)),
+ Width=Application.GetMinRealAverage(467),
+ Height=Application.GetMinRealAverage(311),
+ Gravity=Gravity.CenterVertical,
+ UnSelectedImagePath = $"SceneIcon/{k}.jpg",
+ };
+ itemView.AddChidren(icon);
+ icon.SetViewShadow(true);
+ k++;
+
+ EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
+ {
+ //CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
+ //Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
+ action?.Invoke(icon.UnSelectedImagePath);
+ action = null;
+ this.RemoveFromParent();
+
+ };
+ icon.MouseUpEventHandler += selectIcon;
+ }
+ }
+
+ }
+ #endregion
}
}
--
Gitblit v1.8.0