Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -18,7 +18,7 @@
        public static void DoUpdateNextFirmware()

        {

            //下一个要执行更新的网关

            GatewayFirmwareUpdateControl gwControl = null;

            HdlGatewayUpdateLogic gwControl = null;

            foreach (var contr in FirmwareUpdateResourse.dicGatewayUpdateList.Values)

            {

                //如果别的还在升级中,则不再处理

@@ -49,7 +49,8 @@
                    deviceControl = contr;

                }

            }



            HdlThreadLogic.Current.RunMain(() =>

            {

            if (gwControl != null)

            {

                //开始执行更新操作

@@ -62,6 +63,7 @@
                //开始执行更新操作

                deviceControl.DoStartUpdate();

            }

            });

        }



        #endregion