From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 26 三月 2021 10:50:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr --- HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs index 31940db..61b56a6 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs @@ -611,8 +611,8 @@ btn.MouseUpEventHandler = (sender, e) => { - System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - d.Add(FunctionAttributeKey.Key, attr.key); + Dictionary<string, string> d = new Dictionary<string, string>(); + d.Add(attr.key, ""); Control.Ins.SendWriteCommand(device, d); new System.Threading.Thread(() => @@ -719,6 +719,14 @@ device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString()); btnTemp.Text = e.ToString(); }; + arcBar.MouseDownEventHandler = (sender, e) => { + Console.WriteLine("ddd"); + MainPage.BasePageView.ScrollEnabled =false; + }; + arcBar.MouseUpEventHandler = (sender, e) => { + Console.WriteLine("ddd2"); + MainPage.BasePageView.ScrollEnabled = true; + }; } /// <summary> /// 鎺у埗妯″紡浜嬩欢 -- Gitblit v1.8.0