？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

 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

@@ -250,7 +252,7 @@
            //{

            //    menuCount = 2;

            //}

            var frame = new TopRightMenuControl(menuCount);

            var frame = new TopRightMenuControl(menuCount, 1);

            if (canTest == true)

            {

                //定位

@@ -333,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)

                        {

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