blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2024-09-05 eeb6f0b4bf0a81834325638401d5fa404e53db93 
 HDL_ON/DAL/DriverLayer/Control.cs


@@ -111,7 +111,7 @@


                    {


                        //修改主页连接状态


                        HomePage.LoadEvent_CheckLinkStatus();


                        MainPage.Log($"网关局域网在线，刷新设备状态");


                        //MainPage.Log($"网关局域网在线，刷新设备状态");


                        new System.Threading.Thread(() =>


                        {


                            System.Threading.Thread.Sleep(1000);


@@ -127,7 +127,7 @@


                }


                else


                {


                    MainPage.Log($"状态一致，不更新数据(本地)");


                    //MainPage.Log($"状态一致，不更新数据(本地)");


                }


            }


        }


@@ -404,7 +404,7 @@


                    }


                    asd.status = status1;


                    upDataObj.objects.Add(asd);


                    revString = Newtonsoft.Json.JsonConvert.SerializeObject(upDataObj);


                    revString = JsonConvert.SerializeObject(upDataObj);


                    UpdataFunctionStatus(revString, null, true);


                }


                return;


@@ -480,12 +480,12 @@


                }


                asd.status = status1;


                upDataObj.objects.Add(asd);


                revString = Newtonsoft.Json.JsonConvert.SerializeObject(upDataObj);


                revString = JsonConvert.SerializeObject(upDataObj);


                UpdataFunctionStatus(revString, null, true);


                return true;


            }




            //MainPage.Log($"发送数据:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");


            //MainPage.Log($"发送数据:{JsonConvert.SerializeObject(commandDictionary)}");




            ///第三方涂鸦设备统一使用远程控制


            switch (function.spk)


@@ -532,7 +532,7 @@


                    else


                    {


                        var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);


                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);


                        var functionControlDataJson = JsonConvert.SerializeObject(functionControlDataObj);


                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);


                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, resend);


                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");


@@ -664,7 +664,7 @@


            if (pack != null && pack.Data != null)


            {


                //待测试2021-03-04


                var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());


                var ddd = JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());


                if (ddd != null)


                {


                    foreach (var function in ddd)


@@ -724,7 +724,7 @@


                                        },


                            time_stamp = Utlis.GetTimestamp()


                        };


                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);


                        var functionControlDataJson = JsonConvert.SerializeObject(readDataObj);


                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);


                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");


                        new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);


@@ -806,7 +806,7 @@


                            objects = objects,


                            time_stamp = Utlis.GetTimestamp()


                        };


                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);


                        var functionControlDataJson = JsonConvert.SerializeObject(readDataObj);


                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);


                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");


                        new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);


@@ -850,7 +850,7 @@


                        },


                    time_stamp = Utlis.GetTimestamp()


                };


                var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);


                var aLinkJson = JsonConvert.SerializeObject(aLinkData);


                var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlSeurity, aLinkJson);


                new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id);


            }


@@ -904,7 +904,7 @@


                    objects = objects,


                    time_stamp = Utlis.GetTimestamp()


                };


                var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);


                var functionControlDataJson = JsonConvert.SerializeObject(readDataObj);


                var sendBytes = Ins.ConvertSendBodyData($"/base/{DB_ResidenceData.Instance.HomeGateway.gatewayId}/thing/service/MusicPlayGroupListGet/down", functionControlDataJson);


                MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");


                new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);


@@ -922,7 +922,7 @@


            var sendId = Ins.msg_id.ToString();


            var sendObj = new { objects = objects1, id = sendId, time_stamp = Utlis.GetTimestamp() };




            var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(sendObj);


            var aLinkJson = JsonConvert.SerializeObject(sendObj);


            var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.AuthGateway, aLinkJson);


            new Control_Udp().SendLocalHdlLinkData(sendBytes, Ins.msg_id.ToString());


        }


@@ -1079,7 +1079,7 @@




                try


                {


                    var idMsg = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);


                    var idMsg = JsonConvert.DeserializeObject<ResponsePack>(res[1]);


                    var hasProcess = hasItBeenProcessed(idMsg.id);


                    if (hasProcess)


                    {


@@ -1096,16 +1096,16 @@


                if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply || receiveObj.Topic == CommunicationTopic.GatewayBroadcast)


                {




                    var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);


                    var bodyJObj = JsonConvert.DeserializeObject<ResponsePack>(res[1]);


                    if (bodyJObj == null)


                    {


                        return receiveObj;


                    }




                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());


                    var device = JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());


                    if (device.device_mac.ToUpper() == DB_ResidenceData.Instance.HomeGateway.mac.ToUpper())


                    {


                        MainPage.Log("本地搜索网关成功");


                        MainPage.Log("本地搜索网关成功："+ receiveObj.Topic);


                        Ins.IsSearchLocalGatewaySuccessful = true;


                        Ins.GatewayOnline_Local = true;


                        if (!string.IsNullOrEmpty(device.gatewayId))


@@ -1150,7 +1150,7 @@


                        var tt = "";


                        lock (tt)


                        {


                            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);


                            var temp = JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);


                            if (temp != null)


                            {


                                Control_Udp.ReceiveRepeatManager(temp.id, null);


@@ -1175,7 +1175,7 @@


                }


                else if (receiveObj.Topic == $"/user/{GatewayId}/custom/gateway/login_reply")


                {


                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(receiveObj.BodyDataString);


                    var temp = JsonConvert.DeserializeObject<JObject>(receiveObj.BodyDataString);


                    if (temp.GetValue("objects").ToString().Contains("success"))


                    {


                        LocalTcpClientLogin = true;


@@ -1361,7 +1361,7 @@


                                break;


                            case SPK.WaterHeaterJinmao:


                                AcstParentPage.UpdateAcstSubInfo(localFunction);


                                WaterHeaterJinmaoPage.UpdateStatus(localFunction);


                                WaterHeaterJinmaoPage.UpdateStatus();


                                break;


                            case SPK.AirSwitch:


                                AirSwitchPage.UpdataState(localFunction);


@@ -1639,7 +1639,7 @@


                                var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };


                                Application.RunOnMainThread(() =>


                                {


                                    Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");


                                    Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{JsonConvert.SerializeObject(status)}\')");


                                });


                                break;


                        }


@@ -1672,7 +1672,7 @@


            {


                Dictionary<string, string> dic = new Dictionary<string, string>();


                var functionControlDataObj = doorlock.GetGatewayAlinkDoorlockData(UserInfo.Current.ID, extStr);


                var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);


                var functionControlDataJson = JsonConvert.SerializeObject(functionControlDataObj);


                var sendBytes = Ins.ConvertSendBodyData($"/base/{Control.Ins.GatewayId}/thing/service/doorRemoteOpen/down", functionControlDataJson);


                new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 0);


            }


@@ -1705,7 +1705,7 @@


                    var pack = HttpUtil.RequestHttpsPost("/home-wisdom/app/device/door/pwdConfirm", requestJson);


                    if (pack.Code == StateCode.SUCCESS)


                    {


                        Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(pack.Data.ToString());


                        JObject pairs = JObject.Parse(pack.Data.ToString());


                        var scrip = pairs.GetValue("scrip");




                        d = new Dictionary<string, object>();