2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，A...

JLChen

2020-09-03 d8545fbd1b36a6766c57c987e5d89862b470fed9

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

@@ -211,89 +211,91 @@

            #region ---数据接收---
            //if (MainPage.LoginUser.AccountType == 2 || MainPage.LoginUser.AccountString == @"464027401@qq.com") {
            //    var DataReceptionView = new FrameLayout () {
            //        Width = Application.GetRealWidth (640),
            //        Height = Application.GetRealHeight (100),
            //        BackgroundColor = SkinStyle.Current.ViewColor
            //    };
            //    UserMiddle.SettingView.AddChidren (DataReceptionView);
            //    var btnDataReceptionIcon = new Button () {
            //        X = Application.GetRealWidth (30),
            //        Gravity = Gravity.CenterVertical,
            //        Width = Application.GetRealWidth (75),
            //        Height = Application.GetRealHeight (75),
            //        UnSelectedImagePath = "AccountSettings/DataShared.png"
            //    };
            //    DataReceptionView.AddChidren (btnDataReceptionIcon);
            //    var btnDataReceptionTitle = new Button () {
            //        X = Application.GetRealWidth (125),
            //        TextAlignment = TextAlignment.CenterLeft,
            //        TextID = R.MyInternationalizationString.DataReception,
            //        TextColor = SkinStyle.Current.TextColor1,
            //    };
            //    DataReceptionView.AddChidren (btnDataReceptionTitle);
            //    EventHandler<MouseEventArgs> DataReceptionEventHandler = (sender, e) => {
            //        GoData ();
            //    };
            //    DataReceptionView.MouseUpEventHandler += DataReceptionEventHandler;
            //    btnDataReceptionIcon.MouseUpEventHandler += DataReceptionEventHandler;
            //    btnDataReceptionTitle.MouseUpEventHandler += DataReceptionEventHandler;
            //    Button btnNull3 = new Button () {
            //        BackgroundColor = SkinStyle.Current.MainColor,
            //        Height = Application.GetRealHeight (5)
            //    };
            //    UserMiddle.SettingView.AddChidren (btnNull3);
            //}
            #endregion
            if (true) {
                var DataReceptionView = new FrameLayout () {
                    Width = Application.GetRealWidth (640),
                    Height = Application.GetRealHeight (100),
                    BackgroundColor = SkinStyle.Current.ViewColor
                };
                UserMiddle.SettingView.AddChidren (DataReceptionView);
                var btnDataReceptionIcon = new Button () {
                    X = Application.GetRealWidth (30),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetRealWidth (75),
                    Height = Application.GetRealHeight (75),
                    UnSelectedImagePath = "AccountSettings/DataShared.png"
                };
                DataReceptionView.AddChidren (btnDataReceptionIcon);
                var btnDataReceptionTitle = new Button () {
                    X = Application.GetRealWidth (125),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextID = R.MyInternationalizationString.DataReception,
                    TextColor = SkinStyle.Current.TextColor1,
                };
                DataReceptionView.AddChidren (btnDataReceptionTitle);
                EventHandler<MouseEventArgs> DataReceptionEventHandler = (sender, e) => {

                    GoData ();
                };
                DataReceptionView.MouseUpEventHandler += DataReceptionEventHandler;
                btnDataReceptionIcon.MouseUpEventHandler += DataReceptionEventHandler;
                btnDataReceptionTitle.MouseUpEventHandler += DataReceptionEventHandler;
                Button btnNull3 = new Button () {
                    BackgroundColor = SkinStyle.Current.MainColor,
                    Height = Application.GetRealHeight (5)
                };
                UserMiddle.SettingView.AddChidren (btnNull3);
            }
        #endregion


            #region ---msg---
            //FrameLayout WarningMsgView = new FrameLayout () {
            //    Width = Application.GetRealWidth (640),
            //    Height = Application.GetRealHeight (100),
            //    BackgroundColor = SkinStyle.Current.ViewColor
            //};
            //UserMiddle.SettingView.AddChidren (WarningMsgView);
            //Button btnWarningMsgIcon = new Button () {
            //    X = Application.GetRealWidth (30),
            //    Gravity = Gravity.CenterVertical,
            //    Width = Application.GetRealWidth (75),
            //    Height = Application.GetRealHeight (75),
            //    UnSelectedImagePath = "RemoteMsg/RemoteIcon.png",
            //    SelectedImagePath = "RemoteMsg/RemoteIconOn.png"
            //};
            //WarningMsgView.AddChidren (btnWarningMsgIcon);
        #region ---msg---
        //FrameLayout WarningMsgView = new FrameLayout () {
        //    Width = Application.GetRealWidth (640),
        //    Height = Application.GetRealHeight (100),
        //    BackgroundColor = SkinStyle.Current.ViewColor
        //};
        //UserMiddle.SettingView.AddChidren (WarningMsgView);
        //Button btnWarningMsgIcon = new Button () {
        //    X = Application.GetRealWidth (30),
        //    Gravity = Gravity.CenterVertical,
        //    Width = Application.GetRealWidth (75),
        //    Height = Application.GetRealHeight (75),
        //    UnSelectedImagePath = "RemoteMsg/RemoteIcon.png",
        //    SelectedImagePath = "RemoteMsg/RemoteIconOn.png"
        //};
        //WarningMsgView.AddChidren (btnWarningMsgIcon);

            //Button btnWarningMsgTitle = new Button () {
            //    X = btnWarningMsgIcon.Right + Application.GetRealWidth (20),
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextID = R.MyInternationalizationString.MessageAlert,
            //    TextColor = SkinStyle.Current.TextColor1,
            //};
            //WarningMsgView.AddChidren (btnWarningMsgTitle);
            //btnWarningMsgTitle.MouseLongEventHandler += (sd, ds) => {
            //    //var uc = UserConfig.Instance.RometoUserInfoKeys.Find ((obj) => obj.Contains ("HiddenJson"));
            //    //new Alert ("", uc, "close").Show ();
            //};
        //Button btnWarningMsgTitle = new Button () {
        //    X = btnWarningMsgIcon.Right + Application.GetRealWidth (20),
        //    TextAlignment = TextAlignment.CenterLeft,
        //    TextID = R.MyInternationalizationString.MessageAlert,
        //    TextColor = SkinStyle.Current.TextColor1,
        //};
        //WarningMsgView.AddChidren (btnWarningMsgTitle);
        //btnWarningMsgTitle.MouseLongEventHandler += (sd, ds) => {
        //    //var uc = UserConfig.Instance.RometoUserInfoKeys.Find ((obj) => obj.Contains ("HiddenJson"));
        //    //new Alert ("", uc, "close").Show ();
        //};

            //EventHandler<MouseEventArgs> WarningMsgEventHandler = (sender, e) => {
            //    var msgView = new WarningList ();
            //    UserMiddle.SettingPageView.AddChidren (msgView);
            //    msgView.ShowWarningListPage ();
            //    UserMiddle.SettingPageView.PageIndex = 1;
            //};
            //WarningMsgView.MouseUpEventHandler += WarningMsgEventHandler;
            //btnWarningMsgIcon.MouseUpEventHandler += WarningMsgEventHandler;
            //btnWarningMsgTitle.MouseUpEventHandler += WarningMsgEventHandler;
            //Button btnNullWarningMsg = new Button () {
            //    Height = Application.GetRealHeight (5),
            //    BackgroundColor = SkinStyle.Current.MainColor
            //};
            //UserMiddle.SettingView.AddChidren (btnNullWarningMsg);
            #endregion
        //EventHandler<MouseEventArgs> WarningMsgEventHandler = (sender, e) => {
        //    var msgView = new WarningList ();
        //    UserMiddle.SettingPageView.AddChidren (msgView);
        //    msgView.ShowWarningListPage ();
        //    UserMiddle.SettingPageView.PageIndex = 1;
        //};
        //WarningMsgView.MouseUpEventHandler += WarningMsgEventHandler;
        //btnWarningMsgIcon.MouseUpEventHandler += WarningMsgEventHandler;
        //btnWarningMsgTitle.MouseUpEventHandler += WarningMsgEventHandler;
        //Button btnNullWarningMsg = new Button () {
        //    Height = Application.GetRealHeight (5),
        //    BackgroundColor = SkinStyle.Current.MainColor
        //};
        //UserMiddle.SettingView.AddChidren (btnNullWarningMsg);
        #endregion

            #region ---Schedule---
            FrameLayout ScheduleView = new FrameLayout () {
        #region ---Schedule---
        FrameLayout ScheduleView = new FrameLayout () {
                Width = Application.GetRealWidth (640),
                Height = Application.GetRealHeight (100),
                BackgroundColor = SkinStyle.Current.ViewColor
@@ -429,6 +431,8 @@
                                    subView.ShowSubaccountListView ();
                                    UserMiddle.SettingPageView.PageIndex += 1;
                                });
                            } else {
                                ShowGetSubAccountByDistributedMarkErrorInfo (revertObj.StateCode);
                            }
                        } catch (Exception ex) {
                            MainPage.FailureToServer ();
@@ -588,5 +592,29 @@
            dialog.Show ();
        }



        /// <summary>
        /// 
        /// </summary>
        /// <param name="stateCodeStr"></param>
        static void ShowGetSubAccountByDistributedMarkErrorInfo (string stateCodeStr)
        {
            string mes = "";
          
            if (stateCodeStr == ErrorCode.NetworkError) {
                mes = ErrorCode.NetworkError;
            } else {
                mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
            }
            if (!string.IsNullOrEmpty (mes)) {
                Application.RunOnMainThread (() => {
                    new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                });
            }


        }

    }
}