Merge branch 'NewFilePath' into CJL

JLChen

2021-03-02 c047239d340038cea872bae276e713ef866c0a34

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -141,7 +141,7 @@
                    {
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                        MainPage.Log($"网关在线，刷新设备状态");
                        MainPage.Log($"网关局域网在线，刷新设备状态");
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
@@ -195,7 +195,7 @@
                        }
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                        MainPage.Log($"网关在线，刷新设备状态");
                        MainPage.Log($"网关云端在线，刷新设备状态");
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
@@ -682,7 +682,7 @@
                    }
                }

                MainPage.Log($"time 1 :{receiveObj.Topic}");
                MainPage.Log($"局域网信息: {receiveObj.Topic}");


                //验证有效数据长度
@@ -749,14 +749,6 @@
                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (localFunction != null)
                        {
                            //var updateInfoString = $"更新设备:{localFunction.name}";
                            //foreach (var attr in updateTemp.status)
                            //{
                            //    updateInfoString += $"  key:{attr.key};value:{attr.value}";
                            //}
                            //MainPage.Log(updateInfoString);


                            //更新界面状态
                            Function localObj = null;
                            switch (localFunction.spk)
@@ -1029,6 +1021,11 @@
                                case SPK.ElectricTuyaFan:

                                case SPK.ElectricTuyaWeepRobot:
                                case SPK.ElectricTuyaWaterValve:
                                case SPK.SensorPir:
                                case SPK.SensorDoorWindow:
                                case SPK.SensorSmoke:
                                case SPK.SensorWater:
                                case SPK.ClothesHanger:
                                    //设备状态推送
                                    var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
                                    if (myDevice != null)