Merge branch 'wxr1215'

wxr

2022-01-14 3be0abe90546f2a3a45828f5e6c8adc4517ea9e0

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -503,11 +503,18 @@
            {
                new System.Threading.Thread(() =>
                {
                    foreach (var temp in functions)
                    foreach (var function in functions)
                    {
                        Dictionary<string, string> d1 = new Dictionary<string, string>();
                        d1.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
                        SendWriteCommand(temp, d1);
                         if (function.spk == SPK.PanelSocket)
                        {
                            if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                            {
                                d1.Add("on_off_usb", function.trait_on_off.curValue.ToString());
                            }
                        }
                        SendWriteCommand(function, d1);
                        System.Threading.Thread.Sleep(100);
                    }
                })
@@ -835,7 +842,7 @@
                            var revString = Encoding.UTF8.GetString(receiveBytes);
                            receiveObj.BodyDataString = revString;
                            MainPage.Log($"局域网信息: 解密后：" + receiveObj.BodyDataString);
                            //if(receiveObj.Topic.EndsWith("/thing/property/up"))
                            //if (receiveObj.Topic.EndsWith("/thing/property/up"))
                            //{
                            //    MsgInfoList.Add(revString + "\r\n");
                            //}
@@ -1142,6 +1149,7 @@
                            case SPK.ElectricSocket:
                            case SPK.PanelSocket:
                                SocketPage.UpdataState(localFunction);
                                SocketPage_InstantaneousValue.UpdataView(localFunction);
                                break;
                            case SPK.ElectricTV:
                                break;