From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 665f4c4..9b337e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -132,7 +132,7 @@
catch (Exception ex)
{
//Log鍑哄姏
- string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + HdlFormLogic.Current.NowActionFormID + "]";
+ string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
HdlLogLogic.Current.WriteLog(ex, msg);
//鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uCurtainDataIsErrorPleaseResetCurtain));
@@ -249,7 +249,7 @@
{
//寮�闄愪綅
var btnProgressView = new NormalViewControl(200, 50, true);
- btnProgressView.X = HdlControlResourse.XXLeft;
+ btnProgressView.X = ControlCommonResourse.XXLeft;
btnProgressView.Y = Application.GetRealHeight(78);
btnProgressView.TextSize = 12;
btnProgressView.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -274,7 +274,7 @@
frameBack.AddChidren(openSeekBar);
var btnTemp1 = new NormalViewControl(200, 50, true);
- btnTemp1.X = HdlControlResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = btnProgressView.Bottom + Application.GetRealHeight(115);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -289,8 +289,8 @@
btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
//绾�
- var btnLine = new NormalViewControl(frameBack.Width - HdlControlResourse.XXLeft * 2, HdlControlResourse.BottomLineHeight, false);
- btnLine.X = HdlControlResourse.XXLeft;
+ var btnLine = new NormalViewControl(frameBack.Width - ControlCommonResourse.XXLeft * 2, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.X = ControlCommonResourse.XXLeft;
btnLine.Y = btnTemp2.Bottom + Application.GetRealHeight(156);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameBack.AddChidren(btnLine);
@@ -431,7 +431,7 @@
{
//鍚堥檺浣�
var btnProgressView = new NormalViewControl(200, 50, true);
- btnProgressView.X = HdlControlResourse.XXLeft;
+ btnProgressView.X = ControlCommonResourse.XXLeft;
btnProgressView.Y = Application.GetRealHeight(536);
btnProgressView.TextSize = 12;
btnProgressView.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -456,7 +456,7 @@
frameBack.AddChidren(closeSeekBar);
var btnTemp1 = new NormalViewControl(200, 50, true);
- btnTemp1.X = HdlControlResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = btnProgressView.Bottom + Application.GetRealHeight(115);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -471,8 +471,8 @@
btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
//绾�
- var btnLine = new NormalViewControl(frameBack.Width - HdlControlResourse.XXLeft * 2, HdlControlResourse.BottomLineHeight, false);
- btnLine.X = HdlControlResourse.XXLeft;
+ var btnLine = new NormalViewControl(frameBack.Width - ControlCommonResourse.XXLeft * 2, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.X = ControlCommonResourse.XXLeft;
btnLine.Y = btnTemp2.Bottom + Application.GetRealHeight(156);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameBack.AddChidren(btnLine);
@@ -688,7 +688,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- var data = HdlTemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
curtainData.Direction = data.Direction;
curtainData.CurtainLength = data.curtainLength;
curtainData.OpenLimitValue = data.upLimit;
@@ -700,10 +700,10 @@
this.ShowProgressBar();
int receiptDataCount = 0;
- 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;
@@ -762,7 +762,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;
}
@@ -790,10 +790,10 @@
{
HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");
}
- string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(curtainDevice);
+ string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);
HdlGatewayReceiveLogic.Current.AddAttributeEvent("ReceiveLimitData", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (device) =>
{
- string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)
{
return;
--
Gitblit v1.8.0