From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 56a24fa..f65d1cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -200,10 +200,10 @@
if (isHdlDevice == true)
{
//濡傛灉鏄�3璺户鐢靛櫒鎴栬��1璺皟鍏夊櫒,骞朵笖鏄涓冨洖璺殑鏃跺��,瀹冨ソ鍍忓彲浠ユ敼鍙樼被鍨�
- //濡傛灉鏄鏍�14璺共鎺ョ偣灏忔ā鍧�,骞朵笖鏄涓冨洖璺殑鏃跺��,瀹冨ソ鍍忓彲浠ユ敼鍙樼被鍨�
+ //濡傛灉鏄�7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡,骞朵笖鏄涓冨洖璺殑鏃跺��,瀹冨ソ鍍忓彲浠ユ敼鍙樼被鍨�
if ((deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_ThreeLoad && nowSelectDevice.DeviceEpoint == 10)
|| (deviceEnumInfo.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad && nowSelectDevice.DeviceEpoint == 7)
- || (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact && nowSelectDevice.DeviceEpoint == 7))
+ || (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_SevenLoadInOutPutDryContact && nowSelectDevice.DeviceEpoint == 7))
{
//杩欓噷鍏堝幓鑾峰彇瀹冪殑骞叉帴鐐圭被鍨�
this.ShowProgressBar();
@@ -426,11 +426,11 @@
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ //娆ф爣2璺�5A娌℃湁鑳屽厜鐏�
if (myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad
|| myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad
|| myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA
- || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA
- || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)
+ || myType.ConcreteType == DeviceConcreteType.Relay_SevenLoadInOutPutDryContact)
{
//鑳屽厜鐏�
string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);
@@ -444,10 +444,9 @@
btnLight.ButtonClickEvent += (sender, e) =>
{
if (myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA
- || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA
- || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)
+ || myType.ConcreteType == DeviceConcreteType.Relay_SevenLoadInOutPutDryContact)
{
- //鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 鎴栬�� 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 鎴栬�� 娆ф爣14璺共鎺ョ偣灏忔ā鍧�
+ //鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 鎴栬�� 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡
var form = new DeviceRelay.RelayNationalBackLightSettionForm();
form.AddForm(deviceObj.DeviceAddr);
}
--
Gitblit v1.8.0