From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
index d3d3a4c..c7341bd 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs
@@ -50,7 +50,16 @@
{
#region ---TopView---
base.ShowPage ();
- this.topTitleBtn.Text = "Alexa";
+ //this.topTitleBtn.Text = "Alexa";
+
+ //璁剧疆鏍囬涓洪煶绠卞娉�
+ if (mAlexa != null) {
+ if (string.IsNullOrEmpty (mAlexa.remark)) {
+ this.topTitleBtn.Text = mAlexa.platformName;
+ } else {
+ this.topTitleBtn.Text = mAlexa.remark;
+ }
+ }
//娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> addSubaccountHandler = (sender, e) => {
OpenAlexaSettingPage ();
@@ -60,7 +69,7 @@
#region 璁惧-鍦烘櫙
var topView = new FrameLayout () {
- Height = Application.GetRealHeight (110),
+ Height = Application.GetRealWidth (110),
BackgroundColor = SkinStyle.Current.TitileView,
};
BaseContentView.AddChidren (topView);
@@ -465,9 +474,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