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/AirConditioner/IndoorUnitSettionForm.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
index bded1c4..c06b97a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
@@ -95,7 +95,7 @@
 
             //璁惧澶囨敞
             string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
-            string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceAc);
+            string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);
             var btnNote = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
             btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
             listview.AddChidren(btnNote);
@@ -104,7 +104,7 @@
             btnNote.AddBottomLine();
             btnNote.txtInput.FinishInputEvent += () =>
             {
-                string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceAc);
+                string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);
                 if (btnNote.Text.Trim() == string.Empty)
                 {
                     //灏嗗悕瀛楄繕鍘�
@@ -118,7 +118,7 @@
                         return;
                     }
                     //璁惧鍚嶇О淇敼
-                    var result = HdlDeviceCommonLogic.Current.ReName(deviceAc, btnNote.Text);
+                    var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);
                     if (result == false)
                     {
                         return;
@@ -131,7 +131,7 @@
 
             //璁惧绫诲瀷
             caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
-            nameValue = HdlDeviceCommonLogic.Current.GetDeviceObjectText(new List<CommonDevice>() { deviceAc });
+            nameValue = Common.LocalDevice.Current.GetDeviceObjectText(new List<CommonDevice>() { deviceAc });
             var btnType = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
             btnType.UseClickStatu = false;
             listview.AddChidren(btnType);
@@ -209,11 +209,11 @@
             bodyFrameLayout.AddChidren(btnFinish);
             btnFinish.ButtonClickEvent += (sender, e) =>
             {
-                string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceAc);
+                string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);
                 if (oldName != btnNote.Text)
                 {
                     //璁惧鍚嶇О淇敼
-                    var result = HdlDeviceCommonLogic.Current.ReName(deviceAc, btnNote.Text);
+                    var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);
                     if (result == false)
                     {
                         return;
@@ -239,7 +239,7 @@
         private void InitTopRightMenu()
         {
             //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭ｄ釜鍥炶矾鍘诲畾浣�)
-            bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(deviceAc);
+            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(deviceAc);
             if (canTest == false)
             {
                 return;
@@ -266,7 +266,7 @@
             frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
             {
                 //鍙戦�佸畾浣嶅姛鑳�
-                HdlDeviceCommonLogic.Current.SetFixedPositionCommand(deviceAc);
+                Common.LocalDevice.Current.SetFixedPositionCommand(deviceAc);
             });
         }
 
@@ -282,7 +282,7 @@
             //濡傛灉鏄櫄鎷熶綇瀹�
             if (Common.Config.Instance.Home.IsVirtually == true)
             {
-                var data = HdlTemplateDeviceDataLogic.Current.GetAcSwingModeSupport(deviceAc);
+                var data = TemplateData.TemplateDeviceDataLogic.Current.GetAcSwingModeSupport(deviceAc);
                 //杞崲涓轰簩杩涘埗
                 var value = Convert.ToString(data, 2).PadLeft(16, '0');
                 //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
@@ -291,10 +291,10 @@
                 return true;
             }
 
-            string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(deviceAc);
+            string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(deviceAc);
             HdlGatewayReceiveLogic.Current.AddAttributeEvent("ReadAirConditionerModeSupport", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
             {
-                string checkKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
+                string checkKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                 if (checkKeys != mainkeys || report.DeviceStatusReport.CluterID != 514)
                 {
                     return;
@@ -326,7 +326,7 @@
             {
                 //鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
                 string msg = Language.StringByID(R.MyInternationalizationString.uGetAirConditionerSwingFunctionFail);
-                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
                 this.ShowMassage(ShowMsgType.Tip, msg);
                 return false;
             }

--
Gitblit v1.8.0