2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

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

@@ -42,6 +42,10 @@
        /// 设备具体类型的信息

        /// </summary>

        private DeviceEnumInfo deviceEnumInfo = null;

        /// <summary>

        /// 信息编辑控件

        /// </summary>

        private InformationEditorControl tableContr = null;



        #endregion



@@ -77,15 +81,11 @@
            this.ClearBodyFrame();



            //初始化桌布

            var tableContr = new InformationEditorControl();

            this.tableContr = new InformationEditorControl();

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



            //初始化设备回路图标

            this.InitDeviceEpointIcon();



            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

            tableContr = null;



            //保存

            var btnFinish = new BottomClickButton();

@@ -175,7 +175,7 @@
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //变更房间

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

                HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);

            };



            //3路继电器或者1路调光器第七回路的配置信息

@@ -210,6 +210,8 @@
            this.AddBindRow(listRelayInfo7);

            //添加背光灯行

            this.AddBackLightRow();

            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

        }



        #endregion

@@ -221,6 +223,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);

@@ -241,11 +248,11 @@
            string deviceMenu = string.Empty;

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

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

            if (canTest == true)

            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(menuCount);

            //if (canTest == true)

            //{

            //    menuCount = 2;

            //}

            var frame = new TopRightMenuControl(menuCount, 1);

            if (canTest == true)

            {

                //定位

@@ -258,10 +265,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

@@ -328,7 +335,7 @@
                            //选择的是传感器输入

                            value = 65535;

                        }

                        var result = await HdlDevicePanelLogic.Current.EditorDryContactFunction((Panel)nowSelectDevice, value);

                        var result = await HdlDevicePanelLogic.Current.EditorDryContactThirdFunction((Panel)nowSelectDevice, value);

                        if (result == true)

                        {

                            //重新初始化菜单行,隐藏或者开放绑定目标菜单

@@ -434,7 +441,8 @@
            frameBorder.Gravity = Gravity.CenterHorizontal;

            frameBorder.Width = Application.GetRealWidth(887);

            frameBorder.Height = Application.GetRealHeight(423);

            frameBorder.BorderWidth = (uint)Application.GetMinRealAverage(3);

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

            frameBorder.BorderWidth = 1;

            frameBorder.BorderColor = 0xffd0d0d0;

            bodyFrameLayout.AddChidren(frameBorder);



@@ -508,7 +516,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;