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

xm

2020-04-28 dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b

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

old mode 100755
new mode 100644
@@ -87,12 +87,12 @@


            //初始化桌布

            this.tableContr = new InformationEditorControl();

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);



            //初始化设备回路图标

            this.InitDeviceEpointIcon(listBackControl);



            //保存

            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);

            //初始化设备回路图标
            this.InitDeviceEpointIcon(listBackControl);

            //保存
            var btnFinish = new BottomClickButton();

            btnFinish.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnFinish);

@@ -149,6 +149,10 @@
                    else if (device.DfunctionType == DeviceFunctionType.A灯光)

                    {

                        device.IconPath = "Device/Light.png";

                    }

                    else

                    {

                        device.IconPath = "Device/RelayEpoint.png";

                    }

                    device.ReSave();

                }

@@ -312,8 +316,8 @@
                {

                    strType = Language.StringByID(R.MyInternationalizationString.uSocket1);

                    nowSelectNo = 2;

                }



                }

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

                btnFunction.UseClickStatu = false;

                listview.AddChidren(btnFunction);

@@ -338,10 +342,19 @@
                        var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                        var form = new BottomItemSelectForm();

                        form.CancelCallEvent = true;//允许取消

                        form.AddForm(title, listText, nowSelectNo);

                        form.FinishSelectEvent += (selectNo) =>

                        {

                            btnFunction.Text = listText[selectNo];

                            if (selectNo == -1)

                            {

                                //取消选择

                                btnFunction.Text = string.Empty;

                            }

                            else

                            {

                                btnFunction.Text = listText[selectNo];

                            }

                            nowSelectNo = selectNo;

                            //记录起当前选择的功能类型

                            if (selectNo == 0)

@@ -352,14 +365,32 @@
                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;

                            }

                            else

                            else if (selectNo == 2)

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;

                            }

                            else

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A未定义;

                            }

                        };

                    };

                }

            }



            //如果是新风

            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

@@ -397,7 +428,7 @@
            else

            {

                //不需要滑动控件

                frameBorder.AddChidren(frameBack);

                frameBorder.AddChidren(frameBack);
            }



            int index = 0;

@@ -412,7 +443,17 @@


                if (listIcon.Count == 1)

                {

                    frame.Gravity = Gravity.CenterVertical;

                    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

                {

@@ -425,15 +466,15 @@
                //计算真实高度

                int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距

                realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度

                realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距

                realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距

                if (realHeight > frameBack.Height)

                {

                    //变更高度

                    frameBack.Height = realHeight;

                }

            }

        }



        }

        /// <summary>

        /// 初始化一行设备图标

        /// </summary>

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

                this.DeviceEpointSelectEvent(btnTemp, null);

            }





        }



        /// <summary>