上传

黄学彪

2020-05-11 53cb8c211ecec2388a6583d32c5d2fe709285344

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

@@ -52,7 +52,7 @@
        /// 设备功能类型的自定义行控件(选择功能之后,无条件直接变更类型)

        /// </summary>

        /// <param name="i_device">设备的对象</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public DeviceFunctionTypeRowControl(CommonDevice i_device, int i_ChidrenYaxis = 0) : base("", "", i_ChidrenYaxis)

        {

            this.device = i_device;

@@ -111,12 +111,20 @@
            form.AddForm(title, listText, nowSelectNo);

            form.FinishSelectEvent += (selectNo) =>

            {

                if (selectNo == nowSelectNo)

                {

                    //选择的是相同的

                    return;

                }

                //-1:选择取消

                this.Text = selectNo == -1 ? string.Empty : listText[selectNo];

                nowSelectNo = selectNo;



                //记录起当前选择的功能类型

                this.RefreshDfunctionType();



                //设备改变功能类型的话,主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;



                //调用回调函数

                this.FinishSelectEvent?.Invoke(nowSelectNo);

@@ -178,7 +186,7 @@
                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.DoorLock)

            else if (this.device.Type == DeviceType.FreshAir)

            {

                //新风固定为 新风

                strType = Language.StringByID(R.MyInternationalizationString.FreshAir);