From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 565f759..1afa1d9 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -342,7 +342,7 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
+ foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (function.functionCategory == FunctionCategory.Music)
@@ -457,7 +457,7 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.scenes)
+ foreach (var function in DB_ResidenceData.functionList.scenes)
{
if (!function.collection)
continue;
@@ -679,14 +679,14 @@
btnPower.IsSelected = false;
Music.SendMethod.Pause(a31player);
a31player.A31PlayStatus.status = "pause";
- a31player.on_off = "off";
+ a31player.trait_on_off.value = "off";
}
else
{
btnPower.IsSelected = true;
Music.SendMethod.Play(a31player);
a31player.A31PlayStatus.status = "play";
- a31player.on_off = "on";
+ a31player.trait_on_off.value = "on";
}
UpdataFunctionStates(a31player);
};
@@ -770,7 +770,6 @@
}
}
-
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
@@ -778,6 +777,24 @@
{
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 = "FunctionIcon/Scene/DelayIcon.png",
+ UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
+ };
+ view.AddChidren(btnSettingIcon);
+
Button btnName;
btnName = new Button()
{
@@ -807,22 +824,6 @@
};
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()
@@ -837,7 +838,7 @@
view.AddChidren(btnCollection);
LoadEvent_FunctionCollection(btnCollection, function, false);
- LoadEvent_ControlScene(btnCoverd, function);
+ LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
}
catch (Exception ex)
--
Gitblit v1.8.0