From 375751523a86b9ba0b3a27f04c3d3c4f19538690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index eb4ce52..f7b1522 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -211,13 +211,12 @@
#region ---鏁版嵁鎺ユ敹---
//if (MainPage.LoginUser.AccountType == 2 || MainPage.LoginUser.AccountString == @"464027401@qq.com") {
- if (true) {
var DataReceptionView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
BackgroundColor = SkinStyle.Current.ViewColor
};
- UserMiddle.SettingView.AddChidren (DataReceptionView);
+ //UserMiddle.SettingView.AddChidren (DataReceptionView);
var btnDataReceptionIcon = new Button () {
X = Application.GetRealWidth (30),
Gravity = Gravity.CenterVertical,
@@ -244,10 +243,8 @@
BackgroundColor = SkinStyle.Current.MainColor,
Height = Application.GetRealHeight (5)
};
- UserMiddle.SettingView.AddChidren (btnNull3);
- }
+ //UserMiddle.SettingView.AddChidren (btnNull3);
#endregion
-
#region ---msg---
//FrameLayout WarningMsgView = new FrameLayout () {
@@ -294,6 +291,48 @@
//UserMiddle.SettingView.AddChidren (btnNullWarningMsg);
#endregion
+ #region ---鍚屾璁惧---
+ FrameLayout SyncDeviceView = new FrameLayout () {
+ Width = Application.GetRealWidth (640),
+ Height = Application.GetRealHeight (100),
+ BackgroundColor = SkinStyle.Current.ViewColor
+ };
+ Button btnSyncDeviceIcon = new Button () {
+ X = Application.GetRealWidth (30),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth (75),
+ Height = Application.GetRealWidth (75),
+ UnSelectedImagePath = "CrabtreeAdd/Alexa.png",
+ };
+ SyncDeviceView.AddChidren (btnSyncDeviceIcon);
+
+ Button btnSyncDeviceTitle = new Button () {
+ X = Application.GetRealWidth (125),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.SyncToTheCloud,
+ //Text = "涓婁紶璁惧",
+ TextColor = SkinStyle.Current.TextColor1,
+ };
+ SyncDeviceView.AddChidren (btnSyncDeviceTitle);
+ EventHandler<MouseEventArgs> SyncDeviceEventHandler = (sender, e) => {
+ //娌＄粦瀹氬繕璁版彁绀哄厛缁戝畾缃戝叧锛岀姝㈣烦杞�
+ if (!UserConfig.Instance.CheckWhetherGatewayIdNotNull ()) {
+ Utlis.ShowAlertOnMainThread (Language.StringByID (R.MyInternationalizationString.PleaseBindTheGatewayFirst));
+ return;
+ }
+
+ HDLLinkUtlis.Current.OneclickUpload ();
+ };
+ SyncDeviceView.MouseUpEventHandler += SyncDeviceEventHandler;
+ btnSyncDeviceIcon.MouseUpEventHandler += SyncDeviceEventHandler;
+ btnSyncDeviceTitle.MouseUpEventHandler += SyncDeviceEventHandler;
+ Button btnNullSyncDevice = new Button () {
+ Height = Application.GetRealHeight (5),
+ BackgroundColor = SkinStyle.Current.MainColor
+ };
+ //UserMiddle.SettingView.AddChidren (btnNullSchedule);
+ #endregion
+
#region ---Schedule---
FrameLayout ScheduleView = new FrameLayout () {
Width = Application.GetRealWidth (640),
@@ -332,7 +371,6 @@
//UserMiddle.SettingView.AddChidren (btnNullSchedule);
#endregion
-
#region ---Alexa---
FrameLayout AlexaView = new FrameLayout () {
Width = Application.GetRealWidth (640),
@@ -344,7 +382,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
Height = Application.GetRealWidth (75),
- UnSelectedImagePath = "CrabtreeAdd/Alexa.png",
+ UnSelectedImagePath = "CrabtreeAdd/Speaker.png",
};
AlexaView.AddChidren (btnAlexaIcon);
@@ -445,6 +483,12 @@
if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
//涓昏处鍙峰紑鏀捐鍔熻兘;
+ UserMiddle.SettingView.AddChidren (DataReceptionView);
+ UserMiddle.SettingView.AddChidren (btnNull3);
+
+ UserMiddle.SettingView.AddChidren (SyncDeviceView);
+ UserMiddle.SettingView.AddChidren (btnNullSyncDevice);
+
UserMiddle.SettingView.AddChidren (ScheduleView);
UserMiddle.SettingView.AddChidren (btnNullSchedule);
UserMiddle.SettingView.AddChidren (AlexaView);
--
Gitblit v1.8.0