From b9cb076fe6127160c96c35bf9c8cebcffe1d5ccd Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 10 一月 2020 17:35:23 +0800 Subject: [PATCH] 2020.1.10 --- ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs index 521e49e..855d2be 100644 --- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs +++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs @@ -42,7 +42,7 @@ v_Selected = value; try { - SetOnLineStatu(v_Selected); + SetStatu(v_Selected); } catch { @@ -65,7 +65,7 @@ X = Application.GetRealWidth(x); Y = Application.GetRealHeight(y); Width = Application.GetRealWidth(1022); - Height = Application.GetRealHeight(127); + Height = Application.GetRealHeight(127-2); //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor; } @@ -110,6 +110,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor, TextAlignment = TextAlignment.CenterLeft, + TextSize=14, Tag = Tag }; AddChidren(NameBtn); @@ -121,7 +122,8 @@ Width = Application.GetRealWidth(400), Height = Application.GetRealHeight(49), TextAlignment = TextAlignment.CenterLeft, - TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2 + TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2, + TextSize=10 }; AddChidren(StatuBtn); @@ -139,10 +141,10 @@ var line = new Button() { - X = Application.GetRealWidth(200), - Y = Height - 2, + X = Application.GetRealWidth(181), + Y = Height - 1, Width = Application.GetRealWidth(821), - Height = 2, + Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor, Tag = Tag }; @@ -187,6 +189,8 @@ public void SetStatu(bool statu) { SwitchBtn.IsSelected = statu; + NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu; + NameBtn.IsBold = statu; } /// <summary> @@ -206,5 +210,16 @@ { SwitchBtn.Visible = !statu; } + + /// <summary> + /// SetDeviceIcon + /// </summary> + /// <param name="imagePath"></param> + /// <param name="selectedImagePath"></param> + public void SetDeviceIcon(string imagePath, string selectedImagePath) + { + ImageBtn.UnSelectedImagePath = imagePath; + ImageBtn.SelectedImagePath = selectedImagePath; + } } -} \ No newline at end of file +} -- Gitblit v1.8.0