From bc8e768831cca0097a28d52a107d4edf00c3713a Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期一, 16 五月 2022 20:28:51 +0800 Subject: [PATCH] 1.导入全视通dll,增加全视通相关初始化、监听、访客、退出登录等方法 2.增加访客管理入口 3.增加全局判断是否支持全视通 4.增加自研判断 5.为全视通时隐藏通话记录界面 --- HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 48 +++++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs index bc1193d..a8d34a9 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs @@ -88,21 +88,25 @@ /// </summary> void LoadEvent_DimmerBar() { - dimmerBar.OnStartTrackingTouchEvent = (sender, e) => { - onDimmerBar = true; - }; - dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { - onDimmerBar = false; - function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); - System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); - Control.Ins.SendWriteCommand(function, d); - btnBrightnessText.Text = dimmerBar.Progress + "%"; - }; - //20201223 鍒犻櫎婊戝姩鍙戦�佸懡浠わ紝闃叉鎺т欢璺冲姩 - dimmerBar.OnProgressChangedEvent = (sender, e) => + if (function.online) { - dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); + dimmerBar.OnStartTrackingTouchEvent = (sender, e) => + { + onDimmerBar = true; + }; + dimmerBar.OnStopTrackingTouchEvent = (sender, e) => + { + onDimmerBar = false; + function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); + Control.Ins.SendWriteCommand(function, d); + btnBrightnessText.Text = dimmerBar.Progress + "%"; + }; + //20201223 鍒犻櫎婊戝姩鍙戦�佸懡浠わ紝闃叉鎺т欢璺冲姩 + dimmerBar.OnProgressChangedEvent = (sender, e) => + { + dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); //function.fadeTime = 0; //if (!btnSwitch.IsSelected) //{ @@ -133,10 +137,10 @@ // } //} btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40); - btnBrightnessText.Text = dimmerBar.Progress + "%"; - }; + btnBrightnessText.Text = dimmerBar.Progress + "%"; + }; + } } - /// <summary> /// 鍔犺浇寮�鍏充簨浠� /// </summary> @@ -144,6 +148,16 @@ { btnSwitch.MouseUpEventHandler += (sender, e) => { + if (!function.online) + { + new Tip() + { + CloseTime = 1, + Text = Language.StringByID(StringId.DeviceOfflineCannotOption), + Direction = AMPopTipDirection.None, + }.Show(MainPage.BaseView); + return; + } btnSwitch.IsSelected = !btnSwitch.IsSelected; if (btnSwitch.IsSelected) { -- Gitblit v1.8.0