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/Device/Logic/Nightlight.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 556f4e2..f3678c3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -22,7 +22,7 @@
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
- view.toptitleNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
+ view.toptitleNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -95,7 +95,7 @@
{
if (!edit)
{
- var alert = new ShowMsgControl(ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -203,7 +203,7 @@
UserView.HomePage.Instance.ScrollEnabled = false;//涓嶈褰撳墠鐣岄潰婊戝姩
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(2));
- completeView.Btntitle.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
+ completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
@@ -328,14 +328,14 @@
{
Y = Application.GetRealHeight(140 + 160),
X = Application.GetRealWidth(78),
- Height = Application.GetRealHeight(12),
+ Height = Application.GetRealWidth(12),
Width = Application.GetRealWidth(918 - 120),
UnSelectedImagePath = "ZigeeLogic/seek.png",
Gravity = Gravity.CenterHorizontal
};
completeView.Show(2).AddChidren(seekIconBtn);
- var horizontalSeekBarVol = new SeekBarControl(918)
+ var horizontalSeekBarVol = new UserCenter.SeekBarControl(918)
{
ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
SeekBarBackgroundColor = 0x00000000,
@@ -456,7 +456,7 @@
{
if (!edit)
{
- var alert = new ShowMsgControl(ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0