From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 07 十一月 2019 10:56:13 +0800 Subject: [PATCH] 合并了全部的代码,IOS 图片需要从新引入工程 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs | 61 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs index 24e23fb..dca0b5e 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareInfoForm.cs +++ b/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> -- Gitblit v1.8.0