From 2774f5981a93cc6cc6aec22a6409f26889e925b4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 七月 2020 16:36:56 +0800
Subject: [PATCH] 2020-07-03 1.修复修改红外TV模块修改备注出错问题。 2.如果搜索红外模块备注为空默认显示TV+回路号备注。 3.上传红外码指令，直接回路备注数据。4.网关配频模式时，开启自动搜索设备线程，定时3秒发送一次E548命令。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 6299a4e..75f8a7a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -26,7 +26,7 @@
//public static Button LinkStatusTip = new Button () {
// Height = Application.GetRealHeight (36),
- // Width = Application.GetRealWidth (640),
+ // Width = Application.GetRealWidth (Application.DesignWidth),
// BackgroundColor = SkinStyle.Current.LinkStatusTipColor
//};
@@ -34,33 +34,33 @@
IsShowPoint = false,
};
public static FrameLayout FavoriteBodyView = new FrameLayout () {
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136)
+ //Width = Application.GetRealWidth (Application.DesignWidth),
+ //Height = Application.GetRealHeight (Application.DesignHeight)
};
public static UserRoom FavoriteRoom = new UserRoom () {
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136 - 90)
+ //Width = Application.GetRealWidth (Application.DesignWidth),
+ Height = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight)
};
public static PageLayout DevicePageView = new PageLayout () {
IsShowPoint = false,
};
public static FrameLayout DeviceBodyView = new FrameLayout () {
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136)
+ //Width = Application.GetRealWidth (Application.DesignWidth),
+ Height = Application.GetRealHeight (Application.DesignHeight)
};
public static VerticalScrolViewLayout DeviceView = new VerticalScrolViewLayout () {
Y = Application.GetRealHeight (126),
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136 - 126 - 90),
+ //Width = Application.GetRealWidth (Application.DesignWidth),
+ Height = Application.GetRealHeight (Application.DesignHeight - 126 - userMenuItemHeight),
};
public static PageLayout RoomPageView = new PageLayout () {
IsShowPoint = false,
};
public static FrameLayout RoomBodyView = new FrameLayout () {
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136)
+ Width = Application.GetRealWidth (Application.DesignWidth),
+ Height = Application.GetRealHeight (Application.DesignHeight)
};
public static PageLayout SettingPageView = new PageLayout () {
@@ -68,18 +68,18 @@
};
public static FrameLayout SettingBodyView = new FrameLayout () {
BackgroundColor = SkinStyle.Current.MainColor,
- Height = Application.GetRealHeight (1136)
+ Height = Application.GetRealHeight (Application.DesignHeight)
};
public static VerticalScrolViewLayout SettingView = new VerticalScrolViewLayout () {
Y = Application.GetRealHeight (126),
- Width = Application.GetRealWidth (640),
- Height = Application.GetRealHeight (1136 - 126 - 90 - 90),
+ Width = Application.GetRealWidth (Application.DesignWidth),
+ Height = Application.GetRealHeight (Application.DesignHeight - 126 - userMenuItemHeight - 90),
BackgroundColor = SkinStyle.Current.ViewColor,
//ScrollEnabled = true
};
public static Button btnVersion = new Button () {
- Y = Application.GetRealHeight (1136 - 90 - 90),
- Width = Application.GetRealWidth (640),
+ Y = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight - 90),
+ Width = Application.GetRealWidth (Application.DesignWidth),
Height = Application.GetRealHeight (90),
Text = Language.StringByID (R.MyInternationalizationString.Version) + " : " + MainPage.RequestVersion,
TextColor = SkinStyle.Current.TextColor1,
@@ -88,8 +88,8 @@
};
public static FrameLayout UserMenuItem = new FrameLayout () {
- Y = Application.GetRealHeight (Application.DesignHeight - 90),
- Height = Application.GetRealHeight (95),
+ Y = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight),
+ Height = Application.GetRealHeight (userMenuItemHeight+5),
BackgroundColor = SkinStyle.Current.MainColor
};
@@ -269,9 +269,11 @@
//2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏�
GetNowHomeGatewayAfterLoginSuccess ();
} else if (!string.IsNullOrEmpty (revertObj.StateCode)) {
- MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
- MainPage.LoginUser.SaveUserInfo ();
- new AccountLogin ().Show ();
+ if (revertObj.StateCode != ErrorCode.NetworkError && revertObj.StateCode != "Data Exception") {
+ MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
+ MainPage.LoginUser.SaveUserInfo ();
+ new AccountLogin ().Show ();
+ }
}
});
}
--
Gitblit v1.8.0