合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -210,6 +210,11 @@
                    this.AddDoorLocksTimeRow();

                }

            }

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.AirConditioner_ZbGateway)

            {

                //添加【室内机设置】行(空调专用)

                this.AddIndoorUnitSettionRow();

            }

            else

            {

                //添加【绑定目标】行(pir传感器专用)

@@ -539,6 +544,7 @@
            //手拉控制

            string caption = Language.StringByID(R.MyInternationalizationString.uHandPullControl);

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

            btnFunction.UseClickStatu = false;

            listview.AddChidren(btnFunction);

            btnFunction.AddLeftCaption(caption, 600);

            //开关图标

@@ -582,6 +588,35 @@


        #endregion;



        #region ■ 室内机设置(空调)___________________



        /// <summary>

        /// 添加【室内机设置】行(空调专用)

        /// </summary>

        private void AddIndoorUnitSettionRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)

            {

                return;

            }

            //室内机设置

            string caption = Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion);

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

            listview.AddChidren(btnFunction);

            btnFunction.AddLeftCaption(caption, 600);

            //向右图标

            btnFunction.AddRightArrow();

            //底线

            btnFunction.AddBottomLine();

            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                var form = new DeviceAirConditioner.IndoorUnitListForm();

                form.AddForm(listNewDevice[0].DeviceAddr);

            };

        }



        #endregion



        #region ■ 通用信息___________________________



        /// <summary>