From eb3799496f3419e347849073e23e5105b74000e5 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 17:41:18 +0800
Subject: [PATCH] 2021-3-26-4
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index e9fd37d..0b48fd0 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -220,7 +220,26 @@
UserMiddle.updateSensorhreadList.Clear ();
}
- //2020-01-11
+ /// <summary>
+ /// 绉婚櫎GuidePageView
+ /// </summary>
+ static void removeGuidePageView ()
+ {
+ if (guidePageView != null) {
+ if (guidePageView.Parent != null) {
+ Utlis.WriteLine ("绉婚櫎GuidePageView Parent 涓嶄负");
+ }
+
+ guidePageView.RemoveFromParent ();
+
+ }
+ }
+
+ /// <summary>
+ /// 2020-01-11
+ /// </summary>
+ /// <param name="isGuide">鏄惁Guide</param>
+ /// <param name="bFromLogin">鏄惁鏉ヨ嚜鐧诲綍鐣岄潰</param>
public static void Init (bool isGuide = false, bool bFromLogin = false)
{
if (MainPage.LoginUser == null)
@@ -230,14 +249,14 @@
new AccountLogin ().Show ();
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
+ //2021-03-23 绉婚櫎GuidePageView
+ removeGuidePageView ();
+
//if (UserConfig.Instance.GatewayList.Count == 0) {
//2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- if (guidePageView != null) {
- guidePageView.RemoveAll ();
- guidePageView.RemoveFromParent ();
- }
+
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
var guide = new GuideAddResidence ();
guide.IsHideBack = true;
@@ -338,12 +357,10 @@
/// </summary>
static void InitHomePageView ()
{
- //SystemRemote.LinkRemote ("", "", "",true);
+ //SystemRemote.LinkRemote ("", "", "",true);
+
if (null != UserPageView.Parent) {
- if (guidePageView.Parent != null) {
- guidePageView.RemoveAll ();
- guidePageView.RemoveFromParent ();
- }
+
CleanPageView (FavoriteBodyView);
UserPageView.AddChidren (FavoritePageView);
FavoritePageView.AddChidren (FavoriteBodyView);
@@ -416,9 +433,15 @@
//LightEnergySocket sddd = new LightEnergySocket () { LoopID = 1, SubnetID = 100, DeviceID = 122, Name = "娴嬭瘯鎻掑骇" };
//IO.FileUtils.SaveEquipmentMessage (sddd, "1");
- //var ud = new UniversalDevice () { LoopID = 1,SubnetID = 42,DeviceID = 6,ActionType = 2,Name = "Universal-1",obj1 = 1,TargetType = 0};
- //ud.SendBytes = new List<byte> () { 1 ,0};
- //IO.FileUtils.SaveEquipmentMessage (ud, "1");
+ //var ud = new UniversalDevice () { LoopID = 1, SubnetID = 1, DeviceID = 100, ActionType = 2, Name = "閫氱敤寮�鍏�", obj1 = 1, TargetType = 0 };
+ //ud.SendBytes = new List<byte> () { 1, 0 };
+ //IO.FileUtils.SaveEquipmentMessage (ud, ud.LoopID.ToString());
+
+ //var ud2 = new UniversalDevice () { LoopID = 2, SubnetID = 1, DeviceID = 100, ActionType = 2, Name = "閫氱敤寮�鍏�2", obj1 = 1, TargetType = 0 };
+ //ud.SendBytes = new List<byte> () { 1, 255 };
+ //IO.FileUtils.SaveEquipmentMessage (ud, ud.LoopID.ToString ());
+
+
//var ud2 = new UniversalDevice () { LoopID = 2, SubnetID = 42, DeviceID = 6, ActionType = 0, Name = "Universal-2", obj1 = 1,TargetType = 1};
//ud2.SendBytes = new List<byte> () { 2 ,0};
//IO.FileUtils.SaveEquipmentMessage (ud2, "2");
--
Gitblit v1.8.0