合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 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,19 +49,21 @@
                    deviceControl = contr;

                }

            }



            if (gwControl != null)

            HdlThreadLogic.Current.RunMain(() =>

            {

                //开始执行更新操作

                gwControl.DoStartUpdate();

                return;

            }

                if (gwControl != null)

                {

                    //开始执行更新操作

                    gwControl.DoStartUpdate();

                    return;

                }



            if (deviceControl != null)

            {

                //开始执行更新操作

                deviceControl.DoStartUpdate();

            }

                if (deviceControl != null)

                {

                    //开始执行更新操作

                    deviceControl.DoStartUpdate();

                }

            });

        }



        #endregion