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/Curtain/SiphonateDirectionAndLimitSettionForm.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
index ac07244..652c833 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
@@ -215,7 +215,7 @@
btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;
frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), HdlControlResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine1.Gravity = Gravity.CenterHorizontal;
btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);
@@ -230,7 +230,7 @@
frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), HdlControlResourse.BottomLineHeight, false);
+ var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);
btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine2.Gravity = Gravity.CenterHorizontal;
btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);
@@ -334,7 +334,7 @@
btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;
frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), HdlControlResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine1.Gravity = Gravity.CenterHorizontal;
btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);
@@ -349,7 +349,7 @@
frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), HdlControlResourse.BottomLineHeight, false);
+ var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);
btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine2.Gravity = Gravity.CenterHorizontal;
btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);
@@ -479,10 +479,10 @@
this.ShowProgressBar();
bool receiptData = false;
- string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(curtainDevice);
+ string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);
HdlGatewayReceiveLogic.Current.AddAttributeEvent("CurtainDeviceAttribute", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (device) =>
{
- string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)
{
return;
@@ -524,7 +524,7 @@
//鑾峰彇绐楀笜鏂瑰悜涓庨檺浣嶈缃け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetCurtainDirectionAndLimitSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
this.ShowMassage(ShowMsgType.Tip, msg);
return false;
}
--
Gitblit v1.8.0