From c1863db0158fb6c2a1cd96686d514c98c1073937 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 17 一月 2020 11:58:18 +0800
Subject: [PATCH] 2020-01-17
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index b6f273d..8c619e6 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -175,6 +175,21 @@
}
#endregion
+ //public static void CleanPageView ()
+ //{
+ // FavoriteRoom.RemoveAll ();
+ // FavoriteBodyView.RemoveAll ();
+ // FavoritePageView.RemoveAll ();
+ // DeviceView.RemoveAll ();
+ // DeviceBodyView.RemoveAll ();
+ // DevicePageView.RemoveAll ();
+ // RoomBodyView.RemoveAll ();
+ // RoomPageView.RemoveAll ();
+ // SettingView.RemoveAll ();
+ // SettingBodyView.RemoveAll ();
+ // SettingPageView.RemoveAll ();
+ // UserPageView.RemoveAll ();
+ //}
static void CleanPageView (FrameLayout BodyView)
{
FavoriteRoom.RemoveAll ();
@@ -208,20 +223,24 @@
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
//if (UserConfig.Instance.GatewayList.Count == 0) {
- //2020-01-11 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
+ //2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
- if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty () && MainPage.LoginUser.AccountType == 0) {
+ if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
+ if (guidePageView.Parent != null) {
+ guidePageView.RemoveAll ();
+ guidePageView.RemoveFromParent ();
+ }
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
var guide = new GuideAddResidence ();
guide.IsHideBack = true;
guidePageView.AddChidren (guide);
- guide.ShowHomeList (true);
+ guide.ShowHomeView (true);
guidePageView.PageIndex = 0;
MainPage.LoginUser.LastTime = DateTime.MinValue;
MainPage.LoginUser.SaveUserInfo ();
- guidePageView.PageChange += (ddf, ffd) => {
- if (ffd < guidePageView.ChildrenCount - 1) {
+ guidePageView.PageChange += (sender, e) => {
+ if (e < guidePageView.ChildrenCount - 1) {
guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
}
};
--
Gitblit v1.8.0