From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 0fb455a..ebb1055 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -61,8 +62,24 @@
};
dispalyView.AddChidren(contentView);
- if (UserInfo.Current.regionList.Count < 3)
+ if (UserInfo.Current.regionList.Count < 2)
{
+
+ }
+ else if (UserInfo.Current.regionList.Count < 3)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(105),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 2);
+ dispalyView.AddChidren(contentView);
}
else if (UserInfo.Current.regionList.Count < 4)
{
@@ -214,6 +231,9 @@
OnAppConfig.Instance.SaveUserConfig();
DB_ResidenceData.InitRoomFunction();
DB_ResidenceData.residenceData.SaveResidenceData();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ new HttpServerRequest().GetHomeGatewayList();
+
Application.RunOnMainThread(() =>
{
btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
@@ -341,7 +361,13 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- var getsupportPage = new GetSupportPage();
+ //var getsupportPage = new GetSupportPage();
+ //MainPage.BasePageView.AddChidren(getsupportPage);
+ //getsupportPage.LoadPage();
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+
+ var getsupportPage = new FAQHelpPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0