From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 439 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 345 insertions(+), 94 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index be8e5ec..b6c33ea 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1,7 +1,12 @@
-锘縰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
@@ -16,6 +21,10 @@
/// </summary>
FrameLayout topView;
/// <summary>
+ /// 杩炴帴鐘舵�佹彁绀�
+ /// </summary>
+ Button btnLinkStateTip;
+ /// <summary>
///浣忓畢鍚嶇О鏄剧ず
/// </summary>
Button btnResidenceName;
@@ -26,15 +35,15 @@
/// <summary>
/// 褰撳墠娓╁害淇℃伅
/// </summary>
- Button btnTempValues;
+ TextButton btnTempValues;
/// <summary>
/// 褰撳墠婀垮害淇℃伅
/// </summary>
- Button btnHumidityValues;
+ TextButton btnHumidityValues;
/// <summary>
/// 褰撳墠pm2.5鐘舵��
/// </summary>
- Button btnPm25Values;
+ TextButton btnPm25Values;
/// <summary>
/// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
/// </summary>
@@ -72,10 +81,23 @@
bool CurShowTypeIsFunction = true;
#endregion
+ #region 鎶ヨ淇℃伅
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
+ Button btnMsgIcon;
+ #endregion
+
public HomePage()
{
bodyView = this;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+ }
+
+ public override void RemoveFromParent()
+ {
+ UnregisterGetPushMessageAction();
+ base.RemoveFromParent();
}
public void LoadPage()
@@ -86,7 +108,7 @@
topView = new FrameLayout()
{
Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(topView);
@@ -97,19 +119,58 @@
};
topView.AddChidren(btnTop);
- btnResidenceName = new Button()
+ 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);
+ if (Control.Ins.GatewayOnline)
+ {
+ if (Control.Ins.IsRemote)
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ }
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ }
+
+ btnResidenceName = new Button()
+ {
+ X = Application.GetRealWidth(26),
Y = Application.GetRealHeight(32),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(33),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+ 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()
{
@@ -128,14 +189,14 @@
};
environmentalView.AddChidren(btnTempIcon);
- btnTempValues = new Button()
+ btnTempValues = new TextButton()
{
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 = MainPage.cityInfo.temperature,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.temperature + "掳",
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnTempValues);
@@ -150,14 +211,14 @@
};
environmentalView.AddChidren(btnHumidityIcon);
- btnHumidityValues = new Button()
+ btnHumidityValues = new TextButton()
{
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 = MainPage.cityInfo.humidity,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = MainPage.cityInfo.humidity + "%",
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnHumidityValues);
@@ -172,13 +233,13 @@
};
environmentalView.AddChidren(btnPm25Icon);
- btnPm25Values = new Button()
+ btnPm25Values = new TextButton()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
+ Width = Application.GetRealWidth(130),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.pm25,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -196,14 +257,14 @@
};
topView.AddChidren(msgView);
- var btngb = new Button()
+ btnMsgBg = new Button()
{
- BackgroundColor = CSS.CSS_Color.MainColor,//0x3F4484F4,//
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
Alpha = 0.4f,
};
- msgView.AddChidren(btngb);
+ msgView.AddChidren(btnMsgBg);
- Button btnMsgIcon;
+
btnMsgIcon = new Button()
{
X = Application.GetRealWidth(12),
@@ -215,28 +276,31 @@
};
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,
+ Text = "...",
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = 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,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
+
+ LoadEvent_GotoMessageCenterPage();
+
#endregion
#endregion
@@ -256,9 +320,9 @@
{
Width = Application.GetRealWidth(114),
TextID = StringId.Functions,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.HeadlineFontSize,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.HeadlineFontSize,
TextAlignment = TextAlignment.Center,
IsSelected = true,
IsBold = true
@@ -271,7 +335,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(1),
Height = Application.GetRealHeight(14),
- BackgroundColor = CSS.CSS_Color.PromptingColor1,
+ BackgroundColor = CSS_Color.PromptingColor1,
};
changeView.AddChidren(btnLine);
@@ -280,22 +344,19 @@
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,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
#endregion
- //bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(10), BackgroundColor = 0xAAF2F3F7 });
-
-
#region ContextView
contentView = new PageLayout()
{
Y = changeView.Bottom ,
- Height = Application.GetRealHeight(310 + 30), //20涓鸿秴鍑洪儴鍒�
+ Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
};
bodyView.AddChidren(contentView);
@@ -310,14 +371,23 @@
contentView.PageIndex = 0;
#endregion
- bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(7), BackgroundColor = 0xAAF2F3F7 });
LoadEvent_ChangeShowedFunctionType();
+
+ // 鏌ヨ鏈娑堟伅骞舵樉绀�
+ GetUnreadPushMessages();
+ RegisterGetPushMessageAction();
}
catch (Exception ex)
{
MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
}
+
+
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
}
/// <summary>
@@ -332,14 +402,40 @@
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.functionCategory == 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)
{
@@ -363,6 +459,7 @@
Tag = function.sid
};
rowView.AddChidren(functionView);
+
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -373,6 +470,33 @@
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)
@@ -393,15 +517,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) });
@@ -419,13 +543,43 @@
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);
- LoadSceneFunctionDiv( functionView, function);
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
+
+ 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)
@@ -460,8 +614,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,
@@ -475,10 +629,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);
@@ -490,9 +644,9 @@
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
@@ -510,7 +664,7 @@
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
view.AddChidren(btnCollection);
- LoadEvent_FunctionCollection(btnCollection, function, true);
+ LoadEvent_FunctionCollection(btnCollection, function);
if (function.functionCategory == FunctionCategory.Curtain)
{
@@ -542,6 +696,65 @@
LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
}
+
+ else if (function.functionType == FunctionType.TV)
+ {
+ 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.functionCategory == 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;
@@ -582,6 +795,24 @@
break;
}
break;
+ case FunctionCategory.SwitchDevice:
+ switch (function.functionType)
+ {
+ case FunctionType.Socket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
+ break;
+ }
+ break;
+ case FunctionCategory.Electrical:
+ switch (function.functionType)
+ {
+ case FunctionType.Fan:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
+ break;
+ }
+ break;
}
LoadEvent_SwitchFunction(function, btnSwitch);
}
@@ -590,7 +821,11 @@
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
- UpdataFunctionStates(function);
+ //鐢佃涓嶉渶瑕佹洿鏂扮姸鎬�
+ if(function.functionType!= FunctionType.TV)
+ {
+ UpdataFunctionStates(function);
+ }
}
catch (Exception ex)
{
@@ -598,14 +833,30 @@
}
}
-
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Function function)
+ void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
{
try
{
+ Button btnCoverd = new Button()
+ {
+ UnSelectedImagePath = "Collection/SceneCovered.png",
+ };
+ view.AddChidren(btnCoverd);
+
+ 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",
+ };
+ view.AddChidren(btnSettingIcon);
+
Button btnName;
btnName = new Button()
{
@@ -613,7 +864,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,
@@ -627,30 +878,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 btnCoverd = new Button()
- {
- UnSelectedImagePath = "Collection/SceneCovered.png",
- };
- view.AddChidren(btnCoverd);
-
- Button btnDelayIcon;
- btnDelayIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
- };
- view.AddChidren(btnDelayIcon);
Button btnCollection;
btnCollection = new Button()
@@ -663,10 +898,26 @@
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
view.AddChidren(btnCollection);
- LoadEvent_FunctionCollection(btnCollection, function, false);
+ LoadEvent_SceneCollection(btnCollection, scene);
- LoadEvent_ControlScene(btnCoverd, function);
+ LoadEvent_ControlScene(btnCoverd,btnName,btnZone, 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;
+ };
}
catch (Exception ex)
{
--
Gitblit v1.8.0