上传一个版本

黄学彪

2020-09-01 dee21bf452a8979d0515d13e534fbb69ed9715dd

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

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

        /// 设备备注的控件

        /// </summary>

        private FrameCaptionInputControl btnDeviceName = null;

        private FrameCaptionInputControl frameDeviceName = null;

        /// <summary>

        /// 设备的某一回路

        /// </summary>

@@ -98,7 +98,7 @@
            btnFinish.ButtonClickEvent += (sender, e) =>

            {

                //记录起当前正在操作的回路名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();

                //开启进度条

                this.ShowProgressBar();

                foreach (var epoint in dicDeviceSaveName.Keys)

@@ -127,12 +127,17 @@
                //关闭自身

                this.CloseForm();

            };

            //如果当前是展示模板,则不能编辑

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

            {

                btnFinish.CanClick = false;

            }

        }



        /// <summary>

        /// 初始化菜单行

        /// </summary>

        private async void InitMenuRow()

        private void InitMenuRow()

        {

            this.listview.RemoveAll();



@@ -144,31 +149,36 @@
                nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];

            }



            this.btnDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);

            listview.AddChidren(btnDeviceName);

            btnDeviceName.InitControl();

            btnDeviceName.AddBottomLine();

            btnDeviceName.txtInput.FinishInputEvent += () =>

            this.frameDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);

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

            listview.AddChidren(frameDeviceName);

            frameDeviceName.InitControl();

            frameDeviceName.AddBottomLine();

            //如果当前是展示模板,则不能编辑

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

            {

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

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

                frameDeviceName.txtInput.FinishInputEvent += () =>

                {

                    //将名字还原

                    btnDeviceName.Text = oldName;

                }

                if (oldName != btnDeviceName.Text.Trim())

                {

                    //设备名称修改

                    var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());

                    if (result == false)

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

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

                    {

                        return;

                        //将名字还原

                        frameDeviceName.Text = oldName;

                    }

                    //干接点备注修改成功!

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

                    this.ShowMassage(ShowMsgType.Tip, msg);

                }

            };

                    if (oldName != frameDeviceName.Text.Trim())

                    {

                        //设备名称修改

                        var result = Common.LocalDevice.Current.ReName(nowSelectDevice, frameDeviceName.Text.Trim());

                        if (result == false)

                        {

                            return;

                        }

                        //干接点备注修改成功!

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

                        this.ShowMassage(ShowMsgType.Tip, msg);

                    }

                };

            }



            //所属区域

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

@@ -190,8 +200,10 @@
            if (isHdlDevice == true)

            {

                //如果是3路继电器或者1路调光器,并且是第七回路的时候,它好像可以改变类型

                //如果是欧标14路干接点小模块,并且是第七回路的时候,它好像可以改变类型

                if ((deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_ThreeLoad && nowSelectDevice.DeviceEpoint == 10)

                    || (deviceEnumInfo.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad && nowSelectDevice.DeviceEpoint == 7))

                    || (deviceEnumInfo.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad && nowSelectDevice.DeviceEpoint == 7)

                    || (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact && nowSelectDevice.DeviceEpoint == 7))

                {

                    //这里先去获取它的干接点类型

                    this.ShowProgressBar();

@@ -228,7 +240,8 @@
        private void InitTopRightMenu()

        {

            //检测此回路是否拥有定位功能

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false

                || Common.Config.Instance.Home.IsShowTemplate == true)

            {

                return;

            }

@@ -347,6 +360,11 @@
                        }

                    };

                };

                //如果当前是展示模板,则不能编辑

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

                {

                    btnFunction.CanClick = false;

                }

            }

        }



@@ -409,7 +427,10 @@
            var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);



            if (myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad

                || myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad)

                || myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad

                || myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA

                || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA

                || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)

            {

                //背光灯

                string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);

@@ -422,8 +443,20 @@
                btnLight.AddRightArrow();

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

                {

                    var form = new DeviceRelay.RelayThreeLoadBackLightSettionForm();

                    form.AddForm(deviceObj.DeviceAddr);

                    if (myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA

                    || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA

                    || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanFourteenLoadDryContact)

                    {

                        //国标3路10A继电器小模块 或者 欧标2路5A继电器小模块 或者 欧标14路干接点小模块

                        var form = new DeviceRelay.RelayNationalBackLightSettionForm();

                        form.AddForm(deviceObj.DeviceAddr);

                    }

                    else

                    {

                        //三路继电器,或者一路调光器

                        var form = new DeviceRelay.RelayThreeLoadBackLightSettionForm();

                        form.AddForm(deviceObj.DeviceAddr);

                    }

                };

            }

        }

@@ -620,7 +653,7 @@
                nowSelectControl.TextSize = 13;

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor3;

                //记录它的名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();

            }

            //选择状态

            nowContr.BorderColor = 0xfffb744a;