合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs

@@ -97,31 +97,37 @@
            string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);

            string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);

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

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

            listview.AddChidren(btnNote);

            btnNote.InitControl();

            //划线

            btnNote.AddBottomLine();

            btnNote.txtInput.FinishInputEvent += () =>

             {

                 string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);

                 if (btnNote.Text.Trim() == string.Empty)

                 {

                     //将名字还原

                     btnNote.Text = oldName;

                 }

                 if (oldName != btnNote.Text)

                 {

                     //设备名称修改

                     var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);

                     if (result == false)

                     {

                         return;

                     }

                     //设备备注修改成功!

                     string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNoteSuccess);

                     this.ShowMassage(ShowMsgType.Tip, msg);

                 }

             };

            {

                string oldName = Common.LocalDevice.Current.GetDeviceEpointName(deviceAc);

                if (btnNote.Text.Trim() == string.Empty)

                {

                    //将名字还原

                    btnNote.Text = oldName;

                }

                if (oldName != btnNote.Text)

                {

                    //查看模板时,不允许编辑

                    if (Common.Config.Instance.Home.IsShowTemplate == true)

                    {

                        return;

                    }

                    //设备名称修改

                    var result = Common.LocalDevice.Current.ReName(deviceAc, btnNote.Text);

                    if (result == false)

                    {

                        return;

                    }

                    //设备备注修改成功!

                    string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNoteSuccess);

                    this.ShowMassage(ShowMsgType.Tip, msg);

                }

            };



            //设备类型

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

@@ -215,6 +221,12 @@
                }

                this.CloseForm();

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                btnFinish.CanClick = false;

                btnSwingSwitch.CanClick = false;

            }

        }



        #endregion

@@ -270,7 +282,7 @@
            //如果是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                var data = ModelData.DeviceModelDataLogic.Current.GetAcSwingModeSupport(deviceAc);

                var data = TemplateData.TemplateDeviceDataLogic.Current.GetAcSwingModeSupport(deviceAc);

                //转换为二进制

                var value = Convert.ToString(data, 2).PadLeft(16, '0');

                //这个设置是放在后面的