合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

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

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

@@ -240,10 +245,10 @@
            string deviceMenu = string.Empty;

            //检测此回路是否拥有定位功能

            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);

            if (canTest == true)

            {

                menuCount = 2;

            }

            //if (canTest == true)

            //{

            //    menuCount = 2;

            //}

            var frame = new TopRightMenuControl(menuCount);

            if (canTest == true)

            {

@@ -257,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

@@ -326,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) =>

                        {

@@ -366,9 +371,10 @@
            var frameBorder = new FrameLayout();

            frameBorder.Y = Application.GetRealHeight(147);

            frameBorder.Gravity = Gravity.CenterHorizontal;

            frameBorder.Width = Application.GetMinRealAverage(887);

            frameBorder.Height = Application.GetMinRealAverage(423);

            frameBorder.BorderWidth = 3;

            frameBorder.Width = Application.GetRealWidth(887);

            frameBorder.Height = Application.GetRealHeight(423);

            frameBorder.Radius = (uint)Application.GetRealHeight(6);

            frameBorder.BorderWidth = 1;

            frameBorder.BorderColor = 0xffd0d0d0;

            bodyFrameLayout.AddChidren(frameBorder);



@@ -444,7 +450,7 @@
                btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;

                btnIcon.X = defultXX + i * (frame.Height + space);

                btnIcon.Radius = (uint)frame.Height / 2;

                btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);

                btnIcon.BorderWidth = 2;

                btnIcon.BorderColor = 0xff979797;

                btnIcon.TextAlignment = TextAlignment.Center;

                btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;