2020-03-23-3

WJC

2020-03-23 bba578c2f0acf2eca747edcb69426771e0cadd32

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

@@ -233,8 +233,13 @@
                    //添加【按键设置】行(面板专用)

                    this.AddPanelSettionRow();

                }

                //添加【功能设置】行

                this.AddFunctionSettionRow();



                if (this.IsFangyueFreshaAirPanel() == false)

                {

                    //添加【功能设置】行

                    this.AddFunctionSettionRow();

                }



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

                this.AddDryContactSettionRow();

            }

@@ -494,7 +499,7 @@
                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

                //按键设置

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

@@ -511,7 +516,7 @@
                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                    {

                        //方悦面板的按键配置

                        //方悦按键面板[单开双控/双开四控/四开八控]配置

                        var form = new DevicePanel.PanelFangyueButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

@@ -524,8 +529,26 @@
                    else

                    {

                        //方悦新风面板的按键配置

                        var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

                };

                return true;

            }

            return false;

        }



        #endregion



        #region ■ 按键设置(方悦)_____________________



        /// <summary>

        /// 是否是方悦新风面板

        /// </summary>

        private bool IsFangyueFreshaAirPanel()

        {

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

                return true;

            }

            return false;

@@ -642,7 +665,7 @@
                return;

            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

                //环境面板没有功能设置

                return;

@@ -773,10 +796,11 @@
            btnSwitch.ButtonClickEvent += async (sender, e) =>

            {

                //切换模式

                var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, !btnSwitch.IsSelected);

                bool statu = !btnSwitch.IsSelected;

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

                if (result == true)

                {

                    btnSwitch.IsSelected = !btnSwitch.IsSelected;

                    btnSwitch.IsSelected = statu;

                }

            };