2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -45,6 +45,9 @@
                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));

            }



            //添加新设备的话,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;



            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));



@@ -55,6 +58,8 @@
            this.SetAllEpointName();

            // 设置网关所在的时区的时间给门锁时间

            this.SetDoorTime();

            //新入网的设备,清空掉它的房间

            this.ClearDeviceFromRoom();

        }



        /// <summary>

@@ -179,8 +184,12 @@
            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uMoreSettion);

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

            {

                //更改过一次之后，则界面关闭后不再更改

                this.saveDefultName = string.Empty;

                //改名字

                btnNote.txtInput.FinishInputEvent();



                this.CloseForm();



                var form = new DeviceMacInfoEditorForm();

                form.AddForm(this.listNewDevice[0].DeviceAddr);

@@ -235,6 +244,8 @@
            detailBackFrame.AddChidren(btnFinish);

            btnFinish.MouseUpEventHandler += (sender, e) =>

            {

                //更改过一次之后，则界面关闭后不再更改

                this.saveDefultName = string.Empty;

                //改名字

                btnNote.txtInput.FinishInputEvent();

                //关闭自身

@@ -251,11 +262,11 @@
        /// </summary>

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

        /// <param name="mode">是否显示错误</param>

        private async void DeviceReName(string i_deviceName, ShowErrorMode mode = ShowErrorMode.YES)

        private void DeviceReName(string i_deviceName, ShowErrorMode mode = ShowErrorMode.YES)

        {

            //修改MAC名

            string deviceName = i_deviceName.Trim();

            var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName, mode);

            var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName, mode);

            if (result == false)

            {

                return;

@@ -267,7 +278,7 @@
        /// <summary>

        /// 设置全部回路的默认名字

        /// </summary>

        private async void SetAllEpointName()

        private void SetAllEpointName()

        {

            foreach (var device in this.listNewDevice)

            {

@@ -278,7 +289,7 @@
                }

                //获取端点名字

                var epointName = Common.LocalDevice.Current.GetDeviceEpointName(device);

                await Common.LocalDevice.Current.ReName(device, epointName, ShowErrorMode.NO);

                Common.LocalDevice.Current.ReName(device, epointName, ShowErrorMode.NO);

            }

        }



@@ -302,6 +313,23 @@


        #endregion



        #region ■ 一般方法___________________________



        /// <summary>

        /// 新入网的设备,清空掉它的房间

        /// </summary>

        private void ClearDeviceFromRoom()

        {

            foreach (var device in this.listNewDevice)

            {

                HdlRoomLogic.Current.DeleteDevice(device);

                HdlRoomLogic.Current.DeleteLoveDevice(device);

            }

            Common.LocalDevice.Current.DeleteRealDeviceFromRoom(this.listNewDevice[0]);

        }



        #endregion



        #region ■ 画面关闭___________________________



        /// <summary>