From ce1feeeb0aaa2e53bca4e8d64953edaba2b41106 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 17:27:49 +0800
Subject: [PATCH] 请合并最新版代码
---
Home0618/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Home0618/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/Home0618/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 726033a..d6e3492 100644
--- a/Home0618/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/Home0618/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -294,7 +294,7 @@
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
{
- //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
+ //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
this.AddSimplePanelSettionRow();
}
else
@@ -602,13 +602,13 @@
var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
form.AddForm(listNewDevice[0]);
};
- }
-
+ }
+
#endregion
#endregion
-
+
#region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
-
+
/// <summary>
/// 娣诲姞銆愭寜閿缃�戣(鏂规偊)
/// </summary>
@@ -1005,7 +1005,7 @@
#region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
/// <summary>
- /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
+ /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
/// </summary>
private void AddIBindRow(string deviceMac)
{
@@ -1056,7 +1056,7 @@
}
device.Type = DeviceType.OnOffSwitch;
device.DeviceAddr = deviceMac;
- device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+ device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾
var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Temperature);
Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1076,8 +1076,8 @@
});
};
};
- }
-
+ }
+
/// <summary>
/// 娓╁害鏉ユ簮琛�
/// </summary>
@@ -1107,7 +1107,7 @@
}
device.Type = DeviceType.OnOffSwitch;
device.DeviceAddr = deviceMac;
- device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+ device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾
var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Temperature);
Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1356,7 +1356,7 @@
btnNewVersion.Visible = false;
btnNewVersion.X = Application.GetRealWidth(242);
btnNewVersion.Y = Application.GetRealHeight(23);
- rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
+ rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);
rowUpDate.ButtonClickEvent += (sender, e) =>
{
--
Gitblit v1.8.0