Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -75,18 +75,18 @@
            this.ClearBodyFrame();



            //初始化桌布

            this.InitFrameTable();

            var tableContr = new InformationEditorControl();

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



            //初始化设备回路图标

            this.InitDeviceEpointIcon();



            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr = null;



            //保存

            var btnFinish = new BottomClickButton();

            //借用Y轴坐标(让这个区域不能点击菜单)

            var frameBack = new FrameLayout();

            frameBack.Y = btnFinish.Yaxis;

            frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;

            bodyFrameLayout.AddChidren(frameBack);



            btnFinish.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnFinish);

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

@@ -165,47 +165,21 @@
            };



            //所属区域

            List<string> listRoomName = Common.Room.CurrentRoom.GetRoomListNameByDevice(nowSelectDevice);

            caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);

            nameValue = Common.Room.CurrentRoom.GetRoomName(listRoomName);

            var btnBeloneArea = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);

            listview.AddChidren(btnBeloneArea);

            btnBeloneArea.InitControl();

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

            listview.AddChidren(rowBeloneArea);

            rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), nowSelectDevice);

            //底线

            btnBeloneArea.AddBottomLine();

            //右箭头

            btnBeloneArea.AddRightArrow();

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

            rowBeloneArea.AddBottomLine();

            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                var form = new SelectRoomForm();

                form.AddForm(listRoomName);

                form.ActionSelectRoom = (list) =>

                {

                    //变更房间

                    Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, list);



                    btnBeloneArea.Text = Common.Room.CurrentRoom.GetRoomName(list);

                    listRoomName.Clear();

                    listRoomName.AddRange(list);

                };

                //变更房间

                Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);

            };



            //添加绑定目标行

            this.AddBindRow();

            //添加背光灯行

            this.AddBackLightRow();



            //借用Y轴坐标

            var btnTemp = new BottomClickButton();

            var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;

            if (bodyFrameLayout.Height - btnTemp.Yaxis + realHeight > listview.Height)

            {

                //促使被挡住的菜单能够向上滑动

                var frameTemp = new FrameLayout();

                frameTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(115);

                listview.AddChidren(frameTemp);

            }

            btnTemp = null;

        }



        #endregion

@@ -391,7 +365,7 @@
            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);

            btnIcon.Name = "btn" + device.DeviceEpoint;

            btnIcon.Gravity = Gravity.Center;

            btnIcon.Radius = (uint)Application.GetMinRealAverage(6);

            btnIcon.Radius = 6;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

@@ -533,44 +507,6 @@
            frameBack.AddChidren(frame4);

            //初始化设备图标

            this.InitDeviceIcon(frame4, listDevice[3], false);

        }



        #endregion



        #region ■ 初始化桌布_________________________



        /// <summary>

        /// 初始化桌布

        /// </summary>

        private void InitFrameTable()

        {

            //弧度的圆的一半的高度(固定)

            int halfRoundHeigth = Application.GetRealHeight(116) / 2;

            //弧度的圆

            var btnRound = new NormalViewControl(bodyFrameLayout.Width, halfRoundHeigth * 2, false);

            btnRound.Y = Application.GetRealHeight(708);

            btnRound.BackgroundColor = UserCenterColor.Current.White;

            btnRound.Radius = (uint)halfRoundHeigth;

            bodyFrameLayout.AddChidren(btnRound);

            //明细列表的桌布，白色背景(覆盖弧度的圆的半边)

            var detailBackFrame = new FrameLayout();

            detailBackFrame.Y = btnRound.Bottom - btnRound.Height / 2;

            detailBackFrame.Height = Application.GetRealHeight(1028);//高度就是要它超过

            detailBackFrame.BackgroundColor = UserCenterColor.Current.White;

            bodyFrameLayout.AddChidren(detailBackFrame);



            //设备编辑

            var btnTile = new NormalViewControl(800, 60, true);

            btnTile.X = ControlCommonResourse.XXLeft;

            btnTile.TextSize = 15;

            btnTile.TextColor = UserCenterColor.Current.TextColor2;

            btnTile.TextID = R.MyInternationalizationString.uDeviceEditor;

            detailBackFrame.AddChidren(btnTile);



            this.listview = new VerticalListControl(12);

            listview.Y = btnTile.Bottom + Application.GetRealHeight(17);

            listview.Height = Application.GetRealHeight(1028) - halfRoundHeigth - btnTile.Bottom - Application.GetRealHeight(17);

            detailBackFrame.AddChidren(listview);

        }



        #endregion