From 965290476c027deb96891cde1095d9a100581a6b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 20 二月 2020 09:13:32 +0800
Subject: [PATCH] 2020-02-20 1.优化更新。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 8c619e6..0585e9a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -6,6 +6,11 @@
{
public static class UserMiddle
{
+ //public static Button AppBtnTip = new Button () {
+ // Height = Application.GetRealHeight (140),
+ // BackgroundColor = 0xFFD7D7D7,
+ //};
+
public static int userMenuItemHeight {
get {
@@ -226,7 +231,7 @@
//2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- if (guidePageView.Parent != null) {
+ if (guidePageView != null) {
guidePageView.RemoveAll ();
guidePageView.RemoveFromParent ();
}
@@ -293,6 +298,7 @@
//SystemRemote.LinkRemote ("", "", "",true);
if (null != UserPageView.Parent) {
if (guidePageView.Parent != null) {
+ guidePageView.RemoveAll ();
guidePageView.RemoveFromParent ();
}
CleanPageView (FavoriteBodyView);
@@ -308,8 +314,8 @@
#if DEBUG
//UserConfig.Instance.SkinCode = 1;
Language.CurrentLanguage = "English";
- //var lii = new LightLogic () { Type = DeviceType.LightRGB, LoopID = 1, DeviceID = 4, SubnetID = 42, Name = "RGB" };
- //IO.FileUtils.SaveEquipmentMessage (lii, lii.LoopID.ToString ());
+ var lii = new LightLogic () { Type = DeviceType.LightRGB, LoopID = 1, DeviceID = 4, SubnetID = 42, Name = "RGB" };
+ IO.FileUtils.SaveEquipmentMessage (lii, lii.LoopID.ToString ());
var lii1 = new LightSwitch () { LoopID = 1, DeviceID = 2, SubnetID = 232, Name = "缁х數鍣�" };
IO.FileUtils.SaveEquipmentMessage (lii1, lii1.LoopID.ToString ());
//var lii11 = new LightDimming () { LoopID = 1, DeviceID = 1, SubnetID = 232, Name = "璋冨厜鍣�" };
@@ -318,8 +324,21 @@
//IO.FileUtils.SaveEquipmentMessage (lii111, lii111.LoopID.ToString ());
- //var licci11 = new CurtainModel () { LoopID = 1, DeviceID = 9, SubnetID = 42, Name = "绐楀笜" };
- //IO.FileUtils.SaveEquipmentMessage (licci11, licci11.LoopID.ToString ());
+ var mCurtainModel1 = new CurtainModel () { LoopID = 1, DeviceID = 9, SubnetID = 42, Name = "绐楀笜" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainModel1, mCurtainModel1.LoopID.ToString ());
+ //var mCurtainModel2 = new CurtainModel () { LoopID = 2, DeviceID = 9, SubnetID = 42, Name = "绐楀笜2" };
+ //IO.FileUtils.SaveEquipmentMessage (mCurtainModel2, mCurtainModel2.LoopID.ToString ());
+ //var mCurtainModel3 = new CurtainModel () { LoopID = 1, DeviceID = 2, SubnetID = 42, Name = "绐楀笜3" };
+ //IO.FileUtils.SaveEquipmentMessage (mCurtainModel3, mCurtainModel3.LoopID.ToString ());
+
+ var mCurtainRoller = new CurtainRoller () { LoopID = 1, DeviceID = 88, SubnetID = 42, Name = "绐楀笜CurtainRoller" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainRoller, mCurtainRoller.LoopID.ToString ());
+
+ var mCurtainTrietex = new CurtainTrietex () { LoopID = 1, DeviceID = 87, SubnetID = 42, Name = "绐楀笜CurtainTrietex" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainTrietex, mCurtainTrietex.LoopID.ToString ());
+
+
+
//var s1 = new LightEnergySocket () { LoopID = 1, DeviceID = 1, SubnetID = 44, Name = "EnergySocket" };
//IO.FileUtils.SaveEquipmentMessage (s1, s1.LoopID.ToString ());
@@ -329,8 +348,20 @@
InfraredMode infraredMode = new InfraredMode () { LoopID = 1, SubnetID = 100, DeviceID = 12, InfraredType = InfraredType.TV, Name = "娴嬭瘯鐢佃" };
IO.FileUtils.SaveEquipmentMessage (infraredMode, "1");
- ACInfrared aCInfrared = new ACInfrared () { LoopID = 1, SubnetID = 100, DeviceID = 112, Name = "娴嬭瘯绌鸿皟" };
+ ACInfrared aCInfrared = new ACInfrared () { LoopID = 1, SubnetID = 100, DeviceID = 112, Name = "绌鸿皟ACInfrared" };
IO.FileUtils.SaveEquipmentMessage (aCInfrared, "1");
+
+
+ ACPanel mACPanel = new ACPanel () { LoopID = 1, SubnetID = 100, DeviceID = 42, Name = "绌鸿皟闈㈡澘ACPanel" };
+ IO.FileUtils.SaveEquipmentMessage (mACPanel, "1");
+
+ CustomAC mCustomAC = new CustomAC () { LoopID = 1, SubnetID = 99, DeviceID = 42, Name = "绌鸿皟CustomAC" };
+ IO.FileUtils.SaveEquipmentMessage (mCustomAC, "1");
+
+ HVAC mHVAC = new HVAC () { LoopID = 1, SubnetID = 98, DeviceID = 42, Name = "绌鸿皟HVAC" };
+ IO.FileUtils.SaveEquipmentMessage (mHVAC, "1");
+
+
//var fanM = new FanModule () { Name = "Fan Module",SubnetID = 2,DeviceID = 1,LoopID = 1};
//IO.FileUtils.SaveEquipmentMessage (fanM);
//var fanLoop1 = new FanModule () { Name = "Fan 1", SubnetID = 2, DeviceID = 1, LoopID = 1 };
@@ -466,17 +497,18 @@
curPageView = 2;
}
- public static void ReadAllDeviceStatus ()
+ public static void ReadAllDeviceStatus (bool isRefresh = true, bool isCheckIsReadingAll = false)
{
if (MainPage.LoginUser == null || !MainPage.LoginUser.IsLogin) {
return;
}
- UserDeviceToLight.readAllStatus (true);
- UserDeviceToSocket.readAllStatus (true);
- UserDeviceToAC.readAllStatus (true);
- UserDeviceToFH.readAllStatus (true);
+ UserDeviceToLight.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToSocket.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToAC.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToFH.readAllStatus (isRefresh);
}
+
/// <summary>
/// 鐧诲綍鎴愬姛鍚庯紝鏌ヨ鍒锋柊涓�娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
--
Gitblit v1.8.0