From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
old mode 100644
new mode 100755
index 8e30f8b..95ca2a5
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -239,13 +239,8 @@
if (listdevice.Count > 0 && Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)
{
//瀹氫綅
- var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowMenu.Height, false);
+ var btnPosition = rowMenu.AddEditorControl(false);
btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
- btnPosition.TextAlignment = TextAlignment.Center;
- btnPosition.TextSize = 12;
- btnPosition.TextColor = UserCenterColor.Current.White;
- btnPosition.BackgroundColor = 0xff4a4a4a;
- rowMenu.AddRightView(btnPosition);
btnPosition.ButtonClickEvent += (sender, e) =>
{
//瀹氫綅
@@ -372,13 +367,8 @@
if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(device) == true)
{
//瀹氫綅
- var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowDevice.Height, false);
+ var btnPosition = rowDevice.AddEditorControl(false);
btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
- btnPosition.TextAlignment = TextAlignment.Center;
- btnPosition.TextSize = 12;
- btnPosition.TextColor = UserCenterColor.Current.White;
- btnPosition.BackgroundColor = 0xff4a4a4a;
- rowDevice.AddRightView(btnPosition);
btnPosition.ButtonClickEvent += (sender, e) =>
{
//瀹氫綅
@@ -452,9 +442,9 @@
}
//鏂伴闈㈡澘
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
- {
- //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
- var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
+ {
+ //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
form.AddForm(device);
}
//鏂规偊闈㈡澘
@@ -464,10 +454,10 @@
{
//骞叉帴鐐�
if (device.Type == DeviceType.OnOffSwitch)
- {
- //鏂规偊闈㈡澘鐨勬寜閿厤缃�
+ {
+ //鏂规偊闈㈡澘鐨勬寜閿厤缃�
var form = new DevicePanel.PanelFangyueButtonSettionForm();
- form.AddForm(device);
+ form.AddForm(device);
}
//缁х數鍣�
else if (device.Type == DeviceType.OnOffOutput)
--
Gitblit v1.8.0