From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 10:45:40 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index c35e8b5..ff66821 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 System.Collections.Generic;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -18,11 +19,12 @@
LoadEvent_GoPersonalDataPage();
LoadEvent_SkipAboutOnPage();
LoadEvent_SkipGetSupportPage();
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
LoadEvent_SkipResdentialManagePage();
LoadEvent_GoMemberManagement();
LoadEvent_SkipbtnAddFunctionPage();
+ LoadEvent_SkipSmartSpeakerPage();
}
}
@@ -135,15 +137,15 @@
var btnHomeName = new Button()
{
Width = Application.GetRealWidth(112),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(40),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS.CSS_Color.MainColor,
- Text = home.Name,
- TextSize = home.Name.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
- IsSelected = DB_ResidenceData.Instance.CurrentRegion.RegionID == home.RegionID,
+ Text = home.homeName,
+ TextSize = home.homeName.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.id == home.id,
IsMoreLines = true,
- Tag = home.RegionID
+ Tag = home.id
};
contentView.AddChidren(btnHomeName);
@@ -161,7 +163,6 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
LoadEvent_ChangeCurHome(home);
LoadContentView();
};
@@ -178,13 +179,13 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (DB_ResidenceData.Instance.CurrentRegion.RegionID == homeTemp.RegionID)
+ if (DB_ResidenceData.Instance.CurrentRegion.id == homeTemp.id)
{
return;
}
DB_ResidenceData.Instance.CurrentRegion = homeTemp;
DB_ResidenceData.Instance.SaveResidenceData();
- btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
DB_ResidenceData.Instance.EixtAccount();
//鍒锋柊浣忓畢鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
@@ -194,13 +195,13 @@
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
Action updateResidenceName = () =>
{
- btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -260,27 +261,10 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
-
- var view = new UI2.FuntionControlView.Video.VideoMethod();// AddThirdPartyBrandListpage(); // BrandListPage();
- view.MianView();
-
- return;
-
- var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage();
+ var page = new BrandListPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- ////鑾峰彇鍒楄〃
- //HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
- //{
- // Application.RunOnMainThread(() =>
- // {
- // var page = new UI2.PersonalCenter.PirDevice.PirMain();
- // MainPage.BasePageView.AddChidren(page);
- // page.Show();
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- // });
- //});
};
btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
@@ -308,18 +292,26 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- //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;
};
}
+
+ /// <summary>
+ /// 璺宠浆鏅鸿兘闊崇椤甸潰
+ /// </summary>
+ void LoadEvent_SkipSmartSpeakerPage()
+ {
+ btnSmartSpeakerText.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new SmartSpeakerListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
#endregion
--
Gitblit v1.8.0