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/Device/Logic/AddScenePage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index ee0245f..9b7b4dc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -66,7 +66,7 @@
#endregion
///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
- var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+ var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
if (listAllRoom.Count == 0)
{
return;
@@ -82,7 +82,7 @@
{
if (clickTag == "no" || tempScene == null)
{
- var alert = new ShowMsgControl(ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.scenetip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -126,7 +126,7 @@
{
Width = Application.GetRealWidth(450),
- Height = Application.GetRealHeight(780),
+ Height = Application.GetRealWidth(780),
X = Application.GetRealWidth(1080 - 468 - 35),
Y = Application.GetRealHeight(184),
BackgroundImagePath = "Item/SelectFloor_Right.png",
@@ -166,8 +166,8 @@
var btnfoolricon = new Button
{
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
+ Width = Application.GetRealWidth(81),
+ Height = Application.GetRealWidth(81),
UnSelectedImagePath = "Floor/Floor.png",
Gravity = Gravity.CenterVertical,
};
@@ -298,7 +298,7 @@
middle.RemoveAll();
foreach (var sceneId in scenelist)
{
- var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+ var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
if (scene == null)
{
continue;
@@ -312,8 +312,8 @@
var sceneIconBtn = new Button
{
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
+ Width = Application.GetRealWidth(81),
+ Height = Application.GetRealWidth(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
UnSelectedImagePath = "ZigeeLogic/scene.png",
@@ -343,8 +343,8 @@
var selectedBtn = new Button
{
- Width = Application.GetMinRealAverage(60),
- Height = Application.GetMinRealAverage(60),
+ Width = Application.GetRealWidth(60),
+ Height = Application.GetRealWidth(60),
X = Application.GetRealWidth(789),
UnSelectedImagePath = "ZigeeLogic/selected.png",
Visible = false,
--
Gitblit v1.8.0