合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs

@@ -40,6 +40,9 @@
            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate));



            //初始化右上角菜单

            this.InitTopRightMenu();



            //初始化中部控件

            this.InitMiddleFrame();

        }

@@ -88,6 +91,8 @@
        /// </summary>

        private int InitNowVersionControl()

        {

            bodyFrameLayout.RemoveAll();



            var frameBack = new FrameLayout();

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Height = Application.GetMinReal(800);

@@ -113,6 +118,8 @@
            rowLinux.AddRightArrow();

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

            {

                var form = new GatewayLinuxInfoForm();

                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));

            };



            //协调器

@@ -122,6 +129,8 @@
            rowCoordinator.AddRightArrow();

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

            {

                var form = new GatewayCoordinatorInfoForm();

                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));

            };



            if (this.listVode != null)

@@ -133,6 +142,8 @@
                rowVirtual.AddRightArrow();

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

                {

                    var form = new GatewayVirtualDriveInfoForm();

                    form.AddForm(listVode);

                };

            }

            //没有新版本

@@ -250,6 +261,56 @@


        #endregion



        #region ■ 右上角菜单_________________________


        /// <summary>

        /// 初始化右上角菜单

        /// </summary>
        private void InitTopRightMenu()

        {

            var btnIcon = new MostRightIconControl(69, 69);

            btnIcon.UnSelectedImagePath = "Item/More.png";

            topFrameLayout.AddChidren(btnIcon);

            btnIcon.InitControl();

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

            {

                //显示右上角菜单界面

                this.ShowTopRightMenu();

            });

        }



        /// <summary>

        /// 显示右上角菜单界面

        /// </summary>
        private void ShowTopRightMenu()

        {

            var frame = new TopRightMenuControl(1);

            //历史版本

            var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);

            frame.AddRowMenu(deviceMenu, "", "", () =>

            {

                var form = new GatewayHistoryFirmwareVersionForm();

                form.AddForm(zbGateway, listVersionInfo[2], listVersionInfo[1], listVersionInfo[0], listVode);

                form.SelectFirmwareInfoEvent += (info1,info2,info3,listCode) =>

                {

                    listVersionInfo[2] = info1;

                    listVersionInfo[1] = info2;

                    listVersionInfo[0] = info3;

                    listVode = listCode;



                    //初始化当前版本的控件

                    var yy = this.InitNowVersionControl();

                    if (listVersionInfo[0] != null || listVersionInfo[1] != null || listVersionInfo[2] != null)

                    {

                        //初始化新版本的控件

                        this.InitNewVersionControl(yy);

                    }

                };

            });

        }



        #endregion



        #region ■ 添加固件介绍行_____________________



        /// <summary>