个人中心添加楼层和创建房间，实装二级验证

黄学彪

2019-10-10 2ed75b8b337048e5d75e6d9ec8307633134f02fd

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

@@ -83,7 +83,8 @@
            this.ClearBodyFrame();



            //初始化桌布

            this.InitFrameTable();

            var tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);



            //图片

            var btnPic = new DeviceInfoIconControl(listNewDevice[0]);

@@ -124,17 +125,46 @@
            //划线

            btnType.AddBottomLine();



            //所属区域

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

            listview.AddChidren(rowBeloneArea);

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

            //底线

            rowBeloneArea.AddBottomLine();



            var listCheck = new List<string>();

            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                foreach (var device in this.listNewDevice)

                {

                    //保存这个设备属于哪个区域

                    device.DeviceRoomId = roomKeys;

                    device.ReSave();

                    var room = Room.CurrentRoom.GetRoomByDevice(device);

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);

                    if (room == null)

                    {

                        //这里有点特殊,如果回路没有设置有区域的时候,才设置

                        listCheck.Add(mainKeys);

                        Room.CurrentRoom.ChangedRoom(device, roomKeys);

                    }

                    else if (listCheck.Contains(mainKeys) == true)

                    {

                        //如果这个回路之前都还没有区域,在本界面还没有关闭之前,可以无条件随便变更

                        Room.CurrentRoom.ChangedRoom(device, roomKeys);

                    }

                }

            };



            //添加全部菜单

            this.AddAllMenuRow();



            //初始化桌布完成

            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 += (sender, e) =>

@@ -155,53 +185,6 @@
                    this.CloseForm();

                }

            };



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

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

            {

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

                var frameTemp = new FrameLayout();

                frameTemp.Height = frameBack.Height + Application.GetRealHeight(115);

                listview.AddChidren(frameTemp);

            }

        }



        #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(369);

            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(1368);//高度就是要它超过

            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.uInfoEditor;

            detailBackFrame.AddChidren(btnTile);



            this.listview = new VerticalListControl(12);

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

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

            detailBackFrame.AddChidren(listview);

        }



        #endregion

@@ -291,11 +274,8 @@
                btnRow.UseClickStatu = false;

                listview.AddChidren(btnRow);

                btnRow.AddLeftCaption(caption, 600);

                //向右图标

                var btnswitch = btnRow.AddMostRightEmptyIcon(104, 63);

                btnRow.ChangedChidrenBindMode(btnswitch, ChidrenBindMode.NotBind);

                btnswitch.UnSelectedImagePath = "Item/Switch.png";

                btnswitch.SelectedImagePath = "Item/SwitchSelected.png";

                //开关图标

                var btnswitch = btnRow.AddMostRightSwitchIcon();

                //底线

                btnRow.AddBottomLine();



@@ -510,7 +490,7 @@
        /// <param name="oTADevice">ota设备</param>

        private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)

        {

            new System.Threading.Thread(async () =>

            HdlThreadLogic.Current.RunThread(async () =>

            {

                bool receiveImageInfo = false;

                //设置设备全部的镜像信息

@@ -548,8 +528,7 @@
                        }

                    });

                }

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion