合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -15,7 +15,7 @@
        /// <summary>

        /// 列表控件

        /// </summary>

        private VerticalListControl listview = null;

        private FrameListControl listview = null;

        /// <summary>

        /// 当前选择的网关

        /// </summary>

@@ -78,46 +78,56 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            var listBackControl = new VerticalFrameControl();

            listBackControl.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listBackControl);



            //初始化桌布

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);



            //图片

            var btnPic = new DeviceInfoIconControl();

            btnPic.Y = Application.GetRealHeight(92);

            btnPic.Gravity = Gravity.CenterHorizontal;

            bodyFrameLayout.AddChidren(btnPic);

            listBackControl.frameTable.AddChidren(btnPic);

            btnPic.InitControl(this.deviceAc);



            //设备备注

            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 += async () =>

             {

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

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

                 {

                     //将名字还原

                     btnNote.Text = oldName;

                 }

                 if (oldName != btnNote.Text)

                 {

                     //设备名称修改

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

                     if (result == false)

                     {

                         return;

                     }

                     //设备备注修改成功!

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

                     this.ShowMassage(ShowMsgType.Tip, msg);

                 }

             };

            btnNote.txtInput.FinishInputEvent += () =>

            {

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

@@ -137,7 +147,7 @@
            rowBeloneArea.AddBottomLine();

            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                Common.Room.CurrentRoom.ChangedRoom(deviceAc, roomKeys);

                HdlRoomLogic.Current.ChangedRoom(deviceAc, roomKeys);

            };



            //空调模式

@@ -167,12 +177,12 @@
            {

                //不能再点击

                btnSwingSwitch.CanClick = false;

                string statu = btnSwingSwitch.IsSelected == true ? "1" : "0";

                string statu = btnSwingSwitch.IsSelected == true ? "0" : "1";

                //将二进制转换为十进制

                int sendData = Convert.ToInt32(this.fixValue + statu, 2);

                HdlThreadLogic.Current.RunThread(async () =>

                HdlThreadLogic.Current.RunThread(() =>

                {

                    var result = await HdlDeviceAirConditionerLogic.Current.SetUseAcSwingFunctionStatu(deviceAc, sendData);

                    var result = HdlDeviceAirConditionerLogic.Current.SetUseAcSwingFunctionStatu(deviceAc, sendData);

                    if (result == true)

                    {

                        HdlThreadLogic.Current.RunMain(() =>

@@ -190,20 +200,20 @@
            };



            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr.FinishInitControl();

            tableContr = null;



            //保存

            var btnFinish = new BottomClickButton();

            btnFinish.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnFinish);

            btnFinish.ButtonClickEvent += async (sender, e) =>

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

            {

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

                if (oldName != btnNote.Text)

                {

                    //设备名称修改

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

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

                    if (result == false)

                    {

                        return;

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

                this.CloseForm();

            };

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

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

            {

                btnFinish.CanClick = false;

                btnSwingSwitch.CanClick = false;

            }

        }



        #endregion

@@ -263,6 +279,18 @@
        /// </summary>

        private bool ReadAirConditionerSwingModeSupport()

        {

            //如果是虚拟住宅

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

            {

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

                //转换为二进制

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

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

                this.fixValue = value.Substring(0, value.Length - 1);

                this.swingMode = Convert.ToInt32(value.Substring(this.fixValue.Length));

                return true;

            }



            string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(deviceAc);

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

            {

@@ -280,7 +308,7 @@
                        //转换为二进制

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

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

                        this.fixValue = value.Substring(0, value.Length - 15);

                        this.fixValue = value.Substring(0, value.Length - 1);

                        this.swingMode = Convert.ToInt32(value.Substring(this.fixValue.Length));

                    }

                }