？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

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

@@ -40,6 +40,10 @@
        /// 设备需要保存的设备功能

        /// </summary>

        private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();

        /// <summary>

        /// 信息编辑控件

        /// </summary>

        private InformationEditorControl tableContr = null;



        #endregion



@@ -72,15 +76,11 @@
            this.ClearBodyFrame();



            //初始化桌布

            var tableContr = new InformationEditorControl();

            this.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();

@@ -198,11 +198,13 @@
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //变更房间

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

                HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);

            };



            //添加功能类型行

            this.AddFunctionTypeRow();

            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

        }



        #endregion

@@ -243,7 +245,7 @@
            //{

            //    menuCount = 2;

            //}

            var frame = new TopRightMenuControl(menuCount);

            var frame = new TopRightMenuControl(menuCount, 1);

            if (canTest == true)

            {

                //定位

@@ -399,7 +401,7 @@
            bodyFrameLayout.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 (listSort.Count == 4)

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

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

            btnIcon.Gravity = Gravity.Center;

            btnIcon.Radius = 6;

            btnIcon.RadiusEx = 16;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);