From 239a04a9ce0652de805e05947deb658d004efc46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 01 二月 2021 14:17:55 +0800
Subject: [PATCH] 2021-2-1-1

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index d1541f4..3deb6ed 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,
@@ -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,
@@ -380,7 +378,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,6 +394,7 @@
                     TextColor = SkinStyle.Current.TextColor1,
                 };
                 subaccountView.AddChidren (btnSubaccountTitle);
+
                 Button btnNullSubaccount = new Button () {
                     Height = Application.GetRealHeight (5),
                     BackgroundColor = SkinStyle.Current.MainColor
@@ -446,7 +444,17 @@
             #endregion
 
 
+            //if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
+            //    //涓昏处鍙峰紑鏀捐鍔熻兘;
+            //    UserMiddle.SettingView.AddChidren (ScheduleView);
+            //    UserMiddle.SettingView.AddChidren (AlexaView);
+            //    UserMiddle.SettingView.AddChidren (subaccountView);
+            //}
 
+            //涓昏处鍙峰紑鏀捐鍔熻兘;
+            UserMiddle.SettingView.AddChidren (ScheduleView);
+            UserMiddle.SettingView.AddChidren (AlexaView);
+            UserMiddle.SettingView.AddChidren (subaccountView);
             #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