Merge branch 'master' into wjc

陈嘉乐

2021-03-02 c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1

 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs

@@ -329,7 +329,7 @@
                Height = Application.GetRealHeight (5),
                BackgroundColor = SkinStyle.Current.MainColor
            };
           
            //UserMiddle.SettingView.AddChidren (btnNullSchedule);
            #endregion


@@ -356,7 +356,7 @@
            };
            AlexaView.AddChidren (btnAlexaTitle);
            EventHandler<MouseEventArgs> AlexaEventHandler = (sender, e) => {
                var alexaPage = new AlexaDeviceListPage ();
                var alexaPage = new SmartSpeakertListPage ();
                UserMiddle.SettingPageView.AddChidren (alexaPage);
                alexaPage.ShowPage ();
                UserMiddle.SettingPageView.PageIndex = 1;
@@ -368,6 +368,7 @@
                Height = Application.GetRealHeight (5),
                BackgroundColor = SkinStyle.Current.MainColor
            };
            //UserMiddle.SettingView.AddChidren (btnNullAlexa);
            #endregion

            #region subaccount
@@ -398,7 +399,7 @@
                    Height = Application.GetRealHeight (5),
                    BackgroundColor = SkinStyle.Current.MainColor
                };
               
            //UserMiddle.SettingView.AddChidren (btnNullSubaccount);

                EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
                    if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
@@ -442,7 +443,6 @@
            //}
            #endregion


            if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
                //主账号开放该功能;
                UserMiddle.SettingView.AddChidren (ScheduleView);
@@ -452,8 +452,6 @@
                UserMiddle.SettingView.AddChidren (subaccountView);
                UserMiddle.SettingView.AddChidren (btnNullSubaccount);
            }

            //主账号开放该功能;
         
            #region ---help---
            var helpView = new FrameLayout () {