请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -15,7 +15,7 @@
        /// <summary>

        /// 列表控件

        /// </summary>

        private VerticalListControl listview = null;

        private FrameListControl listview = null;

        /// <summary>

        /// 当前选择的设备

        /// </summary>

@@ -29,9 +29,9 @@
        /// </summary>

        private FrameCaptionInputControl btnDeviceName = null;

        /// <summary>

        /// 设备Mac地址

        /// 设备的某一回路

        /// </summary>

        private string deviceMac = string.Empty;

        private CommonDevice deviceObj = null;

        /// <summary>

        /// 设备需要保存的设备名字

        /// </summary>

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

        /// </summary>

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

        /// <summary>

        /// 信息编辑控件

        /// </summary>

        private InformationEditorControl tableContr = null;



        #endregion



@@ -48,10 +52,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;

            this.deviceObj = i_device;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));

@@ -71,16 +75,16 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //初始化桌布

            var tableContr = new InformationEditorControl();

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

           
            //初始化设备回路图标

            this.InitDeviceEpointIcon();

            var listBackControl = new VerticalFrameControl();

            listBackControl.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listBackControl);



            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr = null;

            //初始化桌布

            this.tableContr = new InformationEditorControl();

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



            //初始化设备回路图标

            this.InitDeviceEpointIcon(listBackControl);



            //保存

            var btnFinish = new BottomClickButton();

@@ -94,7 +98,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)

                    {

                        //不能允许空白名字

@@ -116,7 +120,7 @@
                }

                foreach (var epoint in dicDeviceFuncType.Keys)

                {

                    var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);

                    var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);

                    if (device == null)

                    {

                        continue;

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

            {

                //变更房间

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

                HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);

            };



            //添加功能类型行

            this.AddFunctionTypeRow();

            //初始化桌布完成

            tableContr.FinishInitControl();

        }



        #endregion

@@ -214,6 +220,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);

@@ -234,11 +245,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)

            {

                //定位

@@ -251,10 +262,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

@@ -320,7 +331,7 @@
                        //标题:选择功能类型

                        var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                        var form = new BottomDialogSelectForm();

                        var form = new BottomItemSelectForm();

                        form.AddForm(title, listText, nowSelectNo);

                        form.FinishSelectEvent += (selectNo) =>

                        {

@@ -352,9 +363,10 @@
        /// <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 listSort = new List<CommonDevice>();

            foreach (var device in listDevice)

            {

@@ -363,6 +375,11 @@
                    || device.Type == DeviceType.ColorDimmableLight)

                {

                    listSort.Add(device);

                    if (device.DeviceEpoint == deviceObj.DeviceEpoint)

                    {

                        //能够匹配得到这个回路

                        hadDevice = true;

                    }

                }

            }

            //排序

@@ -374,16 +391,21 @@
                }

                return -1;

            });

            if (hadDevice == false)

            {

                //如果匹配不到这个回路,则默认第一个

                this.deviceObj = listSort[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);

            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 (listSort.Count == 4)

@@ -408,9 +430,8 @@
        /// </summary>

        /// <param name="frame">扩大点击区域的容器</param>

        /// <param name="device">设备对象</param>

        /// <param name="isFirst">是否是第一个</param>

        /// <returns></returns>

        private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device, bool isFirst)

        private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)

        {

            //不使用点击特效

            frame.UseClickStatu = false;

@@ -418,7 +439,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.RadiusEx = 16;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

@@ -429,7 +450,7 @@
                this.DeviceEpointSelectEvent(btnIcon, null);

            };



            if (isFirst == true)

            if (device.DeviceEpoint == deviceObj.DeviceEpoint)

            {

                //初始化菜单行

                this.DeviceEpointSelectEvent(btnIcon, null);

@@ -455,7 +476,7 @@
            frame1.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0], true);

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

@@ -465,7 +486,7 @@
            frame2.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame2);

            //初始化设备图标

            this.InitDeviceIcon(frame2, listDevice[1], false);

            this.InitDeviceIcon(frame2, listDevice[1]);

        }



        #endregion

@@ -487,7 +508,7 @@
            frame1.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0], true);

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

@@ -497,7 +518,7 @@
            frame2.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame2);

            //初始化设备图标

            this.InitDeviceIcon(frame2, listDevice[1], false);

            this.InitDeviceIcon(frame2, listDevice[1]);



            //按键3

            var frame3 = new FrameLayoutControl();

@@ -507,7 +528,7 @@
            frame3.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame3);

            //初始化设备图标

            this.InitDeviceIcon(frame3, listDevice[2], false);

            this.InitDeviceIcon(frame3, listDevice[2]);

        }



        #endregion

@@ -529,7 +550,7 @@
            frame1.Y = Application.GetMinRealAverage(63);

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0], true);

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

@@ -539,7 +560,7 @@
            frame2.Y = Application.GetMinRealAverage(63);

            frameBack.AddChidren(frame2);

            //初始化设备图标

            this.InitDeviceIcon(frame2, listDevice[1], false);

            this.InitDeviceIcon(frame2, listDevice[1]);



            //按键3

            var frame3 = new FrameLayoutControl();

@@ -549,7 +570,7 @@
            frame3.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame3);

            //初始化设备图标

            this.InitDeviceIcon(frame3, listDevice[2], false);

            this.InitDeviceIcon(frame3, listDevice[2]);



            //按键4

            var frame4 = new FrameLayoutControl();

@@ -559,7 +580,7 @@
            frame4.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame4);

            //初始化设备图标

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

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

        }



        #endregion

@@ -594,7 +615,7 @@
            nowContr.TextColor = UserCenterColor.Current.TextColor1;



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