From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
index d3d3a4c..e1ddf4b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
@@ -465,9 +465,9 @@
//}
Application.RunOnMainThread (() => {
if (IsDeviceList) {
- var userDeviceListPage = new AlexaSettingPage (tempRoom);
+ var userDeviceListPage = new AlexaSettingDevicePage (targetInfoList);
userDeviceListPage.Show ();
- userDeviceListPage.ShowPage (null,null);
+ userDeviceListPage.ShowPage (saveAction);
} else {
var mAlexaSettingScenePage = new AlexaSettingScenePage (targetInfoList);
mAlexaSettingScenePage.Show ();
--
Gitblit v1.8.0