请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -46,7 +46,7 @@
            }



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

            UserView.UserPage.Instance.RefreshForm = true;

            UserView.UserPage.Instance.RefreshAllForm = true;



            //设置标题信息

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

@@ -60,6 +60,8 @@
            this.SetDoorTime();

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

            this.ClearDeviceFromRoom();

            //添加设备的时候,关闭左划菜单的未分配界面

            MainPage.LeftListRoomViewFrom.Instance?.CloseUnallocatedRoomForm();

        }



        /// <summary>

@@ -262,11 +264,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;

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

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

        /// </summary>

        private async void SetAllEpointName()

        private void SetAllEpointName()

        {

            foreach (var device in this.listNewDevice)

            {

@@ -289,7 +291,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);

            }

        }