From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index d10b69d..cbbce46 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -243,7 +243,7 @@
//{
// menuCount = 2;
//}
- var frame = new TopRightMenuControl(menuCount);
+ var frame = new TopRightMenuControl(menuCount, 1);
if (canTest == true)
{
//瀹氫綅
@@ -433,7 +433,7 @@
var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = 6;
+ btnIcon.RadiusEx = 16;
btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
--
Gitblit v1.8.0