合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs

@@ -149,7 +149,7 @@
            if (strMac == null)

            {

                //关闭进度条

                this.CloseProgressBar();

                this.CloseProgressBar(ShowReLoadMode.YES);

                return;

            }

            //协调器信道

@@ -157,7 +157,7 @@
            if (intChannel == -1)

            {

                //关闭进度条

                this.CloseProgressBar();

                this.CloseProgressBar(ShowReLoadMode.YES);

                return;

            }

            //协调器PanId

@@ -165,7 +165,7 @@
            if (intPanId == -1)

            {

                //关闭进度条

                this.CloseProgressBar();

                this.CloseProgressBar(ShowReLoadMode.YES);

                return;

            }

            //关闭进度条