2021-08-27 11:29:39

wei

2021-08-27 1f5fdd892e8efc9f1babe1ace9d810803edef396

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -467,6 +467,7 @@
                    var actionObjs = new List<ApiAlinkControlActionObj>();
                    actionObjs.Add(apiControlData);
                    var pack = httpServer.ControlDevice(actionObjs);
                    MainPage.Log($"远程控制反馈:{pack.message}");
                }

            }
@@ -633,6 +634,7 @@
                 gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
                  sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
                } });
                MainPage.Log($"安防控制结果:{result.Code}");
            }
            else
            {
@@ -784,21 +786,31 @@
                    || receiveObj.Topic == CommunicationTopic.ct.ReadSecurityStatus + "_reply"
                    || receiveObj.Topic == CommunicationTopic.ct.SecurityStatusUp)
                {
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
                    if (temp != null)
                    try
                    {
                        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)
                        MainPage.Log($"局域网安防信息: {receiveObj.Topic}  : 内容: {res[1]}");
                        var tt = "";
                        lock (tt) {
                            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
                            if (temp != null)
                            {
                                updataLocalSecurity.status = updataSecurity.status;
                                updataLocalSecurity.alarm = updataSecurity.alarm;
                                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;
                                        ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
                                    }
                                }
                                HomePage.LoadEvent_RefreshSecurityStatus();
                            }
                        }
                        HomePage.LoadEvent_RefreshSecurityStatus();
                        ArmCenterPage.LoadEvent_RefreshSecurityStatus();
                    }
                    catch (Exception ex){
                        MainPage.Log($"安防局域网异常：{ex.Message}");
                    }
                }
                else
@@ -855,7 +867,7 @@
                                return;
                            }
                        }
                        MainPage.Log($"A协议更新状态:{revString}");
                        //MainPage.Log($"A协议更新状态:{revString}");
                        foreach (var attr in updateTemp.status)
                        {
                            localFunction.time_stamp = temp.time_stamp;
@@ -866,6 +878,9 @@
                        Function localObj = null;
                        switch (localFunction.spk)
                        {
                            case SPK.AirSwitch:
                                AirSwitchPage.UpdataState(localFunction);
                                break;
                            case SPK.ElectricEnergy:
                                EnergyMainPage.UpdataStatus(localFunction);
                                break;