From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs
index 9865c24..651140b 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs
@@ -19,7 +19,11 @@
/// <summary>
/// SwitchBtn
/// </summary>
- public CommonForm.SelectedStatuButton SwitchBtn;
+ public Button SwitchBtn;
+ /// <summary>
+ /// ClickBtn
+ /// </summary>
+ public Button ClickBtn;
/// <summary>
/// v_Selected
/// </summary>
@@ -56,7 +60,7 @@
{
X = Application.GetRealWidth(x);
Y = Application.GetRealHeight(y);
- Width = Application.GetRealWidth(1022);
+ Width = Application.GetRealWidth(1080);
Height = Application.GetRealHeight(127);
}
@@ -65,7 +69,7 @@
/// </summary>
/// <param name="imagePath"></param>
/// <param name="selectedImagePath"></param>
- public void Init(string imagePath, string selectedImagePath)
+ public void Init(string imagePath, string selectedImagePath,bool click=false)
{
ImageBG = new Button()
{
@@ -94,18 +98,19 @@
NameBtn = new Button()
{
- X = Application.GetRealWidth(181),
- Width = Application.GetRealWidth(500),
+ X = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(80),
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
- Tag = Tag
+ Tag = Tag,
+ TextSize = 14
};
AddChidren(NameBtn);
- SwitchBtn = new SelectedStatuButton()
+ SwitchBtn = new Button()
{
X = Application.GetRealWidth(896),
Width = Application.GetMinRealAverage(78),
@@ -119,14 +124,20 @@
var line = new Button()
{
- X = Application.GetRealWidth(180),
- Y = Height - 2,
- Width = Application.GetRealWidth(841),
- Height = 2,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
+ X = Application.GetRealWidth(200),
+ Y = Height - 1,
+ Width = Application.GetRealWidth(821),
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
Tag = Tag
};
AddChidren(line);
+
+ ClickBtn = new Button();
+ if (click)
+ {
+ AddChidren(ClickBtn);
+ }
}
/// <summary>
@@ -153,5 +164,14 @@
{
NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = SwitchBtn.IsSelected = statu;
}
+
+ /// <summary>
+ /// HideSwitchBtn
+ /// </summary>
+ /// <param name="statu"></param>
+ public void HideSwitchBtn(bool statu)
+ {
+ SwitchBtn.Visible = statu;
+ }
}
}
--
Gitblit v1.8.0