2024年07月25日17:33:40

mac

2024-07-25 f9181a9c8125136f597add7c30cb2ff508d54ba7

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

@@ -11,7 +11,7 @@
    {
        public GroupControl()
        {
            spk = "GroupControl";
            spk = "groupControl";
        }
        /// <summary>
        /// 群控ID
@@ -26,7 +26,7 @@
        /// </summary>
        public string NewGroupControlSid()
        {
            string sceneId = "";
            string Id = "";
            try
            {
                string sOidBeginsWith = "000101";//厂商 + 通讯方式
@@ -53,23 +53,23 @@
                    //sTimeSpan = "00000000";
                }

                sceneId = sOidBeginsWith + sTimeSpan;
                Id = sOidBeginsWith + sTimeSpan;

                sceneId += "AA";
                sceneId += "AA01";
                Id += "AA";
                Id += "AA01";
                int maxId = 1;

                Random random = new Random(Guid.NewGuid().GetHashCode());
                maxId = random.Next(10);

                sceneId += (maxId + 1).ToString("X4");
                sceneId += "0000";
                Id += (maxId + 1).ToString("X4");
                Id += "0000";
            }
            catch
            {
                return sceneId;
                return Id;
            }
            return sceneId;
            return Id;
        }
        /// <summary>
        /// 群控名称
@@ -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}");
                }
@@ -167,6 +161,32 @@
                MainPage.Log($"群控控制失败: {ex.Message}");
            }
        }


        public new List<FunctionAttributes> attributes {
            get
            {
                var list = new List<FunctionAttributes>();

                foreach (var temp in sids)
                {
                    var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
                    if (light != null)
                    {
                        foreach(var attr in light.attributes)
                        {
                            if(list.Find((obj)=>obj.key == attr.key) == null)
                            {
                                list.Add(attr);
                            }
                        }
                    }

                }

                return list;
            }
        }
    }

    public class GroupControlFunction