Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

tzy

2021-03-26 0c1e29166e6b188939c092d16f87ce2a27662c5f

 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>
        /// 控制模式事件