From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100755
new mode 100644
index fda6ee2..94841de
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -268,16 +268,16 @@
if (this.CheckCanShowFunctionSettionRow() == true)
{
//娣诲姞銆愬姛鑳借缃�戣
- if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
- {
- //PM浼犳劅鍣�
- this.AddFunctionSettionRowPM();
- }
- else
- {
- this.AddFunctionSettionRow();
- }
-
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ {
+ //PM浼犳劅鍣�
+ this.AddFunctionSettionRowPM();
+ }
+ else
+ {
+ this.AddFunctionSettionRow();
+ }
+
}
//娣诲姞銆愬共鎺ョ偣璁剧疆銆戣
@@ -736,7 +736,7 @@
|| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
{
var form = new DevicePanel.PanelFangyueFunctionSettionForm();
- form.AddForm(listNewDevice[0]);
+ form.AddForm(listNewDevice[0], deviceEnumInfo);
}
//娌充笢鐨勯潰鏉胯澶�
else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
@@ -756,8 +756,8 @@
/// 娣诲姞浼犳劅鍣ㄣ�愬姛鑳借缃�戣
/// </summary>
private void AddFunctionSettionRowPM()
- {
- //鍔熻兘璁剧疆
+ {
+ //鍔熻兘璁剧疆
string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
var btnFunction = new FrameRowControl(listview.rowSpace / 2);
listview.AddChidren(btnFunction);
@@ -767,8 +767,8 @@
//搴曠嚎
btnFunction.AddBottomLine();
btnFunction.ButtonClickEvent += (sender, e) =>
- {
- var form = new DeviceFunctionSettionForm();
+ {
+ var form = new DeviceFunctionSettionForm();
form.AddForm(listNewDevice[0], false);
};
}
--
Gitblit v1.8.0