Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs

old mode 100755
new mode 100644
@@ -362,7 +362,7 @@
                                        ((FreshAir)locadevice).currentFanSpeed = attData.AttriButeData;

                                        break;

                                    case 5:

                                    case 7:

                                    case 15:

                                        ((FreshAir)locadevice).currentFanMode = attData.AttriButeData;

                                        break;

                                }

@@ -507,6 +507,8 @@
            if (locadevice != null)

            {

                ((IASZone)locadevice).iASInfo = ias.iASInfo;

                //如果接收到上报,即说明这个传感器是在线的

                locadevice.IsOnline = 1;

                //记录回复时间

                locadevice.LastDateTime = DateTime.Now;

            }

@@ -544,7 +546,7 @@
                    {

                        HdlThreadLogic.Current.RunThread(async () =>

                        {

                            //温居城的要网关中是否有逻辑存在 
                            //温居城的要网关中是否有逻辑存在

                            //参数:2-常开自动化;3-失效时间自动化

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);

                            HdlThreadLogic.Current.RunMain(() =>

@@ -569,7 +571,7 @@
        /// 设备在线状态更新反馈

        /// </summary>

        /// <param name="receiveData"></param>

        private void DeviceOnlineChangePush (JObject receiveData)

        private void DeviceOnlineChangePush(JObject receiveData)

        {

            if (this.dicDeviceEvent.Count == 0)

            {