黄学彪
2020-04-13 3793a9a38ac6c4c4111c2bba3a35a71c30601e82
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -17,7 +17,7 @@
        /// <summary>
        /// 列表控件
        /// </summary>
        private VerticalListControl listview = null;
        private FrameListControl listview = null;
        /// <summary>
        /// 当前选择的设备
        /// </summary>
@@ -80,12 +80,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), 562, 1175);
            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1175);
            //初始化设备回路图标
            this.InitDeviceEpointIcon();
            this.InitDeviceEpointIcon(listBackControl);
            //保存
            var btnFinish = new BottomClickButton();
@@ -211,7 +215,7 @@
            //添加背光灯行
            this.AddBackLightRow();
            //初始化桌布完成
            tableContr.FinishInitControl(bodyFrameLayout, this.listview);
            tableContr.FinishInitControl();
        }
        #endregion
@@ -431,7 +435,7 @@
        /// <summary>
        /// 初始化设备回路图标
        /// </summary>
        private void InitDeviceEpointIcon()
        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
        {
            //获取按组分配的设备
            var listIcon = this.GetAllDeviceGroup();
@@ -442,9 +446,7 @@
            frameBorder.Width = Application.GetRealWidth(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;
@@ -454,7 +456,7 @@
                //需要滑动控件
                var listControl = new VerticalScrolViewLayout();
                listControl.Height = frameBorder.Height;
                bodyFrameLayout.AddChidren(listControl);
                listBackControl.frameTable.AddChidren(listControl);
                listControl.AddChidren(frameBack);
            }
@@ -468,8 +470,8 @@
            for (int i = 0; i < listIcon.Count; i++)
            {
                var frame = new FrameLayout();
                frame.Width = Application.GetMinRealAverage(887);
                frame.Height = Application.GetMinRealAverage(124);
                frame.Width = this.GetPictrueRealSize(887);
                frame.Height = this.GetPictrueRealSize(124);
                frameBack.AddChidren(frame);
                //初始化一行设备图标
                this.InitDeviceIconFrame(frame, listIcon[i], ref index);
@@ -480,14 +482,14 @@
                }
                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) + (frameBack.ChildrenCount - 1) * Application.GetMinRealAverage(124 + 60);
                int realHeight = this.GetPictrueRealSize(58 + 58) + (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(124 + 60);
                if (realHeight > frameBack.Height)
                {
                    //变更高度
@@ -507,7 +509,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++)
            {