From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 17 十二月 2020 09:07:13 +0800 Subject: [PATCH] 新云端Ver1.3 --- ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs index 53864ae..ad9af3c 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs @@ -106,7 +106,7 @@ btnDeviceName.TextSize = 16; btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1; btnDeviceName.SelectedTextColor = UserCenterColor.Current.White; - btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device); + btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device); this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent); //鏀堕泦鎺т欢 @@ -219,9 +219,9 @@ btnCollect.IsSelected = collect; } //璁惧鍥炬爣涔熷埛鏂� - Common.LocalDevice.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device); + HdlDeviceCommonLogic.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device); //鍚嶅瓧鍒锋柊 - this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device); + this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device); //妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵�� bool isOpen = this.CheckIsOpenStatu(i_device); if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false) @@ -247,7 +247,7 @@ public void SetCardOpenStatu(bool isOpen) { //璁惧鐘舵�佸繀椤诲埛鏂� - this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device); + this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device); //寮�鍏虫帶浠� if (btnSwitch != null && this.btnSwitch.IsSelected != isOpen) { @@ -307,7 +307,7 @@ //濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳� this.isHadOpenSwitch = false; //榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇 - return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device); + return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device); } @@ -482,7 +482,7 @@ public void StartCardLightAppeal() { //璁惧鐘舵�佸繀椤诲埛鏂� - this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device); + this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device); if (this.isAppeal == true) { return; } this.isAppeal = true; -- Gitblit v1.8.0