Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayFirmwareUpdateForm.cs

@@ -58,7 +58,7 @@
            btnIcon.ButtonClickEvent += (sender, e) =>

            {

                //菜单控件

                var frameMenu = new TopRightMenuControl(this, 1);

                var frameMenu = new TopRightMenuControl(1);

                //历史版本

                string menu1 = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);

                frameMenu.AddRowMenu(menu1, "", "", () =>