From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 211 ++++++++++++++++++++++++++++++----------------------
1 files changed, 120 insertions(+), 91 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index 2e1fb7b..7a5d96f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -41,11 +41,11 @@
};
topView.AddChidren (NameButton);
//try {
- // Console.WriteLine ("3");
+ // Utlis.WriteLine ("3");
// UserMiddle.SettingBodyView.AddChidren (topView);
- // Console.WriteLine ("3");
+ // Utlis.WriteLine ("3");
//} catch(Exception ex) {
- // Console.WriteLine (ex.ToString ());
+ // Utlis.WriteLine (ex.ToString ());
//}
FrameLayout topUserMsgView = new FrameLayout () {
@@ -58,7 +58,7 @@
Button btnUserIcon = new Button () {
X = Application.GetRealWidth (27),
Width = Application.GetRealWidth (96),
- Height = Application.GetRealHeight (96),
+ Height = Application.GetRealWidth (96),
Gravity = Gravity.CenterVertical,
Radius = 5,
BorderColor = SkinStyle.Current.Transparent,
@@ -95,7 +95,7 @@
Button btnTopUserMsgRight = new Button () {
X = Application.GetRealWidth (570),
Width = Application.GetRealWidth (28),
- Height = Application.GetRealHeight (40),
+ Height = Application.GetRealWidth (40),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Right.png",
SelectedImagePath = "Item/RightSelected.png",
@@ -132,7 +132,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "AccountSettings/DeviceManagement.png",
IsSelected = false
};
@@ -149,7 +149,7 @@
EventHandler<MouseEventArgs> SystemEventHandler = (sender, e) => {
var hl = new GuideAddResidence ();
UserMiddle.SettingPageView.AddChidren (hl);
- hl.ShowHomeList ();
+ hl.ShowHomeView ();
UserMiddle.SettingPageView.PageIndex = UserMiddle.SettingPageView.ChildrenCount - 1;
//HomeListView hl = new HomeListView ();
@@ -180,7 +180,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "AccountSettings/Backup.png"
};
BackupView.AddChidren (btnBackupIcon);
@@ -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
@@ -303,7 +305,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "CrabtreeAdd/Schedule.png",
};
ScheduleView.AddChidren (btnScheduleIcon);
@@ -343,7 +345,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "CrabtreeAdd/Alexa.png",
};
AlexaView.AddChidren (btnAlexaIcon);
@@ -383,7 +385,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "CrabtreeAdd/SubaccountIcon.png",
};
subaccountView.AddChidren (btnSubaccountIcon);
@@ -429,10 +431,12 @@
subView.ShowSubaccountListView ();
UserMiddle.SettingPageView.PageIndex += 1;
});
+ } else {
+ ShowGetSubAccountByDistributedMarkErrorInfo (revertObj.StateCode);
}
} catch (Exception ex) {
MainPage.FailureToServer ();
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -459,7 +463,7 @@
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "CrabtreeAdd/Help.png",
SelectedImagePath = "CrabtreeAdd/HelpOn.png"
};
@@ -475,6 +479,7 @@
btnhelpTitle.MouseLongEventHandler += (sd, ds) => {
//var uc = UserConfig.Instance.RometoUserInfoKeys.Find ((obj) => obj.Contains ("HiddenJson"));
//new Alert ("", uc, "close").Show ();
+
};
EventHandler<MouseEventArgs> helpEventHandler = (sender, e) => {
@@ -587,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 ();
+ });
+ }
+
+
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0