From 305f57840fff5b7cb1914b35c56eaece618711e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 14 一月 2021 17:06:36 +0800
Subject: [PATCH] 2021-01-14 1. 修改判断当前值是否需要参与签名方法，保持跟云端一致
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 1103 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 723 insertions(+), 380 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 7c163e1..645d512 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1,20 +1,31 @@
-锘縰sing System;
+锘縰sing System;
using System.Collections.Generic;
+using System.Text;
+using HDL_ON.DAL;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Shared;
namespace HDL_ON.UI
{
- public partial class HomePage : FrameLayout
+ public partial class HomePage : VerticalRefreshLayout
{
#region 鎺т欢鍒楄〃
- static FrameLayout bodyView;
+ static HomePage bodyView;
+
+ //FrameLayout bodyView;
/// <summary>
/// 椤堕儴淇℃伅鍖哄煙
/// </summary>
FrameLayout topView;
+ /// <summary>
+ /// 杩炴帴鐘舵�佹彁绀�
+ /// </summary>
+ Button btnLinkStateTip;
/// <summary>
///浣忓畢鍚嶇О鏄剧ず
/// </summary>
@@ -26,15 +37,15 @@
/// <summary>
/// 褰撳墠娓╁害淇℃伅
/// </summary>
- Button btnTempValues;
+ TextButton btnTempValues;
/// <summary>
/// 褰撳墠婀垮害淇℃伅
/// </summary>
- Button btnHumidityValues;
+ TextButton btnHumidityValues;
/// <summary>
/// 褰撳墠pm2.5鐘舵��
/// </summary>
- Button btnPm25Values;
+ TextButton btnPm25Values;
/// <summary>
/// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
/// </summary>
@@ -60,17 +71,9 @@
/// </summary>
VerticalScrolViewLayout sceneFunctionView;
/// <summary>
- /// 鐏厜鍖哄煙闆嗗悎
+ /// 鍔熻兘鍖哄煙闆嗗悎
/// </summary>
- static Dictionary<string, FrameLayout> LightViews;
- /// <summary>
- /// 绌鸿皟鍖哄煙闆嗗悎
- /// </summary>
- static Dictionary<string, FrameLayout> AcViews;
- /// <summary>
- /// 绐楀笜鍖哄煙闆嗗悎
- /// </summary>
- static Dictionary<string, FrameLayout> CurtainViews;
+ List<FrameLayout> functionViews;
#endregion
#region 鍖哄煙鍙橀噺
@@ -80,249 +83,379 @@
bool CurShowTypeIsFunction = true;
#endregion
+ #region 鎶ヨ淇℃伅
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
+ Button btnMsgIcon;
+ #endregion
+
public HomePage()
{
bodyView = this;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+
+ this.VerticalScrollBarEnabled = false;
+#if __IOS__
+ //鑷姩鍋忕Щ鍙栨秷
+ if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+ {
+ (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+ }
+#endif
+ }
+
+ public override void RemoveFromParent()
+ {
+ UnregisterGetPushMessageAction();
+ base.RemoveFromParent();
}
public void LoadPage()
{
- #region topView
- topView = new FrameLayout()
+ try
{
- Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
- };
- bodyView.AddChidren(topView);
-
- Button btnTop;
- btnTop = new Button()
+ this.BeginHeaderRefreshingAction = () =>
+ {
+ this.EndHeaderRefreshing();
+ Common.ApiUtlis.Ins.DownloadData();
+ LoadContentView();
+ };
+
+ #region topView
+
+ bodyView.RemoveAll();
+
+ topView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(216),
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
+ };
+ bodyView.AddChidren(topView);
+
+ Button btnTop;
+ btnTop = new Button()
+ {
+ BackgroundColor = CSS_Color.DialogTransparentColor2,
+ };
+ topView.AddChidren(btnTop);
+
+ btnLinkStateTip = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetRealWidth(6),
+ Height = Application.GetRealWidth(6),
+ BackgroundColor = CSS_Color.LinkTipFail,
+ Radius = (uint)Application.GetRealWidth(3),
+ };
+ topView.AddChidren(btnLinkStateTip);
+ //鏇存柊閾炬帴鐘舵�乮con棰滆壊
+ CheckLinkStatus();//2020-12-22
+ //LoadEvent_CheckLinkStatus();
+
+ btnResidenceName = new Button()
+ {
+ X = Application.GetRealWidth(26),
+ Y = Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(33),
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = DB_ResidenceData.Instance.CurrentRegion.Name,
+ IsBold = true
+ };
+ topView.AddChidren(btnResidenceName);
+
+#if DEBUG
+ //鎼滅储缃戝叧
+ btnResidenceName.MouseUpEventHandler = (sender, e) =>
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ //MainPage.InitializationData();
+ //DriverLayer.Control.Ins.IsRemote = true;
+ });
+ };
+#endif
+
+ environmentalView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(1) + btnResidenceName.Bottom,
+ Height = Application.GetRealHeight(32),
+ };
+ topView.AddChidren(environmentalView);
+ #region 鐜鏁版嵁
+ Button btnTempIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
+ };
+ environmentalView.AddChidren(btnTempIcon);
+
+ btnTempValues = new TextButton()
+ {
+ X = btnTempIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.temperature + "掳",
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ environmentalView.AddChidren(btnTempValues);
+
+ Button btnHumidityIcon = new Button()
+ {
+ X = btnTempValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ };
+ environmentalView.AddChidren(btnHumidityIcon);
+
+ btnHumidityValues = new TextButton()
+ {
+ X = btnHumidityIcon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(30),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.humidity + "%",
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ environmentalView.AddChidren(btnHumidityValues);
+
+ Button btnPm25Icon = new Button()
+ {
+ X = btnHumidityValues.Right + Application.GetRealWidth(2),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ };
+ environmentalView.AddChidren(btnPm25Icon);
+
+ btnPm25Values = new TextButton()
+ {
+ X = btnPm25Icon.Right + Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(130),
+ Gravity = Gravity.CenterVertical,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.pm25,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ environmentalView.AddChidren(btnPm25Values);
+ #endregion
+
+ #region msg
+ FrameLayout msgView;
+ msgView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(164),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(28),
+ };
+ topView.AddChidren(msgView);
+
+ btnMsgBg = new Button()
+ {
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
+ Alpha = 0.4f,
+ };
+ msgView.AddChidren(btnMsgBg);
+
+
+ btnMsgIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "Collection/MsgIcon.png",
+ SelectedImagePath = "Collection/MsgIconTip.png",
+ };
+ msgView.AddChidren(btnMsgIcon);
+
+
+ btnMsg = new Button()
+ {
+ X = Application.GetRealWidth(10) + btnMsgIcon.Right,
+ Width = Application.GetRealWidth(240),
+ Text = "...",
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ msgView.AddChidren(btnMsg);
+
+
+ btnMsgTime = new Button()
+ {
+ X = Application.GetRealWidth(299),
+ Width = Application.GetRealWidth(44),
+ Text = "00:00",
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ msgView.AddChidren(btnMsgTime);
+
+ LoadEvent_GotoMessageCenterPage();
+
+ #endregion
+
+ #endregion
+
+ #region 鍔熻兘鍦烘櫙鍒囨崲
+
+ bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
+
+ changeView = new FrameLayout()
+ {
+ //Y = Application.GetRealHeight(20) + topView.Bottom,
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(230),
+ Height = Application.GetRealHeight(62),
+ BackgroundImagePath = "Collection/ChangeViewbg.png",
+ };
+ bodyView.AddChidren(changeView);
+
+ btnChangeFunction = new Button()
+ {
+ Width = Application.GetRealWidth(114),
+ TextID = StringId.Functions,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextAlignment = TextAlignment.Center,
+ IsSelected = true,
+ IsBold = true
+ };
+ changeView.AddChidren(btnChangeFunction);
+
+ Button btnLine = new Button()
+ {
+ X = btnChangeFunction.Right,
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(1),
+ Height = Application.GetRealHeight(14),
+ BackgroundColor = CSS_Color.PromptingColor1,
+ };
+ changeView.AddChidren(btnLine);
+
+ btnChangeScene = new Button()
+ {
+ X = btnLine.Right,
+ Width = Application.GetRealWidth(114),
+ TextID = StringId.Scenes,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.Center,
+ };
+ changeView.AddChidren(btnChangeScene);
+ #endregion
+
+ #region ContextView
+ contentView = new PageLayout()
+ {
+ //Y = changeView.Bottom,
+ Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
+ IsShowPoint = false,
+ };
+ bodyView.AddChidren(contentView);
+
+ functionViews = new List<FrameLayout>();
+
+ LoadContentView();
+
+ #endregion
+ }
+ catch (Exception ex)
{
- BackgroundColor = CSS_Color.DialogTransparentColor2,
- };
- topView.AddChidren(btnTop);
+ MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
+ }
- btnResidenceName = new Button()
+ }
+ /// <summary>
+ /// 鍔犺浇鍐呭鍖哄煙
+ /// </summary>
+ void LoadContentView()
+ {
+ if (!Common.ApiUtlis.Ins.DownloadDataComplete)
{
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(32),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(33),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.residenceName,
- IsBold = true
- };
- topView.AddChidren(btnResidenceName);
+ var waitPage = new Loading();
+ MainPage.BaseView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
- environmentalView = new FrameLayout()
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ while (!Common.ApiUtlis.Ins.DownloadDataComplete)
+ {
+ System.Threading.Thread.Sleep(400);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ if (contentView == null)
+ {
+ return;
+ }
+ contentView.RemoveAll();
+ deviceFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(deviceFunctionView);
+ LoadDeviceFunctionControlZone();
+ sceneFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(sceneFunctionView);
+ LoadSceneFunctionControlZone();
+ contentView.PageIndex = 0;
+
+
+ LoadEvent_ChangeShowedFunctionType();
+
+ // 鏌ヨ鏈娑堟伅骞舵樉绀�
+ GetUnreadPushMessages();
+ RegisterGetPushMessageAction();
+
+ waitPage.Hide();
+ });
+ }
+ catch (Exception ex) {
+ MainPage.Log($"鍒锋柊涓婚〉寮傚父:{ex.Message}");
+ }
+ finally { }
+ })
+ { IsBackground = true }.Start();
+ }
+ else
{
- Y = Application.GetRealHeight(1) + btnResidenceName.Bottom,
- Height = Application.GetRealHeight(32),
- };
- topView.AddChidren(environmentalView);
- #region 鐜鏁版嵁
- Button btnTempIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/TempIcon.png",
- };
- environmentalView.AddChidren(btnTempIcon);
- btnTempValues = new Button()
- {
- X = btnTempIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--掳",
- TextAlignment = TextAlignment.CenterLeft,
- };
- environmentalView.AddChidren(btnTempValues);
-
- Button btnHumidityIcon = new Button()
- {
- X = btnTempValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/HumidityIcon.png",
- };
- environmentalView.AddChidren(btnHumidityIcon);
-
- btnHumidityValues = new Button()
- {
- X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--%",
- TextAlignment = TextAlignment.CenterLeft,
- };
- environmentalView.AddChidren(btnHumidityValues);
-
- Button btnPm25Icon = new Button()
- {
- X = btnHumidityValues.Right + Application.GetRealWidth(2),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/Pm25Icon.png",
- };
- environmentalView.AddChidren(btnPm25Icon);
-
- btnPm25Values = new Button()
- {
- X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--",
- TextAlignment = TextAlignment.CenterLeft,
- };
- environmentalView.AddChidren(btnPm25Values);
- #endregion
+ deviceFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(deviceFunctionView);
+ LoadDeviceFunctionControlZone();
+ sceneFunctionView = new VerticalScrolViewLayout();
+ contentView.AddChidren(sceneFunctionView);
+ LoadSceneFunctionControlZone();
+ contentView.PageIndex = 0;
- #region msg
- FrameLayout msgView;
- msgView = new FrameLayout()
- {
- Y = Application.GetRealHeight(164),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(28),
- };
- topView.AddChidren(msgView);
+ LoadEvent_ChangeShowedFunctionType();
- var btngb = new Button()
- {
- BackgroundColor = CSS.CSS_Color.MainColor,//0x3F4484F4,//
- Alpha = 0.4f,
- };
- msgView.AddChidren(btngb);
+ // 鏌ヨ鏈娑堟伅骞舵樉绀�
+ GetUnreadPushMessages();
+ RegisterGetPushMessageAction();
- Button btnMsgIcon;
- btnMsgIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "Collection/MsgIcon.png",
- SelectedImagePath = "Collection/MsgIconTip.png",
- };
- msgView.AddChidren(btnMsgIcon);
+ }
- Button btnMsg;
- btnMsg = new Button()
- {
- X = Application.GetRealWidth(10) + btnMsgIcon.Right,
- Width = Application.GetRealWidth(240),
- Text = "鏃�",
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- };
- msgView.AddChidren(btnMsg);
-
- Button btnMsgTime;
- btnMsgTime = new Button()
- {
- X = Application.GetRealWidth(299),
- Width = Application.GetRealWidth(44),
- Text = "00:00",
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- };
- msgView.AddChidren(btnMsgTime);
-
- #endregion
-
- #endregion
-
-
- #region 鍔熻兘鍦烘櫙鍒囨崲
- changeView = new FrameLayout()
- {
- Y = Application.GetRealHeight(20) + topView.Bottom,
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(230),
- Height = Application.GetRealHeight(62),
- BackgroundImagePath = "Collection/ChangeViewbg.png",
- };
- bodyView.AddChidren(changeView);
-
- btnChangeFunction = new Button()
- {
- Width = Application.GetRealWidth(114),
- TextID = StringId.Functions,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.HeadlineFontSize,
- TextAlignment = TextAlignment.Center,
- IsSelected = true,
- IsBold = true
- };
- changeView.AddChidren(btnChangeFunction);
-
- Button btnLine = new Button()
- {
- X = btnChangeFunction.Right,
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(1),
- Height = Application.GetRealHeight(14),
- BackgroundColor = CSS.CSS_Color.PromptingColor1,
- };
- changeView.AddChidren(btnLine);
-
- btnChangeScene = new Button()
- {
- X = btnLine.Right,
- Width = Application.GetRealWidth(114),
- TextID = StringId.Scenes,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.Center,
- };
- changeView.AddChidren(btnChangeScene);
-
- #endregion
-
- #region ContextView
- contentView = new PageLayout()
- {
- Y = changeView.Bottom + Application.GetRealHeight(10),
- Height = Application.GetRealHeight(310 + 30), //20涓鸿秴鍑洪儴鍒�
- };
- bodyView.AddChidren(contentView);
-
- LightViews = new Dictionary<string, FrameLayout>();
- AcViews = new Dictionary<string, FrameLayout>();
- CurtainViews = new Dictionary<string, FrameLayout>();
-
- deviceFunctionView = new VerticalScrolViewLayout();
- contentView.AddChidren(deviceFunctionView);
- LoadDeviceFunctionControlZone();
- sceneFunctionView = new VerticalScrolViewLayout();
- contentView.AddChidren(sceneFunctionView);
- LoadSceneFunctionControlZone();
- contentView.PageIndex = 0;
-
- #endregion
-
- LoadEvent_ChangeShowedFunctionType();
- //鍒锋柊鍔熻兘鐘舵��
- DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
}
/// <summary>
@@ -330,23 +463,48 @@
/// </summary>
void LoadDeviceFunctionControlZone()
{
+
#region ContextView
deviceFunctionView.RemoveAll();
- LightViews.Clear();
- AcViews.Clear();
- CurtainViews.Clear();
+ functionViews.Clear();
var rowView = new FrameLayout();
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
+ foreach (var function in FunctionList.List.GetDeviceFunctionList())
{
- if (!function.collection)
- continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
+ if (function.Spk_Prefix == FunctionCategory.Music)
{
- function.collection = false;
- continue;
+ var music = function as Music.A31MusicModel;
+ if (music.ServerClientType == -1)
+ {
+ continue;
+ }
+ else if (music.ServerClientType == 1)
+ {
+ if (!music.MainPlayCollection)
+ {
+ continue;
+ }
+ }
+ else
+ {
+ if (!music.collect)
+ {
+ continue;
+ }
+ }
+ }
+ else
+ {
+ if (!function.collect)
+ continue;
+ //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //{
+ // function.collection = false;
+ // continue;
+ //}
}
if (index % 2 == 0)
{
@@ -370,37 +528,49 @@
Tag = function.sid
};
rowView.AddChidren(functionView);
+
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
SelectedImagePath = "Collection/FunctionOnbg.png",
+ Tag = function.sid
};
functionView.AddChidren(btnbg);
- switch (function.functionCategory)
- {
- case FunctionType.Light:
- #region 鐏厜 Light
- LightViews.Add(function.sid, functionView);
- #endregion
- break;
- case FunctionType.Curtain:
- #region 绐楀笜
- CurtainViews.Add(function.sid, functionView);
- #endregion
- break;
- case FunctionType.AC:
- #region 绌鸿皟 AC
- AcViews.Add(function.sid, functionView);
- #endregion
- break;
- }
+ functionViews.Add(functionView);
LoadDeviceFunctionDiv(functionView, function);
index++;
+ }
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ deviceFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoFunctionCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
}
}
catch (Exception ex)
{
- MainPage.Log("homepage erorr : " + ex.Message);
+ MainPage.Log("homepage error : " + ex.Message);
}
deviceFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
#endregion
@@ -416,15 +586,15 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.scenes)
+ foreach (var scene in FunctionList.List.scenes)
{
- if (!function.collection)
+ if (!scene.collect)
continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- {
- function.collection = false;
- continue;
- }
+ //if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //{
+ // scene.collect = false;
+ // continue;
+ //}
if (index % 2 == 0)
{
sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
@@ -435,26 +605,52 @@
sceneFunctionView.AddChidren(rowView);
sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
}
- var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) +16);
+ var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
var functionView = new FrameLayout()
{
X = functionView_X,
Width = Application.GetRealWidth(164),
Height = Application.GetRealWidth(122),
- Tag = function.sid,
- BackgroundImagePath = (function as Scene).ImagePath,
+ Tag = scene.sid,
+ BackgroundImagePath = scene.ImagePath,
};
rowView.AddChidren(functionView);
- //functionView.Radius = (uint)Application.GetRealWidth(12);
- //functionView.BorderColor = CSS_Color.BackgroundColor;
- //functionView.BorderWidth = 1;
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
- LoadSceneFunctionDiv(functionView, function);
+ LoadSceneFunctionDiv( functionView, scene);
index++;
}
- }
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ sceneFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoSceneCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
+ }
+ }
catch (Exception ex)
{
MainPage.Log("homepage erorr : " + ex.Message);
@@ -464,7 +660,7 @@
}
/// <summary>
- /// 鍔犺浇鎺у埗鍗＄墖
+ /// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -487,8 +683,8 @@
Y = Application.GetRealWidth(10) + btnIcon.Bottom,
Text = function.name,
IsBold = true,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- TextSize = CSS.CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
Height = Application.GetRealWidth(24),
Width = Application.GetRealWidth(140),
TextAlignment = TextAlignment.CenterLeft,
@@ -502,10 +698,10 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
Text = function.GetRoomListName()
};
view.AddChidren(btnZone);
@@ -517,14 +713,18 @@
Y = btnZone.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
TextColor = 0x00000000,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "state",
Text = function.lastState
};
- view.AddChidren(btnState);
+
+ if (function.spk != SPK.LightSwitch)
+ {
+ view.AddChidren(btnState);
+ }
Button btnCollection;
btnCollection = new Button()
@@ -536,68 +736,181 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- view.AddChidren(btnCollection);
-
- Button btnSwitch;
- btnSwitch = new Button()
+ //view.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
- X = Application.GetRealWidth(122),
- Y = Application.GetRealWidth(92),
- Width = Application.GetMinRealAverage(48),
- Height = Application.GetMinRealAverage(36),
- UnSelectedImagePath = "Public/Switch.png",
- SelectedImagePath = "Public/SwitchOn.png",
+ view.AddChidren(btnCollection);
+ }
+
+ LoadEvent_FunctionCollection(btnCollection, function);
+
+ if (function.Spk_Prefix == FunctionCategory.Curtain)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
+ Button btnCurtainClose;
+ btnCurtainClose = new Button()
+ {
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(44),
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseBlueIcon_Shadow.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png",
+ };
+ view.AddChidren(btnCurtainClose);
+
+ Button btnCurtainOpen;
+ btnCurtainOpen = new Button()
+ {
+ X = btnCurtainClose.Right,
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(44),
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenBlueIcon_Shadow.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenWhiteIcon_Shadow.png",
+ };
+ view.AddChidren(btnCurtainOpen);
+
+ LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
+ }
+
+ else if (function.spk == SPK.ElectricTV)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
+ Button btnPower;
+ btnPower = new Button()
+ {
+ X = Application.GetRealWidth(131),
+ Y = Application.GetRealHeight(86),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "Public/PowerClose.png",
+ };
+ view.AddChidren(btnPower);
+ LoadEvent_ControlTV(function as TV, btnPower);
+ }
+
+ else if (function.Spk_Prefix == FunctionCategory.Music)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+ Button btnPower;
+ btnPower = new Button()
+ {
+ X = Application.GetRealWidth(118),
+ Y = Application.GetRealWidth(83),
+ Width = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(44),
+ UnSelectedImagePath = "FunctionIcon/Music/MusicPlayIcon.png",
+ SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
+ };
+ view.AddChidren(btnPower);
+ var a31player = (function as UI.Music.A31MusicModel);
+ btnState.Text = a31player.A31PlayStatus.Title;
+
+ btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
+
+ //Music.SendMethod.ReadStatus(a31player);
+
+ btnPower.MouseUpEventHandler = (sender, e) =>
+ {
+ if (btnPower.IsSelected)
+ {
+ btnPower.IsSelected = false;
+ Music.SendMethod.Pause(a31player);
+ a31player.A31PlayStatus.status = "pause";
+ a31player.trait_on_off.curValue = "off";
+ }
+ else
+ {
+ btnPower.IsSelected = true;
+ Music.SendMethod.Play(a31player);
+ a31player.A31PlayStatus.status = "play";
+ a31player.trait_on_off.curValue = "on";
+ }
+ UpdataFunctionStates(a31player);
+ };
+ }
+
+ else
+ {
+ Button btnSwitch;
+ btnSwitch = new Button()
+ {
+ X = Application.GetRealWidth(122),
+ Y = Application.GetRealWidth(92),
+ Width = Application.GetMinRealAverage(48),
+ Height = Application.GetMinRealAverage(36),
+ UnSelectedImagePath = "Public/Switch.png",
+ SelectedImagePath = "Public/SwitchOn.png",
+ };
+ view.AddChidren(btnSwitch);
+
+ switch (function.Spk_Prefix)
+ {
+ case FunctionCategory.Light:
+ #region 鐏厜 Light
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
+ UpdataFunctionStates(function as Light);
+ #endregion
+ break;
+ case FunctionCategory.AC:
+ #region 绌鸿皟 AC
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
+ #endregion
+ break;
+ case FunctionCategory.FloorHeat:
+ #region 鍦扮儹
+ btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
+ #endregion
+ break;
+ case FunctionCategory.Electric:
+ switch (function.spk)
+ {
+ case SPK.ElectricSocket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
+ break;
+ case SPK.ElectricFan:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
+ break;
+ }
+ break;
+ }
+ LoadEvent_SwitchFunction(function, btnSwitch);
+ }
+ //鍙栨秷鏀惰棌浜嬩欢
+ Action cannelCollect = () => {
+ function.collect = false;
+ if (function.Spk_Prefix == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ {
+ if ((function as Music.A31MusicModel).ServerClientType == 1)
+ {
+ (function as Music.A31MusicModel).MainPlayCollection = false;
+ Music.A31MusicModel.Save();
+ }
+ }
+ string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
+ LoadDeviceFunctionControlZone();
+ function.CollectFunction();
};
- view.AddChidren(btnSwitch);
- switch (function.functionCategory)
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
+ view.MouseUpEventHandler = skipControlPageEvent;
+ btnName.MouseUpEventHandler = skipControlPageEvent;
+ btnIcon.MouseUpEventHandler = skipControlPageEvent;
+ btnState.MouseUpEventHandler = skipControlPageEvent;
+ //鐢佃涓嶉渶瑕佹洿鏂扮姸鎬�
+ if(function.spk!= SPK.ElectricTV)
{
- case FunctionType.Light:
- #region 鐏厜 Light
- btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
- LoadRelaySwitchEvent(function, btnSwitch, view);
- //btnCollection.IsSelected = btnIcon.IsSelected = btnName.IsSelected = btnZone.IsSelected = btnSwitch.IsSelected = (function as Light).state == 1;
- UpdataLightView(function as Light);
- //btnSwitch.MouseUpEventHandler += (sender, e) =>
- //{
- // var curState = !btnSwitch.IsSelected;
- // for (int i = 0; i < view.ChildrenCount; i++)
- // {
- // if (view.GetChildren(i).GetType() == typeof(Button))
- // {
- // var btn = view.GetChildren(i) as Button;
- // btn.IsSelected = curState;
- // }
- // }
- // new System.Threading.Thread(() =>
- // {
- // var light = function as Light;
- // light.state = btnSwitch.IsSelected ? 1 : 0;
- // Control.Send("write", function, 3);
- // })
- // { IsBackground = true }.Start();
- //};
- #endregion
- break;
- case FunctionType.Curtain:
- #region 绐楀笜
- btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
- #endregion
- break;
- case FunctionType.AC:
- #region 绌鸿皟 AC
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
- #endregion
- break;
- case FunctionType.FloorHeating:
- #region 鍦扮儹
- btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
- #endregion
- break;
+ UpdataFunctionStates(function);
}
}
catch (Exception ex)
@@ -606,43 +919,45 @@
}
}
-
/// <summary>
- /// 鍔犺浇鎺у埗鍗＄墖
+ /// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Function function)
+ void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
{
try
{
Button btnCoverd = new Button()
{
UnSelectedImagePath = "Collection/SceneCovered.png",
- SelectedImagePath = "Collection/SceneCoveredOn.png",
- //Width = Application.GetRealWidth(165),
};
view.AddChidren(btnCoverd);
- btnCoverd.MouseDownEventHandler = (sender, e) => {
- btnCoverd.IsSelected = true;
- };
- btnCoverd.MouseUpEventHandler = (sender, e) => {
- new System.Threading.Thread(() => {
- System.Threading.Thread.Sleep(200);
- Application.RunOnMainThread(() => {
- btnCoverd.IsSelected = false;
- });
- }) { IsBackground = true }.Start();
- };
- Button btnDelayIcon;
- btnDelayIcon = new Button()
+ Button btnShowDelay;
+ btnShowDelay = new Button()
{
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
+ X = Application.GetRealWidth(40),
+ Y = Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(100),
+ TextColor = CSS_Color.AuxiliaryColor1,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
- view.AddChidren(btnDelayIcon);
+ view.AddChidren(btnShowDelay);
+
+ Button btnSettingIcon;
+ btnSettingIcon = new Button()
+ {
+ X = Application.GetRealWidth(4),
+ Y = Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(32),
+ UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
+ };
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnSettingIcon);
+ }
Button btnName;
btnName = new Button()
@@ -651,7 +966,7 @@
Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(24),
- Text = function.name,
+ Text = scene.name,
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -665,13 +980,14 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
- Text = function.GetRoomListName(),
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
+ Text = scene.GetRoomListName(),
};
view.AddChidren(btnZone);
+
Button btnCollection;
btnCollection = new Button()
@@ -683,8 +999,35 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- view.AddChidren(btnCollection);
+ //view.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnCollection);
+ }
+ LoadEvent_SceneCollection(btnCollection, scene);
+
+ LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
+
+ btnSettingIcon.MouseUpEventHandler = (sender, e) => {
+ Action backAction = () => {
+ //LoadSceneFunctionControlZone();
+ };
+ Action refreshAction = () => {
+ btnName.Text = scene.name;
+ btnZone.Text = scene.GetRoomListName();
+ //view.BackgroundImagePath = (scene as Scene).ImagePath;
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
+ };
+ var aep = new SceneEditPage(scene, backAction);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage( refreshAction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ //鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑
+ scene.SceneCountDown(btnShowDelay);
}
catch (Exception ex)
{
@@ -693,4 +1036,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0