合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -641,7 +641,7 @@


            //添加属性上报监听

            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);

            HdlDeviceAttributeLogic.Current.AddAttributeEvent("HandPullControl", "DeviceStatusReport", (device) =>

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("HandPullControl", ReceiveComandDiv.A设备属性上报, (device) =>

            {

                string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);

                if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)

@@ -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();

@@ -927,13 +927,13 @@
        /// <summary>

        /// 画面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            HdlDeviceAttributeLogic.Current.RemoveEvent("HandPullControl");

            HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");

            //移除获取设备硬件信息的监听线程

            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);



            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion