Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

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

        private FrameCaptionInputControl btnDeviceName = null;

        /// <summary>

        /// 设备Mac地址

        /// 设备的某一回路

        /// </summary>

        private string deviceMac = string.Empty;

        private CommonDevice deviceObj = null;

        /// <summary>

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

        /// </summary>

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

@@ -74,7 +74,7 @@
            //初始化桌布

            var tableContr = new InformationEditorControl();

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

           


            //初始化设备回路图标

            this.InitDeviceEpointIcon();



@@ -94,7 +94,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 +116,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;

@@ -238,7 +238,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(this, menuCount);

            var frame = new TopRightMenuControl(menuCount);

            if (canTest == true)

            {

                //定位

@@ -354,7 +354,8 @@
        /// </summary>

        private void InitDeviceEpointIcon()

        {

            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 +364,11 @@
                    || device.Type == DeviceType.ColorDimmableLight)

                {

                    listSort.Add(device);

                    if (device.DeviceEpoint == deviceObj.DeviceEpoint)

                    {

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

                        hadDevice = true;

                    }

                }

            }

            //排序

@@ -374,6 +380,11 @@
                }

                return -1;

            });

            if (hadDevice == false)

            {

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

                this.deviceObj = listSort[0];

            }



            var frameBorder = new FrameLayout();

            frameBorder.Y = Application.GetRealHeight(150);

@@ -408,9 +419,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;

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

            };



            if (isFirst == true)

            if (device.DeviceEpoint == deviceObj.DeviceEpoint)

            {

                //初始化菜单行

                this.DeviceEpointSelectEvent(btnIcon, null);

@@ -455,7 +465,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 +475,7 @@
            frame2.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame2);

            //初始化设备图标

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

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

        }



        #endregion

@@ -487,7 +497,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 +507,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 +517,7 @@
            frame3.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame3);

            //初始化设备图标

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

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

        }



        #endregion

@@ -529,7 +539,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 +549,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 +559,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 +569,7 @@
            frame4.Y = Application.GetMinRealAverage(245);

            frameBack.AddChidren(frame4);

            //初始化设备图标

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

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

        }



        #endregion

@@ -594,7 +604,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();