From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，发送CheckGateway间隔为10S，收到主题刷新该时间，重置发送次数，发送次数到达3次以上，则判定网关为离线状态。 4.远程重复增加为3次，重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index 2ffdeb5..eea04c9 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -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",
@@ -119,8 +119,8 @@
#region ---杩涘叆鍚庡彴---DeviceManagementView---
- //if (true) {//璋冭瘯璐﹀彿
- if (MainPage.LoginUser.AccountType == 0) {//璋冭瘯璐﹀彿
+ if (true) {//璋冭瘯璐﹀彿
+ //if (MainPage.LoginUser.AccountType == 0) {//璋冭瘯璐﹀彿
FrameLayout DeviceManagementView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
@@ -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);
@@ -303,7 +303,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 +343,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);
@@ -372,7 +372,7 @@
#endregion
#region subaccount
- if (MainPage.LoginUser.AccountType == 0) {
+ //if (MainPage.LoginUser.AccountType == 0) {
FrameLayout subaccountView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
@@ -383,7 +383,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);
@@ -402,6 +402,12 @@
UserMiddle.SettingView.AddChidren (btnNullSubaccount);
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;
@@ -437,7 +443,7 @@
subaccountView.MouseUpEventHandler += SubaccountEventHandler;
btnSubaccountIcon.MouseUpEventHandler += SubaccountEventHandler;
btnSubaccountTitle.MouseUpEventHandler += SubaccountEventHandler;
- }
+ //}
#endregion
@@ -453,7 +459,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"
};
@@ -469,6 +475,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) => {
--
Gitblit v1.8.0