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/Device/Logic/Nightlight.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 556f4e2..91c6590 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;
@@ -335,7 +335,7 @@
                         };
                         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