From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
index 4d17c9a..2fbc3d1 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
@@ -87,8 +87,19 @@
btnMore.InitControl();
btnMore.ButtonClickEvent += (sender, e) =>
{
- var detailInfo = new DeviceDetailInfoForm();
- detailInfo.AddForm(device, nowSelectRoom);
+ //鑾峰彇璁惧灞炰簬銆愭櫨琛ｆ灦銆�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.Airer)
+ {
+ var form = new Shared.Phone.UserCenter.Device.DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
+ else
+ {
+ var detailInfo = new DeviceDetailInfoForm();
+ detailInfo.AddForm(device, nowSelectRoom);
+ }
+
};
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -146,7 +157,7 @@
frameRoomBlack.Height = Application.GetRealHeight(138);
frameRoomBlack.Width = frameWhiteBack.Width;
frameRoomBlack.BackgroundColor = 0xff232323;
- frameRoomBlack.Radius= (uint)Application.GetRealHeight(17);
+ frameRoomBlack.Radius = (uint)Application.GetRealHeight(17);
frameRoomBlack.Gravity = Gravity.BottomCenter;
frameWhiteBack.AddChidren(frameRoomBlack);
@@ -300,16 +311,31 @@
HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceDetailCardAttribute" + mainKeys, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
string mainKey2 = Common.LocalDevice.Current.GetDeviceMainKeys(report);
- if (mainKeys != mainKey2)
+
+ if (this.device.Type == DeviceType.Airer && this.device.DeviceAddr == report.DeviceAddr)
{
- //涓嶆槸鍚屼竴涓笢瑗�
- return;
+ //鏅捐。鏋剁壒娈婏細5涓洖璺唬琛ㄤ笉鍚岀殑鍔熻兘锛屼絾鏄粯璁ゆ湰鍦板彧鏄剧ず浜嗙涓�涓洖璺�
+ //鎵�浠ユ潯浠剁壒娈婂垽鏂�
+ //妫�娴嬬粨鏋�
+ if (this.CheckResponeResultStatu(ReceiveComandDiv.A璁惧灞炴�т笂鎶�, report) == true)
+ {
+ //缁撴灉宸茬粡鎺ユ敹鍒�
+ this.ResponeResult = 1;
+ }
}
- //妫�娴嬬粨鏋�
- if (this.CheckResponeResultStatu(ReceiveComandDiv.A璁惧灞炴�т笂鎶�, report) == true)
+ else
{
- //缁撴灉宸茬粡鎺ユ敹鍒�
- this.ResponeResult = 1;
+ if (mainKeys != mainKey2)
+ {
+ //涓嶆槸鍚屼竴涓笢瑗�
+ return;
+ }
+ //妫�娴嬬粨鏋�
+ if (this.CheckResponeResultStatu(ReceiveComandDiv.A璁惧灞炴�т笂鎶�, report) == true)
+ {
+ //缁撴灉宸茬粡鎺ユ敹鍒�
+ this.ResponeResult = 1;
+ }
}
});
}
--
Gitblit v1.8.0