From ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 三月 2021 09:37:54 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingScenePage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingScenePage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingScenePage.cs
index a51d641..ade437b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingScenePage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingScenePage.cs
@@ -243,8 +243,8 @@
var btnChoose = new Button () {
X = Application.GetRealWidth (472 + 80),
- Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (72),
+ Width = Application.GetMinRealAverage (75),
+ Height = Application.GetMinRealAverage (72),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "CrabtreeAdd/Choose.png",
SelectedImagePath = "CrabtreeAdd/ChooseOn.png",
@@ -253,8 +253,8 @@
deviceRow.AddChidren (btnChoose);
- var sceneData = targetInfoList.Find ((obj) => obj.targetId == sceneBase.userSceneId);
- btnChoose.IsSelected = sceneData != null;
+ var targetSceneData = targetInfoList.Find ((obj) => obj.targetId == sceneBase.userSceneId);
+ btnChoose.IsSelected = targetSceneData != null;
btnChoose.MouseUpEventHandler += (sendere, ee) => {
--
Gitblit v1.8.0