2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

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

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

        /// 列表控件

        /// </summary>

        private VerticalListControl listview = null;

        private FrameListControl listview = null;

        /// <summary>

        /// 当前选择的设备

        /// </summary>

@@ -81,12 +81,16 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            var listBackControl = new VerticalFrameControl();

            listBackControl.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listBackControl);



            //初始化桌布

            this.tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1128);

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



            //初始化设备回路图标

            this.InitDeviceEpointIcon();

            this.InitDeviceEpointIcon(listBackControl);



            //保存

            var btnFinish = new BottomClickButton();

@@ -145,6 +149,10 @@
                    else if (device.DfunctionType == DeviceFunctionType.A灯光)

                    {

                        device.IconPath = "Device/Light.png";

                    }

                    else

                    {

                        device.IconPath = "Device/RelayEpoint.png";

                    }

                    device.ReSave();

                }

@@ -210,7 +218,7 @@
            //添加功能类型行

            this.AddFunctionTypeRow();

            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr.FinishInitControl();

        }



        #endregion

@@ -334,10 +342,19 @@
                        var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                        var form = new BottomItemSelectForm();

                        form.CancelCallEvent = true;//允许取消

                        form.AddForm(title, listText, nowSelectNo);

                        form.FinishSelectEvent += (selectNo) =>

                        {

                            btnFunction.Text = listText[selectNo];

                            if (selectNo == -1)

                            {

                                //取消选择

                                btnFunction.Text = string.Empty;

                            }

                            else

                            {

                                btnFunction.Text = listText[selectNo];

                            }

                            nowSelectNo = selectNo;

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

                            if (selectNo == 0)

@@ -348,9 +365,13 @@
                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;

                            }

                            else

                            else if (selectNo == 2)

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;

                            }

                            else

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A未定义;

                            }

                        };

                    };

@@ -365,7 +386,7 @@
        /// <summary>

        /// 初始化设备回路图标

        /// </summary>

        private void InitDeviceEpointIcon()

        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)

        {

            //获取按组分配的设备

            var listIcon = this.GetAllDeviceGroup();

@@ -373,12 +394,10 @@
            var frameBorder = new FrameLayout();

            frameBorder.Y = Application.GetRealHeight(147);

            frameBorder.Gravity = Gravity.CenterHorizontal;

            frameBorder.Width = Application.GetRealWidth(887);

            frameBorder.Width = this.GetPictrueRealSize(887);

            frameBorder.Height = Application.GetRealHeight(423);

            frameBorder.Radius = (uint)Application.GetRealHeight(6);

            frameBorder.BorderWidth = 1;

            frameBorder.BorderColor = 0xffd0d0d0;

            bodyFrameLayout.AddChidren(frameBorder);

            listBackControl.frameTable.AddChidren(frameBorder);



            var frameBack = new FrameLayout();

            frameBack.Height = frameBorder.Height;

@@ -403,7 +422,7 @@
            {

                var frame = new FrameLayout();

                frame.Width = frameBorder.Width;

                frame.Height = Application.GetMinRealAverage(124);

                frame.Height = this.GetPictrueRealSize(124);

                frameBack.AddChidren(frame);

                //初始化一行设备图标

                this.InitDeviceIconFrame(frame, listIcon[i], ref index);

@@ -414,16 +433,16 @@
                }

                else

                {

                    frame.Y = Application.GetMinRealAverage(58) + (frameBack.ChildrenCount - 1) * (frame.Height + Application.GetMinRealAverage(60));

                    frame.Y = this.GetPictrueRealSize(58) + (frameBack.ChildrenCount - 1) * (frame.Height + this.GetPictrueRealSize(60));

                }

            }



            if (listIcon.Count > 2)

            {

                //计算真实高度

                int realHeight = Application.GetMinRealAverage(58 + 58);//上下间距

                realHeight += frameBack.ChildrenCount * Application.GetMinRealAverage(124);//圆圈高度

                realHeight += (frameBack.ChildrenCount-1) * Application.GetMinRealAverage(60);//圆圈间距

                int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距

                realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度

                realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距

                if (realHeight > frameBack.Height)

                {

                    //变更高度

@@ -443,7 +462,7 @@
        {

            NormalViewControl btnTemp = null;

            //间距

            int space = Application.GetMinRealAverage(84);

            int space = this.GetPictrueRealSize(84);

            int defultXX = (frame.Width - frame.Height * listDevice.Count - (listDevice.Count - 1) * space) / 2;

            for (int i = 0; i < listDevice.Count; i++)

            {