From f0f63edda354eaf18895f0b92ff6d308bd778176 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 11:01:12 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
index 2ecfb81..36b5b9d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
@@ -151,15 +151,15 @@
foreach (var function in DB_ResidenceData.functionList.scenes)
{
- var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
- if (sbkScene != null)
- {
- addedList.Add(function);
- }
- else
- {
- notAddedList.Add(function);
- }
+ //var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
+ //if (sbkScene != null)
+ //{
+ // addedList.Add(function);
+ //}
+ //else
+ //{
+ // notAddedList.Add(function);
+ //}
}
foreach (var ddd in sbk_Devcie.number)
{
@@ -174,8 +174,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
--
Gitblit v1.8.0