上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -87,7 +87,15 @@


            //初始化桌布

            this.tableContr = new InformationEditorControl();

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



            if (this.deviceObj.Type == DeviceType.FreshAir)

            {

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

            }

            else

            {

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

            }



            //初始化设备回路图标

            this.InitDeviceEpointIcon(listBackControl);

@@ -377,6 +385,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 +452,19 @@
                if (listIcon.Count == 1)

                {

                    frame.Gravity = Gravity.CenterVertical;



                    //如果是新风

                    if (deviceObj.Type == DeviceType.FreshAir)

                    {

                        frame.RemoveFromParent();

                        frameBorder.Y = Application.GetRealHeight(0);

                        frameBorder.Height = Application.GetRealHeight(709);

                        frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";

                        frameBack.Width = this.GetPictrueRealSize(878);

                        frameBack.Height = this.GetPictrueRealSize(354);

                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }

                }

                else

                {