From 50b7b7a486f56fab27c83b59eb45673c6d9f0935 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 二月 2021 18:33:57 +0800
Subject: [PATCH] 2021-02-24 1.新增场景上传。2.优化
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 240 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 124 insertions(+), 116 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index d1541f4..eb4ce52 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -74,7 +74,7 @@
Height = Application.GetRealHeight (50),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
- Text = MainPage.LoginUser.Name == "" ? Language.StringByID(R.MyInternationalizationString.Account) : MainPage.LoginUser.Name,
+ Text = MainPage.LoginUser.Name == "" ? Language.StringByID (R.MyInternationalizationString.Account) : MainPage.LoginUser.Name,
//TextID = R.MyInternationalizationString.Account
};
topUserMsgView.AddChidren (btnUserName);
@@ -102,7 +102,7 @@
};
topUserMsgView.AddChidren (btnTopUserMsgRight);
-
+
EventHandler<MouseEventArgs> accountEventHandler = (sender, e) => {
new AccountLogin ().Show ();
};
@@ -246,61 +246,60 @@
};
UserMiddle.SettingView.AddChidren (btnNull3);
}
- #endregion
+ #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
};
- 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);
+ //UserMiddle.SettingView.AddChidren (btnNullSchedule);
#endregion
@@ -340,13 +339,12 @@
Height = Application.GetRealHeight (100),
BackgroundColor = SkinStyle.Current.ViewColor
};
- UserMiddle.SettingView.AddChidren (AlexaView);
Button btnAlexaIcon = new Button () {
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
Height = Application.GetRealWidth (75),
- UnSelectedImagePath = "CrabtreeAdd/Alexa.png",
+ UnSelectedImagePath = "CrabtreeAdd/Alexa.png",
};
AlexaView.AddChidren (btnAlexaIcon);
@@ -358,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;
@@ -370,82 +368,90 @@
Height = Application.GetRealHeight (5),
BackgroundColor = SkinStyle.Current.MainColor
};
- UserMiddle.SettingView.AddChidren (btnNullAlexa);
+ //UserMiddle.SettingView.AddChidren (btnNullAlexa);
#endregion
#region subaccount
//if (MainPage.LoginUser.AccountType == 0) {
- FrameLayout subaccountView = new FrameLayout () {
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (100),
- BackgroundColor = SkinStyle.Current.ViewColor
- };
- UserMiddle.SettingView.AddChidren (subaccountView);
- Button btnSubaccountIcon = new Button () {
- X = Application.GetRealWidth (30),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth (75),
- Height = Application.GetRealWidth (75),
- UnSelectedImagePath = "CrabtreeAdd/SubaccountIcon.png",
- };
- subaccountView.AddChidren (btnSubaccountIcon);
+ FrameLayout subaccountView = new FrameLayout () {
+ Width = Application.GetRealWidth (640),
+ Height = Application.GetRealHeight (100),
+ BackgroundColor = SkinStyle.Current.ViewColor
+ };
+ Button btnSubaccountIcon = new Button () {
+ X = Application.GetRealWidth (30),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth (75),
+ Height = Application.GetRealWidth (75),
+ UnSelectedImagePath = "CrabtreeAdd/SubaccountIcon.png",
+ };
+ subaccountView.AddChidren (btnSubaccountIcon);
- Button btnSubaccountTitle = new Button () {
- X = Application.GetRealWidth (125),
- TextAlignment = TextAlignment.CenterLeft,
- Text= "User Management",
- TextColor = SkinStyle.Current.TextColor1,
- };
- subaccountView.AddChidren (btnSubaccountTitle);
- Button btnNullSubaccount = new Button () {
- Height = Application.GetRealHeight (5),
- BackgroundColor = SkinStyle.Current.MainColor
- };
- UserMiddle.SettingView.AddChidren (btnNullSubaccount);
+ Button btnSubaccountTitle = new Button () {
+ X = Application.GetRealWidth (125),
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "User Management",
+ TextColor = SkinStyle.Current.TextColor1,
+ };
+ subaccountView.AddChidren (btnSubaccountTitle);
- EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
- if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
- //鎻愮ず娌℃湁鍒嗕韩浣忓畢鐨勬潈闄�
- new Alert ("", ErrorCode.InsufficientAuthority, "Close").Show ();
- return;
- }
+ Button btnNullSubaccount = new Button () {
+ Height = Application.GetRealHeight (5),
+ BackgroundColor = SkinStyle.Current.MainColor
+ };
+ //UserMiddle.SettingView.AddChidren (btnNullSubaccount);
- if (UserConfig.Instance.internetStatus == 0) {
- new Alert ("", "Unable to save data, please check the network.", "Close").Show ();
- return;
- }
- MainPage.Loading.Start ("Please wait...");
- System.Threading.Tasks.Task.Run (() => {
- try {
- var revertObj = HttpServerRequest.Current.GetResidenceMemberAccount ();
- if (revertObj.Code == StateCode.SUCCESS) {
- Application.RunOnMainThread (() => {
- var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>> (revertObj.Data.ToString ());
- SubaccountListView subView = new SubaccountListView (responeObj);
- UserMiddle.SettingPageView.AddChidren (subView);
- subView.ShowSubaccountListView ();
- UserMiddle.SettingPageView.PageIndex += 1;
- });
- } else {
- IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
- }
- } catch (Exception ex) {
- MainPage.FailureToServer ();
- Utlis.WriteLine (ex.Message);
- } finally {
+ EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
+ if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
+ //鎻愮ず娌℃湁鍒嗕韩浣忓畢鐨勬潈闄�
+ new Alert ("", ErrorCode.InsufficientAuthority, "Close").Show ();
+ return;
+ }
+
+ if (UserConfig.Instance.internetStatus == 0) {
+ new Alert ("", "Unable to save data, please check the network.", "Close").Show ();
+ return;
+ }
+ MainPage.Loading.Start ("Please wait...");
+ System.Threading.Tasks.Task.Run (() => {
+ try {
+ var revertObj = HttpServerRequest.Current.GetResidenceMemberAccount ();
+ if (revertObj.Code == StateCode.SUCCESS) {
Application.RunOnMainThread (() => {
- MainPage.Loading.Hide ();
+ var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>> (revertObj.Data.ToString ());
+ SubaccountListView subView = new SubaccountListView (responeObj);
+ UserMiddle.SettingPageView.AddChidren (subView);
+ subView.ShowSubaccountListView ();
+ UserMiddle.SettingPageView.PageIndex += 1;
});
+ } else {
+ IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
}
- });
- };
- subaccountView.MouseUpEventHandler += SubaccountEventHandler;
- btnSubaccountIcon.MouseUpEventHandler += SubaccountEventHandler;
- btnSubaccountTitle.MouseUpEventHandler += SubaccountEventHandler;
+ } catch (Exception ex) {
+ MainPage.FailureToServer ();
+ Utlis.WriteLine (ex.Message);
+ } finally {
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+ }
+ });
+ };
+ subaccountView.MouseUpEventHandler += SubaccountEventHandler;
+ btnSubaccountIcon.MouseUpEventHandler += SubaccountEventHandler;
+ btnSubaccountTitle.MouseUpEventHandler += SubaccountEventHandler;
//}
#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 () {
@@ -492,6 +498,8 @@
};
UserMiddle.SettingView.AddChidren (btnNullhelp);
#endregion
+
+
Button btnNullSkin = new Button () {
@@ -596,7 +604,7 @@
static void ShowGetSubAccountByDistributedMarkErrorInfo (string stateCodeStr)
{
string mes = "";
-
+
if (stateCodeStr == ErrorCode.NetworkError) {
mes = ErrorCode.NetworkError;
} else {
--
Gitblit v1.8.0