From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
index 0f3b72a..b513392 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
@@ -94,7 +94,7 @@
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(78);
btnDeviceIcon.Gravity = Gravity.Center;
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
frameIconBackGroud.AddChidren(btnDeviceIcon);
//閲嶆柊缁戝畾浜嬩欢
this.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);
@@ -102,7 +102,7 @@
//璁惧鍚嶅瓧
this.btnDeviceName = new NormalViewControl(Application.GetRealWidth(600), this.Height, false);
btnDeviceName.X = Application.GetRealWidth(181);
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
btnDeviceName.Gravity = Gravity.CenterVertical;
this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
@@ -127,9 +127,9 @@
}
//搴曠嚎
- var btnBottomLine = new NormalViewControl(Application.GetRealWidth(835), HdlControlResourse.BottomLineHeight, false);
+ var btnBottomLine = new NormalViewControl(Application.GetRealWidth(835), ControlCommonResourse.BottomLineHeight, false);
btnBottomLine.X = Application.GetRealWidth(181);
- btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;
+ btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
this.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);
}
--
Gitblit v1.8.0