Merge branch 'Dev-Wxr' into Dev-Branch

wxr

2023-05-09 bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs

@@ -121,22 +121,16 @@
        /// 群控控制
        /// </summary>
        /// <param name="pairs"></param>
        public void Control(Dictionary<string,object> pairs)
        public void Control(Dictionary<string,string> pairs)
        {
            try
            {
               
                if (DriverLayer.Control.Ins.GatewayOnline_Local)
                {
                    var controlValues = new Dictionary<string, string>();
                    foreach (var p in pairs)
                    {
                        controlValues.Add("key", p.Key);
                        controlValues.Add("value", p.Value.ToString());
                    }
                    var functionControlDataObj = GetGatewayAlinkControlData(controlValues);
                    var functionControlDataObj = GetGatewayAlinkControlData(pairs);
                    var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                    var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                    var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlGroupControlTopic, functionControlDataJson);
                    new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
                    MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                }