Merge branch 'wxr-2.1' into wxr-2.2

wxr

2023-10-12 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1137,6 +1137,7 @@
                    receiveObj.Topic.Contains(CommunicationTopic.ct.GatewayUpSortTopic))
                {
                    //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
                    //Console.WriteLine($"{receiveObj.Topic}\r\n{receiveObj.BodyDataString}");
                    UpdataFunctionStatus(receiveObj.BodyDataString, null);
                }
                else if (receiveObj.Topic == CommunicationTopic.ct.ControlSeurity + "_reply"
@@ -1246,7 +1247,7 @@
                        {
                            continue;
                        }
                        MainPage.Log($"收到数据:{revString}");
                        MainPage.Log($"收到群控数据:{revString}");
                        foreach (var attr in updateTemp.status)
                        {
                            localFunction.time_stamp = temp.time_stamp;