From 2b9a266168793da88a6e615fb961c254698dc12c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 23 三月 2022 15:36:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 237 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 122 insertions(+), 115 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index d579862..d243d7d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
using HDL_ON.UI.Music;
using Shared;
@@ -9,54 +10,60 @@
{
public partial class FunctionControlZone
{
- /// <summary>
- /// 鏇存柊寮�鍏崇姸鎬�
- /// </summary>
- /// <param name="upfunc"></param>
- public static void UpdataOnOffState(Function upfunc)
- {
- if(bodyDiv!= null)
- {
- Application.RunOnMainThread(() => {
- if(bodyDiv.Tag.ToString() == upfunc.sid)
- {
- for (var o = 0; o < bodyDiv.ChildrenCount; o++)
- {
- if (bodyDiv.GetChildren(o).GetType() == typeof(Button))
- {
- var btn = bodyDiv.GetChildren(o) as Button;
- if (btn.Tag != null)
- {
- if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
- {
- btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
- }
- }
- }
- else if (bodyDiv.GetChildren(o).GetType() == typeof(DiyImageSeekBar))
- {
- var btn = bodyDiv.GetChildren(o) as DiyImageSeekBar;
- if (btn.Tag != null)
- {
- if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
- {
- btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
- }
- }
- }
- }
+ // /// <summary>
+ // /// 鏇存柊寮�鍏崇姸鎬�
+ // /// </summary>
+ // /// <param name="upfunc"></param>
+ // public static void UpdataOnOffState(Function upfunc)
+ // {
+ // if(bodyDiv!= null)
+ // {
+ // Application.RunOnMainThread(() => {
+ // if(bodyDiv.Tag.ToString() == upfunc.sid)
+ // {
+ // for (var o = 0; o < bodyDiv.ChildrenCount; o++)
+ // {
+ // if (bodyDiv.GetChildren(o).GetType() == typeof(Button))
+ // {
+ // var btn = bodyDiv.GetChildren(o) as Button;
+ // if (btn.Tag != null)
+ // {
+ // if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
+ // {
+ // btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
+ // }
+ // }
+ // }
+ // else if (bodyDiv.GetChildren(o).GetType() == typeof(DiyImageSeekBar))
+ // {
+ // var btn = bodyDiv.GetChildren(o) as DiyImageSeekBar;
+ // if (btn.Tag != null)
+ // {
+ // if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
+ // {
+ // btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
+ // }
+ // }
+ // }
+ // }
- }
+ // }
+ // });
+ // }
+ // }
+ /// <summary>
+ /// 鏇存柊鍦ㄧ嚎鐘舵��
+ /// </summary>
+ public void UpdataOnline(bool online)
+ {
+ if (bodyDiv != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ bodyDiv.BackgroundColor = online ? CSS_Color.MainBackgroundColor : CSS_Color.PromptingColor2;
+ bodyDiv.btnOffline.Visible = !online;
});
}
- }
- /// <summary>
- /// 鏇存柊浜害鐘舵��
- /// </summary>
- /// <param name="upfunc"></param>
- static void UpdataBrightnessState(Function upfunc)
- {
-
}
/// <summary>
@@ -79,16 +86,16 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if(SPK.NotStatusSpkList.Contains( function.spk ))
@@ -126,16 +133,16 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- //new Tip()
- //{
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- //}.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // //new Tip()
+ // //{
+ // // CloseTime = 1,
+ // // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // // Direction = AMPopTipDirection.None,
+ // //}.Show(MainPage.BaseView);
+ // return;
+ //}
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -196,16 +203,16 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
@@ -218,16 +225,16 @@
btnStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
@@ -239,16 +246,16 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
@@ -273,16 +280,16 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -304,16 +311,16 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
--
Gitblit v1.8.0