From 502d4ff743c1645adb469ab89c24826c4ec38f28 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 二月 2021 15:40:47 +0800
Subject: [PATCH] 2021-2-5-2
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index d1541f4..99b9657 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -117,7 +117,7 @@
UserMiddle.SettingView.AddChidren (btTopNull);
#endregion
-
+
#region ---杩涘叆鍚庡彴---DeviceManagementView---
if (true) {//璋冭瘯璐﹀彿
//if (MainPage.LoginUser.AccountType == 0) {//璋冭瘯璐﹀彿
@@ -294,13 +294,12 @@
//UserMiddle.SettingView.AddChidren (btnNullWarningMsg);
#endregion
- #region ---Schedule---
+ #region ---Schedule---
FrameLayout ScheduleView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
BackgroundColor = SkinStyle.Current.ViewColor
};
- UserMiddle.SettingView.AddChidren (ScheduleView);
Button btnScheduleIcon = new Button () {
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
@@ -330,7 +329,7 @@
Height = Application.GetRealHeight (5),
BackgroundColor = SkinStyle.Current.MainColor
};
- UserMiddle.SettingView.AddChidren (btnNullSchedule);
+
#endregion
@@ -340,7 +339,6 @@
Height = Application.GetRealHeight (100),
BackgroundColor = SkinStyle.Current.ViewColor
};
- UserMiddle.SettingView.AddChidren (AlexaView);
Button btnAlexaIcon = new Button () {
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
@@ -370,7 +368,6 @@
Height = Application.GetRealHeight (5),
BackgroundColor = SkinStyle.Current.MainColor
};
- UserMiddle.SettingView.AddChidren (btnNullAlexa);
#endregion
#region subaccount
@@ -380,7 +377,6 @@
Height = Application.GetRealHeight (100),
BackgroundColor = SkinStyle.Current.ViewColor
};
- UserMiddle.SettingView.AddChidren (subaccountView);
Button btnSubaccountIcon = new Button () {
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
@@ -397,11 +393,12 @@
TextColor = SkinStyle.Current.TextColor1,
};
subaccountView.AddChidren (btnSubaccountTitle);
+
Button btnNullSubaccount = new Button () {
Height = Application.GetRealHeight (5),
BackgroundColor = SkinStyle.Current.MainColor
};
- UserMiddle.SettingView.AddChidren (btnNullSubaccount);
+
EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
@@ -446,7 +443,18 @@
#endregion
+ if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
+ //涓昏处鍙峰紑鏀捐鍔熻兘;
+ UserMiddle.SettingView.AddChidren (ScheduleView);
+ UserMiddle.SettingView.AddChidren (btnNullSchedule);
+ UserMiddle.SettingView.AddChidren (AlexaView);
+ UserMiddle.SettingView.AddChidren (btnNullAlexa);
+ UserMiddle.SettingView.AddChidren (subaccountView);
+ UserMiddle.SettingView.AddChidren (btnNullSubaccount);
+ }
+ //涓昏处鍙峰紑鏀捐鍔熻兘;
+
#region ---help---
var helpView = new FrameLayout () {
Width = Application.GetRealWidth (640),
@@ -494,6 +502,8 @@
#endregion
+
+
Button btnNullSkin = new Button () {
Height = Application.GetRealHeight (5),
BackgroundColor = SkinStyle.Current.MainColor
--
Gitblit v1.8.0