合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -748,7 +748,7 @@
            btnNewVersion.UnSelectedImagePath = "Item/NewVersion.png";

            btnNewVersion.Visible = false;

            btnNewVersion.X = Application.GetRealWidth(242);

            btnNewVersion.Y= Application.GetRealHeight(23);

            btnNewVersion.Y = Application.GetRealHeight(23);

            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);



            rowUpDate.ButtonClickEvent += (sender, e) =>

@@ -818,7 +818,7 @@
        /// 设备重命名

        /// </summary>

        /// <param name="i_deviceName">deviceName.</param>

        private async void DeviceReName(string i_deviceName,bool closeForm)

        private async void DeviceReName(string i_deviceName, bool closeForm)

        {

            //开启进度条

            this.ShowProgressBar();