2020-05-19-4

陈嘉乐

2020-05-19 0e0584b87851c56745bf73b1a961b80613dd0721

 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;

@@ -727,7 +736,7 @@
                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);

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

                }

                //河东的面板设备

                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)

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

            };

        }



@@ -815,23 +845,24 @@
            btnFunction.AddLeftCaption(caption, 600);

            //开关图标

            var btnSwitch = btnFunction.AddMostRightSwitchIcon();

            //如果当前住宅是虚拟住宅的话,让所有菜单都不能点击

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                btnSwitch.CanClick = false;

            }

            //底线

            btnFunction.AddBottomLine();

            btnSwitch.ButtonClickEvent += async (sender, e) =>

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

            {

                //切换模式

                bool statu = !btnSwitch.IsSelected;

                var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);

                var result = HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);

                if (result == true)

                {

                    btnSwitch.IsSelected = statu;

                }

            };

            //如果是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);

                return;

            }



            //添加属性上报监听

            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);

@@ -1087,11 +1118,11 @@
        /// 设备重命名

        /// </summary>

        /// <param name="i_deviceName">deviceName.</param>

        private async void DeviceReName(string i_deviceName, bool closeForm)

        private void DeviceReName(string i_deviceName, bool closeForm)

        {

            //修改MAC名

            string deviceName = i_deviceName.Trim();

            var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);

            var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);

            if (result == false)

            {

                return;

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

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



            //设备新入网

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

            {

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

            }



            base.CloseFormBefore();

        }