上传代码

黄学彪

2020-05-13 2be70a32d2a8c517bd9868fb60913fcc843e66fe

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

@@ -268,7 +268,16 @@
                if (this.CheckCanShowFunctionSettionRow() == true)

                {

                    //添加【功能设置】行

                    this.AddFunctionSettionRow();

                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)

                    {

                        //PM传感器

                        this.AddFunctionSettionRowPM();

                    }

                    else

                    {

                        this.AddFunctionSettionRow();

                    }



                }



                //添加【干接点设置】行

@@ -682,7 +691,7 @@
            //只有回路数大于1才能有这个菜单

            if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)

            {

                //要求新风小模块的新风有功能设置

                //新风小模块只有一个回路，但要求新风小模块的新风有功能设置

                if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)

                {

                    return;

@@ -740,6 +749,27 @@
                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(listNewDevice[0], false);

                }

            };

        }



        /// <summary>

        /// 添加传感器【功能设置】行

        /// </summary>

        private void AddFunctionSettionRowPM()

        {

            //功能设置

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

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

                form.AddForm(listNewDevice[0], false);

            };

        }



@@ -901,9 +931,15 @@
        /// </summary>

        private void AddAirSwitchFunctionTypeRow()

        {

            if (this.deviceEnumInfo.BeloneType != DeviceBeloneType.A智能空开)

            //2020.04.28变更:有个别设备它除了继电器回路，什么都没有了,

            //这个时候也要现实出来

            if (this.listNewDevice.Count != 1)

            {

                //不是空气开关

                return;

            }

            if (this.listNewDevice[0].Type != DeviceType.OnOffOutput

                && this.listNewDevice[0].Type != DeviceType.AirSwitch)

            {

                return;

            }

            //自定义功能类型控件

@@ -1202,6 +1238,12 @@
            //移除获取设备硬件信息的监听线程

            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);



            //设备新入网

            if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)

            {

                this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });

            }



            base.CloseFormBefore();

        }