2021-8-28-4

JLChen

2021-08-28 3c8f41f50076a3b904705ef9f94d1a827ecd8c52

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -639,6 +639,7 @@
                Dictionary<string, string> keys = new Dictionary<string, string>();
                keys.Add("sid", securityAlarm.sid);
                keys.Add("status", state);
                keys.Add("alarm", securityAlarm.alarm.ToString());
                var aLinkData = new AlinkReadFunctionStatusObj()
                {
                    id = Ins.msg_id.ToString(),
@@ -779,12 +780,25 @@
                    //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
                    UpdataFunctionStatus(receiveObj.BodyDataString, null);
                }
                else if (receiveObj.Topic == CommunicationTopic.ct.ControlSeurity +"_reply")
                else if (receiveObj.Topic == CommunicationTopic.ct.ControlSeurity +"_reply"
                    || receiveObj.Topic == CommunicationTopic.ct.ReadSecurityStatus + "_reply"
                    || receiveObj.Topic == CommunicationTopic.ct.SecurityStatusUp)
                {
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(receiveObj.BodyDataString);
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
                    if (temp != null)
                    {
                        Control_Udp.ReceiveRepeatManager(temp.id, null);
                        foreach (var updataSecurity in temp.objects)
                        {
                            var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
                            if (updataLocalSecurity != null)
                            {
                                updataLocalSecurity.status = updataSecurity.status;
                                updataLocalSecurity.alarm = updataSecurity.alarm;
                            }
                        }
                        HomePage.LoadEvent_RefreshSecurityStatus();
                        ArmCenterPage.LoadEvent_RefreshSecurityStatus();
                    }
                }
                else