新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -33,6 +33,10 @@
        /// </summary>

        private CommonDevice deviceObj = null;

        /// <summary>

        /// 设备的类型

        /// </summary>

        private DeviceEnumInfo deviceEnum = null;

        /// <summary>

        /// 设备需要保存的设备名字

        /// </summary>

        private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();

@@ -49,9 +53,11 @@
        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_device">设备的某一回路</param>

        public void ShowForm(CommonDevice i_device)

        /// <param name="i_deviceEnum">设备的类型</param>

        public void ShowForm(CommonDevice i_device, DeviceEnumInfo i_deviceEnum)

        {

            this.deviceObj = i_device;

            this.deviceEnum = i_deviceEnum;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));

@@ -86,24 +92,24 @@
            var btnFinish = new BottomClickButton();

            btnFinish.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnFinish);

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

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

            {

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

                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 = await Common.LocalDevice.Current.ReName(device, newName);

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

                        if (result == false)

                        {

                            return;

@@ -124,19 +130,20 @@


            //回路备注

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

            btnDeviceName.txtInput.FinishInputEvent += () =>

            {

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

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

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

                {

                    //将名字还原

@@ -145,7 +152,7 @@
                if (oldName != btnDeviceName.Text.Trim())

                {

                    //设备名称修改

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

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

                    if (result == false)

                    {

                        return;

@@ -184,7 +191,7 @@
        private void InitTopRightMenu()

        {

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

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

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

            {

                return;

            }

@@ -207,7 +214,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 +227,7 @@
                frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>

                {

                    //发送定位功能

                    Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);

                    HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);

                });

            }



@@ -261,13 +268,12 @@
        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)

            {

                //如果是继电器和调光器的话

                if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight

                    || device.Type == DeviceType.ColorDimmableLight)

                //如果是继电器

                if (device.Type == DeviceType.OnOffOutput)

                {

                    listSort.Add(device);

                    if (device.DeviceEpoint == deviceObj.DeviceEpoint)

@@ -303,21 +309,21 @@


            frameBorder.AddChidren(btnPic);



            if (listSort.Count == 8)

            if (deviceEnum.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

            {

                //八按键面板

                //四开八控面板

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";

                this.InitEightButtonPanelIcon(frameBorder, listSort);

            }

            else if (listSort.Count == 4)

            else if (deviceEnum.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour)

            {

                //四按键面板

                //双开四控面板

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";

                this.InitFourButtonPanelIcon(frameBorder, listSort);

            }

            else

            {

                //二按键面板

                //单开双控面板

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueTwoButtonTable.png";

                this.InitTwoButtonPanelIcon(frameBorder, listSort);

            }

@@ -332,12 +338,13 @@
        private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)

        {

            var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);

            btnIcon.Text = "Button" + device.DeviceEpoint;

            btnIcon.Text = "CHANNEL" + device.DeviceEpoint;

            btnIcon.TextAlignment = TextAlignment.Center;

            btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnIcon.IsBold = true;

            if (frame is FrameLayoutStatuControl)

            {

                ((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

                ((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEvent);

                ((FrameLayoutStatuControl)frame).ButtonClickEvent += (sender, e) =>

                {

                    //按键点击

@@ -368,7 +375,7 @@
        #region ■ 初始化二按键图标___________________



        /// <summary>

        /// 初始化二按键面板的图标

        /// 初始化单开双控面板的图标

        /// </summary>

        /// <param name="frameBack">容器</param>

        /// <param name="listDevice">设备列表</param>

@@ -394,7 +401,7 @@
        #region ■ 初始化四按键图标___________________



        /// <summary>

        /// 初始化四按键面板的图标

        /// 初始化双开四控键面板的图标

        /// </summary>

        /// <param name="frameBack">容器</param>

        /// <param name="listDevice">设备列表</param>

@@ -402,7 +409,7 @@
        {

            //按键1

            var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);

            btnButton1.TextSize = 12;

            btnButton1.TextSize = 8;

            btnButton1.Height = this.GetPictrueRealSize(175);

            btnButton1.Width = this.GetPictrueRealSize(183);

            btnButton1.X = this.GetPictrueRealSize(34);

@@ -410,7 +417,7 @@


            //按键2

            var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);

            btnButton2.TextSize = 12;

            btnButton2.TextSize = 8;

            btnButton2.Height = this.GetPictrueRealSize(175);

            btnButton2.Width = this.GetPictrueRealSize(183);

            btnButton2.X = btnButton1.Right;

@@ -418,7 +425,7 @@


            //按键3

            var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);

            btnButton3.TextSize = 12;

            btnButton3.TextSize = 8;

            btnButton3.Height = this.GetPictrueRealSize(175);

            btnButton3.Width = this.GetPictrueRealSize(183);

            btnButton3.X = btnButton1.X;

@@ -426,7 +433,7 @@


            //按键4

            var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);

            btnButton4.TextSize = 12;

            btnButton4.TextSize = 8;

            btnButton4.Height = this.GetPictrueRealSize(175);

            btnButton4.Width = this.GetPictrueRealSize(183);

            btnButton4.X = btnButton2.X;

@@ -438,7 +445,7 @@
        #region ■ 初始化八按键图标___________________



        /// <summary>

        /// 初始化八按键面板的图标

        /// 初始化四开八控面板的图标

        /// </summary>

        /// <param name="frameBack">容器</param>

        /// <param name="listDevice">设备列表</param>

@@ -461,24 +468,6 @@
            frame2.Width = frame1.Width;

            frameBack.AddChidren(frame2);

            this.InitEightButtonPanelIcon(frame2, listDevice[2], listDevice[3]);



            //按键5～按键6

            var frame3 = new FrameLayout();

            frame3.X = frame1.X;

            frame3.Y = frame1.Bottom + this.GetPictrueRealSize(4);

            frame3.Height = frame1.Height;

            frame3.Width = frame1.Width;

            frameBack.AddChidren(frame3);

            this.InitEightButtonPanelIcon(frame3, listDevice[4], listDevice[5]);



            //按键7～按键8

            var frame4 = new FrameLayout();

            frame4.X = frame1.Right;

            frame4.Y = frame1.Bottom + this.GetPictrueRealSize(4);

            frame4.Height = frame1.Height;

            frame4.Width = frame1.Width;

            frameBack.AddChidren(frame4);

            this.InitEightButtonPanelIcon(frame4, listDevice[6], listDevice[7]);

        }



        /// <summary>

@@ -496,7 +485,7 @@
            frameButton1.Width = this.GetPictrueRealSize(183);

            frameBack.AddChidren(frameButton1);

            var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);

            btnButton1.TextSize = 10;

            btnButton1.TextSize = 8;

            btnButton1.Height = this.GetPictrueRealSize(35);

            btnButton1.Width = this.GetPictrueRealSize(183);

            btnButton1.Y = this.GetPictrueRealSize(37);

@@ -509,7 +498,7 @@
            frameButton2.Y = frameButton1.Bottom;

            frameBack.AddChidren(frameButton2);

            var btnButton2 = this.InitDeviceButtonControl(frameButton2, device2);

            btnButton2.TextSize = 10;

            btnButton2.TextSize = 8;

            btnButton2.Height = btnButton1.Height;

            btnButton2.Width = btnButton1.Width;

            btnButton2.Y = this.GetPictrueRealSize(20);

@@ -543,7 +532,7 @@
            nowContr.TextColor = 0xfffb744a;



            nowSelectControl = nowContr;

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

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



            //重新初始化菜单行

            this.InitMenuRow();