From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs
index 7d66fc3..2d44dc2 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs
@@ -58,6 +58,11 @@
topView.AddChidren (ItemButton);
#endregion
+ //2020-07-01
+ if (UserConfig.Instance.CurrentRegion != null && !string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.Name)) {
+ NameButton.Text = UserConfig.Instance.CurrentRegion.Name;
+ }
+
EventHandler<MouseEventArgs> addSubaccountHandler = (sender, e) => {
modifySubaccount (null);
};
@@ -109,13 +114,34 @@
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout () {
Y = topUserMsgView.Bottom,
- Height = Application.GetRealHeight (1136) - topUserMsgView.Bottom,
+ Height = Application.GetRealHeight (1136-80) - topUserMsgView.Bottom,
BackgroundColor = SkinStyle.Current.ViewColor,
ScrollEnabled = false,
};
AddChidren (contentView);
-
+ //#region
+ ////褰撳墠浣忓畢
+ //FrameLayout homeView = new FrameLayout () {
+ // Height = Application.GetRealHeight (100),
+ // BackgroundColor = SkinStyle.Current.Transparent
+ //};
+ //contentView.AddChidren (homeView);
+
+ //Button btnHomeText = new Button () {
+ // X = Application.GetRealWidth (40),
+ // Width = Application.GetRealWidth (600),
+ // //TextID = R.MyInternationalizationString.Subaccount,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = SkinStyle.Current.TextColor1,
+ //};
+ //homeView.AddChidren (btnHomeText);
+
+ //if (UserConfig.Instance.CurrentRegion != null && !string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.Name)) {
+ // btnHomeText.Text = "Current residence: " + UserConfig.Instance.CurrentRegion.Name;
+ //}
+ //#endregion
+
FrameLayout subaccountView = new FrameLayout () {
Height = Application.GetRealHeight (50),
BackgroundColor = SkinStyle.Current.MainColor
@@ -145,6 +171,23 @@
addSubaccountList ();
+ addTipView ();
+ }
+
+ void addTipView () {
+ var TipView = new Button () {
+ Width = LayoutParams.MatchParent,
+ Y = Application.GetRealHeight (Application.DesignHeight - 80),
+ Height = Application.GetRealHeight (80),
+ BackgroundColor = 0xFFFFFFE0,
+ TextSize = 11,
+ TextColor = 0xFF1F1F1F,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true,
+ Text = "Manage the member list of the current residence and share it to other accounts. \n Tips: You need to add the registered member account.",
+
+ };
+ AddChidren (TipView);
}
void addSubaccountList ()
--
Gitblit v1.8.0