From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs
index 8981e93..96b0bc8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs
@@ -81,7 +81,7 @@
//澶撮儴淇℃伅
var btnTitle = new NormalViewControl(frameTransparent.Width, Application.GetRealHeight(70), false);
btnTitle.Y = Application.GetRealHeight(28);
- btnTitle.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
btnTitle.TextColor = UserCenterColor.Current.TextColor4;
btnTitle.TextSize = 16;
btnTitle.TextAlignment = TextAlignment.Center;
@@ -109,7 +109,7 @@
rowRound.AddChidren(btnFinish);
//绾�
- var btnLine1 = new NormalViewControl(frameTransparent.Width, ControlCommonResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(frameTransparent.Width, HdlControlResourse.BottomLineHeight, false);
btnLine1.Y = Application.GetRealHeight(138);
btnLine1.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameTransparent.AddChidren(btnLine1);
@@ -133,8 +133,8 @@
//寮�
var rowOpen = new FrameRowControl();
rowOpen.Y = Application.GetRealHeight(69);
- rowOpen.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
- rowOpen.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
+ rowOpen.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
+ rowOpen.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
detailBackFrame.AddChidren(rowOpen);
var btnOpen = rowOpen.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleOpen), 400);
btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -147,8 +147,8 @@
//鍏�
var rowClose = new FrameRowControl();
rowClose.Y = rowOpen.Bottom + Application.GetRealHeight(12);
- rowClose.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
- rowClose.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);
+ rowClose.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
+ rowClose.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(81);
detailBackFrame.AddChidren(rowClose);
var btnClose = rowClose.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSimpleClose), 400);
btnClose.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -240,13 +240,11 @@
dicTaskinfo = null;
//鑾峰彇鐘舵�佺殑鏄剧ず鏂囨湰
- string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);
+ string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);
this.FinishSelectEvent(statuText, listData);
this.CloseForm();
};
- //鍔ㄧ敾鏁堟灉
- frameTransparent.Animate = Animate.DownToUp;
}
#endregion
@@ -256,10 +254,10 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
this.FinishSelectEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0