From ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 三月 2021 09:37:54 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 95 +++++++++++++++++++----------------------------
1 files changed, 38 insertions(+), 57 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index f7b1522..b4f8024 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -211,39 +211,39 @@
#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) => {
+ 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);
+ 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---
@@ -321,7 +321,12 @@
return;
}
- HDLLinkUtlis.Current.OneclickUpload ();
+ //ok浜嬩欢
+ Action okAction = () => {
+ HDLLinkUtlis.Current.OneclickUpload ();
+ };
+
+ CommonUtlis.Current.ShowActionAlert (Language.StringByID (R.MyInternationalizationString.DoYouWantToSynchronizeToTheCloud), okAction);
};
SyncDeviceView.MouseUpEventHandler += SyncDeviceEventHandler;
btnSyncDeviceIcon.MouseUpEventHandler += SyncDeviceEventHandler;
@@ -637,30 +642,6 @@
dialog.Close ();
};
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 ();
- });
- }
-
-
}
}
--
Gitblit v1.8.0