优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

xm

2020-09-11 f14dcfd967404e197e7ec995ca8d6f2b090d3b7d

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

@@ -82,7 +82,7 @@
            if (this.UpdateStatu == UpdateStatuMode.Wait)

            {

                //如果是等待模式，再次点击时，移除列表

                string gwId = HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway);

                string gwId = this.upDatezbGateway.GwId;

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)

                {

                    FirmwareUpdateResourse.dicUpdateList.Remove(gwId);

@@ -101,7 +101,7 @@


            //进入等待模式

            this.UpdateStatu = UpdateStatuMode.Wait;

            string gwId2 = HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway);

            string gwId2 = this.upDatezbGateway.GwId;

            FirmwareUpdateResourse.dicUpdateList[gwId2] = this;

            //等待中…

            this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));

@@ -240,7 +240,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))

            if (tempZb.GwId != this.upDatezbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -343,7 +343,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))

            if (tempZb.GwId != this.upDatezbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -445,7 +445,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))

            if (tempZb.GwId != this.upDatezbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -543,7 +543,7 @@
            }



            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))

            if (tempZb.GwId != this.upDatezbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -643,7 +643,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))

            if (tempZb.GwId != this.upDatezbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -954,7 +954,7 @@
                //网关升级

                timeCount += 50;

                //网关重启

                timeCount += 180;

                timeCount += 250;

            }

            return timeCount;

        }

@@ -977,7 +977,7 @@
        /// <returns></returns>

        private void StartGetGatewayVersionThread()

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //先等个120秒吧，网关升级和网关完全重启需要很长时间

                int count = 12;

@@ -991,12 +991,12 @@
                    //这个时候，不应该提示超时

                    this.UpdateTimeOutRefresh();



                    await Task.Delay(10000);

                    System.Threading.Thread.Sleep(10000);

                }

                while (this.IsFinishUpdate == false)

                {

                    //获取版本

                    var result = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(this.upDatezbGateway, ShowErrorMode.NO);

                    var result = HdlGatewayLogic.Current.GetGatewayInfo(this.upDatezbGateway, false, ShowErrorMode.NO);

                    if (result != null)

                    {

                        break;

@@ -1004,7 +1004,7 @@
                    //这个时候，不应该提示超时

                    this.UpdateTimeOutRefresh();



                    await Task.Delay(5000);

                    System.Threading.Thread.Sleep(5000);

                }

                //已经能够获取数据

                this.ShowFinishMsg();