新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs

@@ -92,18 +92,18 @@
                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

                foreach (var epoint in dicDeviceSaveName.Keys)

                {

                    var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);

                    var device = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, epoint);

                    if (device == null || dicDeviceSaveName[epoint] == string.Empty)

                    {

                        //不能允许空白名字

                        continue;

                    }

                    string newName = dicDeviceSaveName[epoint];

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

                    string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);

                    if (oldName != newName)

                    {

                        //设备名称修改

                        var result = Common.LocalDevice.Current.ReName(device, newName);

                        var result = HdlDeviceCommonLogic.Current.ReName(device, newName);

                        if (result == false)

                        {

                            return;

@@ -113,6 +113,11 @@
                //关闭自身

                this.CloseForm();

            };

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

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

            {

                btnFinish.CanClick = false;

            }

        }



        /// <summary>

@@ -124,37 +129,42 @@


            //回路备注

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

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

            string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);

            if (dicDeviceSaveName.ContainsKey(nowSelectDevice.DeviceEpoint) == true)

            {

                nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];

            }



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

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

            listview.AddChidren(btnDeviceName);

            btnDeviceName.InitControl();

            btnDeviceName.AddBottomLine();

            btnDeviceName.txtInput.FinishInputEvent += () =>

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

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

            {

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

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

                btnDeviceName.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 = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);

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

                    {

                        return;

                        //将名字还原

                        btnDeviceName.Text = oldName;

                    }

                    //回路备注修改成功!

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

                    this.ShowMassage(ShowMsgType.Tip, msg);

                }

            };

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

                    {

                        //设备名称修改

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

                        if (result == false)

                        {

                            return;

                        }

                        //回路备注修改成功!

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

                        this.ShowMassage(ShowMsgType.Tip, msg);

                    }

                };

            }



            //所属区域

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

@@ -184,7 +194,8 @@
        private void InitTopRightMenu()

        {

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

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

            if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false

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

            {

                return;

            }

@@ -207,7 +218,7 @@
            int menuCount = 1;

            string deviceMenu = string.Empty;

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

            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);

            bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice);

            //if (canTest == true)

            //{

            //    menuCount = 2;

@@ -220,7 +231,7 @@
                frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>

                {

                    //发送定位功能

                    Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);

                    HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);

                });

            }



@@ -261,7 +272,7 @@
        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)

        {

            bool hadDevice = false;

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);

            var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceObj.DeviceAddr);

            var listSort = new List<CommonDevice>();

            foreach (var device in listDevice)

            {

@@ -510,7 +521,7 @@
            nowContr.TextColor = UserCenterColor.Current.TextColor1;



            nowSelectControl = nowContr;

            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));

            nowSelectDevice = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));



            //重新初始化菜单行

            this.InitMenuRow();