陈嘉乐
2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -15,7 +15,7 @@
        /// <summary>
        /// 列表控件
        /// </summary>
        private VerticalListControl listview = null;
        private FrameListControl listview = null;
        /// <summary>
        /// 当前选择的设备
        /// </summary>
@@ -29,17 +29,25 @@
        /// </summary>
        private FrameCaptionInputControl btnDeviceName = null;
        /// <summary>
        /// 设备Mac地址
        /// 设备的某一回路
        /// </summary>
        private string deviceMac = string.Empty;
        private CommonDevice deviceObj = null;
        /// <summary>
        /// 设备需要保存的设备名字
        /// </summary>
        private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
        /// <summary>
        /// 设备具体类型的信息
        /// 简约面板的震动数据
        /// </summary>
        private DeviceEnumInfo deviceEnumInfo = null;
        private HdlDevicePanelLogic.PanelVibrationInfo vibrationInfo = null;
        /// <summary>
        /// 是否已经读取了震动数据
        /// </summary>
        private bool hadReadVibrationInfo = false;
        /// <summary>
        /// 信息编辑控件
        /// </summary>
        private InformationEditorControl tableContr = null;
        #endregion
@@ -48,13 +56,10 @@
        /// <summary>
        /// 画面显示(底层会固定调用此方法,借以完成画面创建)
        /// </summary>
        /// <param name="i_deviceMac">设备Mac地址</param>
        public void ShowForm(string i_deviceMac)
        /// <param name="i_device">设备的某一回路</param>
        public void ShowForm(CommonDevice i_device)
        {
            this.deviceMac = i_deviceMac;
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
            //获取这一堆设备时属于什么类型的
            this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            this.deviceObj = i_device;
            //设置头部信息
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -74,22 +79,22 @@
            //清空bodyFrame
            this.ClearBodyFrame();
            var listBackControl = new VerticalFrameControl();
            listBackControl.Height = bodyFrameLayout.Height;
            bodyFrameLayout.AddChidren(listBackControl);
            //初始化桌布
            this.InitFrameTable();
            this.tableContr = new InformationEditorControl();
            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
            //初始化设备回路图标
            this.InitDeviceEpointIcon();
            this.InitDeviceEpointIcon(listBackControl);
            //保存
            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) =>
            btnFinish.ButtonClickEvent += (sender, e) =>
            {
                //记录起当前正在操作的回路名字
                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
@@ -97,7 +102,7 @@
                this.ShowProgressBar();
                foreach (var epoint in dicDeviceSaveName.Keys)
                {
                    var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
                    var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
                    if (device == null || dicDeviceSaveName[epoint] == string.Empty)
                    {
                        //不能允许空白名字
@@ -108,7 +113,7 @@
                    if (oldName != newName)
                    {
                        //设备名称修改
                        var result = await Common.LocalDevice.Current.ReName(device, newName);
                        var result = Common.LocalDevice.Current.ReName(device, newName);
                        if (result == false)
                        {
                            //关闭
@@ -142,7 +147,7 @@
            listview.AddChidren(btnDeviceName);
            btnDeviceName.InitControl();
            btnDeviceName.AddBottomLine();
            btnDeviceName.txtInput.FinishInputEvent += async () =>
            btnDeviceName.txtInput.FinishInputEvent += () =>
            {
                string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
                if (btnDeviceName.Text.Trim() == string.Empty)
@@ -153,7 +158,7 @@
                if (oldName != btnDeviceName.Text.Trim())
                {
                    //设备名称修改
                    var result = await Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
                    var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
                    if (result == false)
                    {
                        return;
@@ -165,47 +170,26 @@
            };
            //所属区域
            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);
                };
                //变更房间
                HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
            };
            //添加绑定目标行
            this.AddBindRow();
            //添加背光灯行
            this.AddBackLightRow();
            //添加震动反馈行
            this.AddVibrationFeedbackRow();
            //借用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;
            //初始化桌布完成
            tableContr.FinishInitControl();
        }
        #endregion
@@ -217,6 +201,11 @@
        /// </summary>
        private void InitTopRightMenu()
        {
            //检测此回路是否拥有定位功能
            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
            {
                return;
            }
            var btnIcon = new MostRightIconControl(69, 69);
            btnIcon.UnSelectedImagePath = "Item/More.png";
            topFrameLayout.AddChidren(btnIcon);
@@ -237,11 +226,11 @@
            string deviceMenu = string.Empty;
            //检测此回路是否拥有定位功能
            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
            if (canTest == true)
            {
                menuCount = 2;
            }
            var frame = new TopRightMenuControl(this, menuCount);
            //if (canTest == true)
            //{
            //    menuCount = 2;
            //}
            var frame = new TopRightMenuControl(menuCount, 1);
            if (canTest == true)
            {
                //定位
@@ -254,10 +243,10 @@
            }
            //删除
            deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
            frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
            {
            });
            //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
            //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
            //{
            //});
        }
        #endregion
@@ -321,14 +310,102 @@
        #endregion
        #region ■ 震动反馈___________________________
        /// <summary>
        /// 添加震动反馈行
        /// </summary>
        private void AddVibrationFeedbackRow()
        {
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(nowSelectDevice.DeviceAddr, false);
            var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            //只有简约面板才会有这个菜单
            if (myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleTwo
                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleThree
                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour
                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FourButtonScene
                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
            {
                //震动反馈
                var rowContr = new FrameRowControl(listview.rowSpace / 2);
                rowContr.UseClickStatu = false;
                listview.AddChidren(rowContr);
                rowContr.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uVibrationFeedback), 600);
                //底线
                rowContr.AddBottomLine();
                //右箭头
                var btnSwitch = rowContr.AddMostRightSwitchIcon();
                if (vibrationInfo != null)
                {
                    btnSwitch.IsSelected = vibrationInfo.A震动使能;
                }
                btnSwitch.ButtonClickEvent += (sender, e) =>
                {
                    if (vibrationInfo == null)
                    {
                        //获取数据失败时,给他玩,但是没效果
                        btnSwitch.IsSelected = !btnSwitch.IsSelected;
                        return;
                    }
                    //点击一次之后,不能再次点击
                    btnSwitch.CanClick = false;
                    bool statu = !btnSwitch.IsSelected;
                    HdlThreadLogic.Current.RunThread(() =>
                    {
                        vibrationInfo.A震动使能 = statu;
                        //设置简约面板震动功能的信息
                        var result = HdlDevicePanelLogic.Current.SetPanelVibrationData(nowSelectDevice, vibrationInfo);
                        if (result == true)
                        {
                            HdlThreadLogic.Current.RunMain(() =>
                            {
                                btnSwitch.IsSelected = statu;
                            });
                        }
                        else
                        {
                            //失败时,数据还原
                            vibrationInfo.A震动使能 = !vibrationInfo.A震动使能;
                        }
                        //允许下一次点击
                        btnSwitch.CanClick = true;
                    });
                };
                if (hadReadVibrationInfo == true)
                {
                    //不再读取
                    return;
                }
                this.hadReadVibrationInfo = true;
                HdlThreadLogic.Current.RunThread(() =>
                {
                    //获取简约面板震动功能的信息(null表示出错)
                    vibrationInfo = HdlDevicePanelLogic.Current.GetPanelVibrationData(nowSelectDevice);
                    if (vibrationInfo != null)
                    {
                        HdlThreadLogic.Current.RunMain(() =>
                        {
                            btnSwitch.IsSelected = vibrationInfo.A震动使能;
                        });
                    }
                });
            }
        }
        #endregion
        #region ■ 初始化设备回路图标_________________
        /// <summary>
        /// 初始化设备回路图标
        /// </summary>
        private void InitDeviceEpointIcon()
        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
        {
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
            bool hadDevice = false;
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
            var listOffSwitch = new List<CommonDevice>();
            foreach (var device in listDevice)
            {
@@ -336,6 +413,11 @@
                {
                    //只要干接点
                    listOffSwitch.Add(device);
                    if (device.DeviceEpoint == deviceObj.DeviceEpoint)
                    {
                        //能够匹配得到这个回路
                        hadDevice = true;
                    }
                }
            }
            //排序
@@ -347,16 +429,21 @@
                }
                return -1;
            });
            if (hadDevice == false)
            {
                //如果匹配不到这个回路,则默认第一个
                this.deviceObj = listOffSwitch[0];
            }
            var frameBorder = new FrameLayout();
            frameBorder.Y = Application.GetRealHeight(150);
            frameBorder.Gravity = Gravity.CenterHorizontal;
            frameBorder.Width = Application.GetMinRealAverage(426);
            frameBorder.Height = Application.GetMinRealAverage(426);
            bodyFrameLayout.AddChidren(frameBorder);
            frameBorder.Width = this.GetPictrueRealSize(426);
            frameBorder.Height = this.GetPictrueRealSize(426);
            listBackControl.frameTable.AddChidren(frameBorder);
            var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);
            btnPic.UnSelectedImagePath = "Device/PanelTable.png";
            btnPic.UnSelectedImagePath = "DeviceItem/PanelTable.png";
            frameBorder.AddChidren(btnPic);
            if (listOffSwitch.Count == 4)
@@ -383,18 +470,18 @@
        /// <param name="device">设备对象</param>
        /// <param name="isFirst">是否是第一个</param>
        /// <returns></returns>
        private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device,bool isFirst)
        private void InitDeviceIcon(FrameLayoutStatuControl frame, CommonDevice device)
        {
            //不使用点击特效
            frame.UseClickStatu = false;
            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
            var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
            btnIcon.Name = "btn" + device.DeviceEpoint;
            btnIcon.Gravity = Gravity.Center;
            btnIcon.Radius = (uint)Application.GetMinRealAverage(6);
            btnIcon.RadiusEx = 16;
            btnIcon.BorderWidth = 2;
            btnIcon.BorderColor = 0xff979797;
            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
            frame.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
            //点击事件
            frame.ButtonClickEvent += (sender, e) =>
            {
@@ -402,7 +489,7 @@
                this.DeviceEpointSelectEvent(btnIcon, null);
            };
            if (isFirst == true)
            if (device.DeviceEpoint == deviceObj.DeviceEpoint)
            {
                //初始化菜单行
                this.DeviceEpointSelectEvent(btnIcon, null);
@@ -421,24 +508,24 @@
        private void InitTwoButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
        {
            //按键1
            var frame1 = new FrameLayoutControl();
            frame1.Height = Application.GetMinRealAverage(110);
            frame1.Width = Application.GetMinRealAverage(110);
            frame1.Y = Application.GetMinRealAverage(63);
            var frame1 = new FrameLayoutStatuControl();
            frame1.Height = this.GetPictrueRealSize(110);
            frame1.Width = this.GetPictrueRealSize(110);
            frame1.Y = this.GetPictrueRealSize(63);
            frame1.Gravity = Gravity.CenterHorizontal;
            frameBack.AddChidren(frame1);
            //初始化设备图标
            this.InitDeviceIcon(frame1, listDevice[0], true);
            this.InitDeviceIcon(frame1, listDevice[0]);
            //按键2
            var frame2 = new FrameLayoutControl();
            frame2.Height = Application.GetMinRealAverage(110);
            frame2.Width = Application.GetMinRealAverage(110);
            frame2.Y = Application.GetMinRealAverage(245);
            var frame2 = new FrameLayoutStatuControl();
            frame2.Height = this.GetPictrueRealSize(110);
            frame2.Width = this.GetPictrueRealSize(110);
            frame2.Y = this.GetPictrueRealSize(245);
            frame2.Gravity = Gravity.CenterHorizontal;
            frameBack.AddChidren(frame2);
            //初始化设备图标
            this.InitDeviceIcon(frame2, listDevice[1], false);
            this.InitDeviceIcon(frame2, listDevice[1]);
        }
        #endregion
@@ -453,34 +540,34 @@
        private void InitThreeButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
        {
            //按键1
            var frame1 = new FrameLayoutControl();
            frame1.Height = Application.GetMinRealAverage(110);
            frame1.Width = Application.GetMinRealAverage(110);
            frame1.Y = Application.GetMinRealAverage(63);
            var frame1 = new FrameLayoutStatuControl();
            frame1.Height = this.GetPictrueRealSize(110);
            frame1.Width = this.GetPictrueRealSize(110);
            frame1.Y = this.GetPictrueRealSize(63);
            frame1.Gravity = Gravity.CenterHorizontal;
            frameBack.AddChidren(frame1);
            //初始化设备图标
            this.InitDeviceIcon(frame1, listDevice[0], true);
            this.InitDeviceIcon(frame1, listDevice[0]);
            //按键2
            var frame2 = new FrameLayoutControl();
            frame2.Height = Application.GetMinRealAverage(110);
            frame2.Width = Application.GetMinRealAverage(110);
            frame2.X = Application.GetMinRealAverage(63);
            frame2.Y = Application.GetMinRealAverage(245);
            var frame2 = new FrameLayoutStatuControl();
            frame2.Height = this.GetPictrueRealSize(110);
            frame2.Width = this.GetPictrueRealSize(110);
            frame2.X = this.GetPictrueRealSize(63);
            frame2.Y = this.GetPictrueRealSize(245);
            frameBack.AddChidren(frame2);
            //初始化设备图标
            this.InitDeviceIcon(frame2, listDevice[1], false);
            this.InitDeviceIcon(frame2, listDevice[1]);
            //按键3
            var frame3 = new FrameLayoutControl();
            frame3.Height = Application.GetMinRealAverage(110);
            frame3.Width = Application.GetMinRealAverage(110);
            frame3.X = Application.GetMinRealAverage(245);
            frame3.Y = Application.GetMinRealAverage(245);
            var frame3 = new FrameLayoutStatuControl();
            frame3.Height = this.GetPictrueRealSize(110);
            frame3.Width = this.GetPictrueRealSize(110);
            frame3.X = this.GetPictrueRealSize(245);
            frame3.Y = this.GetPictrueRealSize(245);
            frameBack.AddChidren(frame3);
            //初始化设备图标
            this.InitDeviceIcon(frame3, listDevice[2], false);
            this.InitDeviceIcon(frame3, listDevice[2]);
        }
        #endregion
@@ -495,82 +582,44 @@
        private void InitFourButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
        {
            //按键1
            var frame1 = new FrameLayoutControl();
            frame1.Height = Application.GetMinRealAverage(110);
            frame1.Width = Application.GetMinRealAverage(110);
            frame1.X = Application.GetMinRealAverage(63);
            frame1.Y = Application.GetMinRealAverage(63);
            var frame1 = new FrameLayoutStatuControl();
            frame1.Height = this.GetPictrueRealSize(110);
            frame1.Width = this.GetPictrueRealSize(110);
            frame1.X = this.GetPictrueRealSize(63);
            frame1.Y = this.GetPictrueRealSize(63);
            frameBack.AddChidren(frame1);
            //初始化设备图标
            this.InitDeviceIcon(frame1, listDevice[0], true);
            this.InitDeviceIcon(frame1, listDevice[0]);
            //按键2
            var frame2 = new FrameLayoutControl();
            frame2.Height = Application.GetMinRealAverage(110);
            frame2.Width = Application.GetMinRealAverage(110);
            frame2.X = Application.GetMinRealAverage(245);
            frame2.Y = Application.GetMinRealAverage(63);
            var frame2 = new FrameLayoutStatuControl();
            frame2.Height = this.GetPictrueRealSize(110);
            frame2.Width = this.GetPictrueRealSize(110);
            frame2.X = this.GetPictrueRealSize(245);
            frame2.Y = this.GetPictrueRealSize(63);
            frameBack.AddChidren(frame2);
            //初始化设备图标
            this.InitDeviceIcon(frame2, listDevice[1], false);
            this.InitDeviceIcon(frame2, listDevice[1]);
            //按键3
            var frame3 = new FrameLayoutControl();
            frame3.Height = Application.GetMinRealAverage(110);
            frame3.Width = Application.GetMinRealAverage(110);
            frame3.X = Application.GetMinRealAverage(63);
            frame3.Y = Application.GetMinRealAverage(245);
            var frame3 = new FrameLayoutStatuControl();
            frame3.Height = this.GetPictrueRealSize(110);
            frame3.Width = this.GetPictrueRealSize(110);
            frame3.X = this.GetPictrueRealSize(63);
            frame3.Y = this.GetPictrueRealSize(245);
            frameBack.AddChidren(frame3);
            //初始化设备图标
            this.InitDeviceIcon(frame3, listDevice[2], false);
            this.InitDeviceIcon(frame3, listDevice[2]);
            //按键4
            var frame4 = new FrameLayoutControl();
            frame4.Height = Application.GetMinRealAverage(110);
            frame4.Width = Application.GetMinRealAverage(110);
            frame4.X = Application.GetMinRealAverage(245);
            frame4.Y = Application.GetMinRealAverage(245);
            var frame4 = new FrameLayoutStatuControl();
            frame4.Height = this.GetPictrueRealSize(110);
            frame4.Width = this.GetPictrueRealSize(110);
            frame4.X = this.GetPictrueRealSize(245);
            frame4.Y = this.GetPictrueRealSize(245);
            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);
            this.InitDeviceIcon(frame4, listDevice[3]);
        }
        #endregion
@@ -601,7 +650,7 @@
            nowContr.BorderColor = 0xfffb744a;
            nowSelectControl = nowContr;
            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceMac, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
            //重新初始化菜单行
            this.InitMenuRow();