合并新代码，提供逻辑需要的门锁接口

xm

2020-04-28 dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b

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

old mode 100755
new mode 100644
@@ -377,6 +377,20 @@
                    };

                }

            }



            //如果是新风

            if (nowSelectDevice.Type == DeviceType.FreshAir)
            {
                //功能类型
                string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
                string strType = Language.StringByID(R.MyInternationalizationString.FreshAir);

                var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);

                btnFunction.UseClickStatu = false;

                listview.AddChidren(btnFunction);

                btnFunction.InitControl();

                //底线

                btnFunction.AddBottomLine();
            }
        }



        #endregion

@@ -430,6 +444,16 @@
                if (listIcon.Count == 1)

                {

                    frame.Gravity = Gravity.CenterVertical;


                    //如果是新风
                    if (deviceObj.Type == DeviceType.FreshAir)
                    {
                        frame.RemoveFromParent();
                        frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";
                        frameBack.Width = Application.GetMinRealAverage(878);
                        frameBack.Height = Application.GetMinRealAverage(354);
                        frameBack.Gravity = Gravity.Center;
                    }

                }

                else

                {

@@ -491,6 +515,8 @@
                //初始化菜单行

                this.DeviceEpointSelectEvent(btnTemp, null);

            }





        }



        /// <summary>