合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

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

            //添加背光灯行

            this.AddBackLightRow();

            //初始化桌布完成

            tableContr.FinishInitControl(bodyFrameLayout, this.listview);

        }



        #endregion