From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2

---
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
index c30c0e5..471b9df 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
@@ -66,7 +66,7 @@
             if (((LightBase)this.device).OnOffStatus == 1)
             {
                 //浜害 XX
-                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
             }
             else
             {
@@ -81,7 +81,7 @@
             btnLightView.Y = Application.GetRealHeight(320);
             frameWhiteBack.AddChidren(btnLightView);
             //搴曠嚎
-            var btnLightLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+            var btnLightLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
             btnLightLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
             btnLightLine.X = btnLightView.X;
             btnLightLine.Y = btnLightView.Bottom + Application.GetRealHeight(37);
@@ -108,7 +108,7 @@
             btnColorView.Y = btnLightLine.Y + Application.GetRealHeight(107);
             frameWhiteBack.AddChidren(btnColorView);
             //搴曠嚎
-            var btnColorLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+            var btnColorLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
             btnColorLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
             btnColorLine.X = btnColorView.X;
             btnColorLine.Y = btnColorView.Bottom + Application.GetRealHeight(37);
@@ -150,7 +150,7 @@
             btnBuzzerView.Y = btnColorLine.Y + Application.GetRealHeight(107);
             frameWhiteBack.AddChidren(btnBuzzerView);
             //搴曠嚎
-            var btnBuzzerLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+            var btnBuzzerLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
             btnBuzzerLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
             btnBuzzerLine.X = btnBuzzerView.X;
             btnBuzzerLine.Y = btnBuzzerView.Bottom + Application.GetRealHeight(37);
@@ -178,7 +178,7 @@
             btnMiniView.Y = btnBuzzerLine.Y + Application.GetRealHeight(107);
             frameWhiteBack.AddChidren(btnMiniView);
             //搴曠嚎
-            var btnMiniLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+            var btnMiniLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
             btnMiniLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
             btnMiniLine.X = btnMiniView.X;
             btnMiniLine.Y = btnMiniView.Bottom + Application.GetRealHeight(37);
@@ -228,7 +228,7 @@
                     //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鐩存帴鏀圭紦瀛�
                     ((ColorTemperatureLight)this.device).Level = value * MaxLevel / 100;
                     //浜害 XX
-                    this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+                    this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
                 }
             };
 
@@ -412,10 +412,10 @@
         private void AddReceiveBuzzerAckEvent()
         {
             //Ack涓婚涓婃姤
-            string mainKeys = LocalDevice.Current.GetDeviceMainKeys(this.device);
+            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.device);
             HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceBuzzerDetailCardACK", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
             {
-                string mainKey2 = LocalDevice.Current.GetDeviceMainKeys(report);
+                string mainKey2 = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
                 if (mainKeys != mainKey2)
                 {
                     //涓嶆槸鍚屼竴涓笢瑗�
@@ -474,7 +474,7 @@
             if (isOpen == true)
             {
                 //浜害鏄繀椤昏鍒锋柊鐨�  浜害 XX
-                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + "  " + HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
                 if (this.btnMiniSwitch.IsSelected == false)
                 {
                     this.btnMiniSwitch.IsSelected = true;

--
Gitblit v1.8.0