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/UserCenter/Device/DeviceAddSuccessForm.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index 83a522d..a47dd9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -38,11 +38,11 @@
         /// <param name="deviceMac">璁惧Mac鍦板潃</param>
         public void ShowForm(string deviceMac)
         {
-            this.listNewDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
+            this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
             if (listNewDevice.Count == 0)
             {
                 //瀵瑰簲鍗曠函鍙湁200鍥炶矾鐨勮澶�
-                listNewDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
+                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
             }
 
             //娣诲姞鏂拌澶囩殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
@@ -82,7 +82,7 @@
             framePic.Y = Application.GetRealHeight(58);
             bodyFrameLayout.AddChidren(framePic);
 
-            var imageFile = HdlDeviceCommonLogic.Current.GetRealDeviceIcon(listNewDevice);
+            var imageFile = Common.LocalDevice.Current.GetRealDeviceIcon(listNewDevice);
             string fullName = IO.FileUtils.GetImageFilePath(imageFile);
 
 #if Android
@@ -102,12 +102,12 @@
             btnpictrue.UnSelectedImagePath = imageFile;
             framePic.AddChidren(btnpictrue);
 
-            string nameValue = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+            string nameValue = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
             this.saveDefultName = nameValue;
 
             //璁惧澶囨敞
             string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
-            string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+            string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
             this.btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
             this.btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
             listview.AddChidren(btnNote);
@@ -118,7 +118,7 @@
             {
                 if (btnNote.Text.Trim() == string.Empty)
                 {
-                    btnNote.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+                    btnNote.Text = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
                     return;
                 }
                 //淇敼鍚嶅瓧
@@ -127,7 +127,7 @@
 
             //璁惧绫诲瀷
             caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
-            deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
+            deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
             var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
             btnType.UseClickStatu = false;
             listview.AddChidren(btnType);
@@ -161,7 +161,7 @@
                     }
 
                     var room = HdlRoomLogic.Current.GetRoomByDevice(device);
-                    string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+                    string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
                     if (room == null)
                     {
                         //杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
@@ -200,7 +200,7 @@
             bodyFrameLayout.AddChidren(btnHelp);
             //搴曠嚎
             int lineWidth = btnHelp.GetRealWidthByText();
-            var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
+            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
             btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
             btnLine.Gravity = Gravity.CenterHorizontal;
             btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
@@ -229,7 +229,7 @@
 
             //璁惧缂栬緫
             var btnTile = new NormalViewControl(800, 60, true);
-            btnTile.X = HdlControlResourse.XXLeft;
+            btnTile.X = ControlCommonResourse.XXLeft;
             btnTile.TextSize = 15;
             btnTile.TextColor = UserCenterColor.Current.TextColor2;
             btnTile.TextID = R.MyInternationalizationString.uDeviceEditor;
@@ -269,7 +269,7 @@
         {
             //淇敼MAC鍚�
             string deviceName = i_deviceName.Trim();
-            var result = HdlDeviceCommonLogic.Current.ReMacName(this.listNewDevice, deviceName, mode);
+            var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName, mode);
             if (result == false)
             {
                 return;
@@ -285,14 +285,14 @@
         {
             foreach (var device in this.listNewDevice)
             {
-                if ((device is OTADevice) || HdlDeviceCommonLogic.Current.GetSimpleEpointName(device) != string.Empty)
+                if ((device is OTADevice) || Common.LocalDevice.Current.GetSimpleEpointName(device) != string.Empty)
                 {
                     //鏈夊悕瀛椾笉澶勭悊
                     continue;
                 }
                 //鑾峰彇绔偣鍚嶅瓧
-                var epointName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
-                HdlDeviceCommonLogic.Current.ReName(device, epointName, ShowErrorMode.NO);
+                var epointName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                Common.LocalDevice.Current.ReName(device, epointName, ShowErrorMode.NO);
             }
         }
 

--
Gitblit v1.8.0