合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs

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

        /// 界面关闭事件(该事件目前给分类界面的自定义行控件使用)

        /// </summary>

        public Action<CommonDevice, Room> FormCloseEvent = null;

        public Action FormCloseEvent = null;

        /// <summary>

        /// 设备对象

        /// </summary>

        private CommonDevice device;

        /// <summary>

        /// 房间对象(这个房间有可能是喜爱)

        /// 房间对象(这个房间有可能是喜爱,有可能是null)

        /// </summary>

        private Room room = null;

        /// <summary>

@@ -104,7 +104,7 @@
            var btnBelongType = new NormalViewControl(700, 62, true);

            btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);

            btnBelongType.Gravity = Gravity.CenterHorizontal;

            btnBelongType.TextID = infoType.BeloneTextId;

            btnBelongType.Text = infoType.BeloneText;

            btnBelongType.TextSize = 15;

            btnBelongType.TextAlignment = TextAlignment.Center;

            listBackControl.frameTable.AddChidren(btnBelongType);

@@ -113,6 +113,7 @@
            string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);

            string deviceName = LocalDevice.Current.GetDeviceEpointName(device);

            var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);

            btnNote.txtInput.MaxByte = 48;//限制只能输入48个字节

            listview.AddChidren(btnNote);

            btnNote.InitControl();

            //划线

@@ -132,7 +133,7 @@
            };



            //喜爱房间不允许变更区域

            if (this.room.IsLove == false)

            if (this.room == null || this.room.IsLove == false)

            {

                //所属区域

                var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);

@@ -216,7 +217,7 @@
            var btnBelongType = new NormalViewControl(700, 62, true);

            btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);

            btnBelongType.Gravity = Gravity.CenterHorizontal;

            btnBelongType.TextID = infoType.BeloneTextId;

            btnBelongType.Text = infoType.BeloneText;

            btnBelongType.TextSize = 15;

            btnBelongType.TextAlignment = TextAlignment.Center;

            listBackControl.frameTable.AddChidren(btnBelongType);

@@ -232,7 +233,7 @@
            btnNote.AddBottomLine();



            //喜爱房间不允许出现区域

            if (this.room.IsLove == false)

            if (this.room == null || this.room.IsLove == false)

            {

                //所属区域

                caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);

@@ -314,11 +315,11 @@
        /// 设备重命名

        /// </summary>

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

        private async void DeviceReName(string i_deviceName, bool closeForm)

        private void DeviceReName(string i_deviceName, bool closeForm)

        {

            //修改MAC名

            string deviceName = i_deviceName.Trim();

            var result = await LocalDevice.Current.ReName(this.device, deviceName);

            var result = LocalDevice.Current.ReName(this.device, deviceName);

            if (result == false)

            {

                return;

@@ -345,7 +346,7 @@
        /// </summary>

        public override void CloseFormBefore()

        {

            this.FormCloseEvent?.Invoke(this.device, this.room);

            this.FormCloseEvent?.Invoke();

            this.FormCloseEvent = null;



            base.CloseFormBefore();