From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期一, 04 十一月 2019 17:58:40 +0800 Subject: [PATCH] 2019-11-04-1 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs | 63 +++++++++++++++---------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs index 704f5db..b3f61e2 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs @@ -16,15 +16,15 @@ private ZbGateway upDatezbGateway = null; /// <summary> /// 铏氭嫙璁惧鐨勫浐浠朵俊鎭� - /// </summary> + /// </summary> private FirmwareVersionInfo virtualFirmware = null; /// <summary> /// 鍗忚皟鍣ㄦ柊鐗堟湰鐨勫浐浠朵俊鎭� - /// </summary> + /// </summary> private FirmwareVersionInfo coordinatorFirmware = null; /// <summary> /// 缃戝叧鏂扮増鏈殑鍥轰欢淇℃伅 - /// </summary> + /// </summary> private FirmwareVersionInfo gatewayFirmware = null; /// <summary> /// 鍒楄〃鎺т欢 @@ -42,31 +42,31 @@ /// <summary> /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓) /// </summary> - /// <param name="i_zbGateway">缃戝叧</param> - /// <param name="i_virtualFirmware">铏氭嫙璁惧鐨勫浐浠朵俊鎭�</param> - /// <param name="i_coordinatorFirmware">鍗忚皟鍣ㄦ柊鐗堟湰鐨勫浐浠朵俊鎭�</param> - /// <param name="i_gatewayFirmware">缃戝叧鏂扮増鏈殑鍥轰欢淇℃伅</param> - /// <param name="i_listVode">铏氭嫙椹卞姩</param> - public void ShowForm(ZbGateway i_zbGateway, FirmwareVersionInfo i_virtualFirmware, - FirmwareVersionInfo i_coordinatorFirmware, FirmwareVersionInfo i_gatewayFirmware, List<ZbGatewayData.DriveCodeObj> i_listVode) - { - this.upDatezbGateway = i_zbGateway; - this.virtualFirmware = i_virtualFirmware; - this.coordinatorFirmware = i_coordinatorFirmware; - this.gatewayFirmware = i_gatewayFirmware; - this.listVode = i_listVode; - - //璁剧疆鏍囬淇℃伅 - base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion) + "(娴嬭瘯鐗�,鍚庨潰浼拌浼氬垹闄�)"); - - //鍒濆鍖栦腑閮ㄦ帶浠� - //this.InitMiddleFrame(); - } - - ///// <summary> - ///// 鍒濆鍖栦腑閮ㄦ帶浠� - ///// </summary> - //private void InitMiddleFrame() + /// <param name="i_zbGateway">缃戝叧</param> + /// <param name="i_virtualFirmware">铏氭嫙璁惧鐨勫浐浠朵俊鎭�</param> + /// <param name="i_coordinatorFirmware">鍗忚皟鍣ㄦ柊鐗堟湰鐨勫浐浠朵俊鎭�</param> + /// <param name="i_gatewayFirmware">缃戝叧鏂扮増鏈殑鍥轰欢淇℃伅</param> + /// <param name="i_listVode">铏氭嫙椹卞姩</param> + public void ShowForm(ZbGateway i_zbGateway, FirmwareVersionInfo i_virtualFirmware, + FirmwareVersionInfo i_coordinatorFirmware, FirmwareVersionInfo i_gatewayFirmware, List<ZbGatewayData.DriveCodeObj> i_listVode) + { + this.upDatezbGateway = i_zbGateway; + this.virtualFirmware = i_virtualFirmware; + this.coordinatorFirmware = i_coordinatorFirmware; + this.gatewayFirmware = i_gatewayFirmware; + this.listVode = i_listVode; + + //璁剧疆鏍囬淇℃伅 + base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion) + "(娴嬭瘯鐗�,鍚庨潰浼拌浼氬垹闄�)"); + + //鍒濆鍖栦腑閮ㄦ帶浠� + //this.InitMiddleFrame(); + } + + ///// <summary> + ///// 鍒濆鍖栦腑閮ㄦ帶浠� + ///// </summary> + //private void InitMiddleFrame() //{ // //娓呯┖bodyFrame // this.ClearBodyFrame(); @@ -95,7 +95,7 @@ // this.listVode[0].DriveImageType.ToString()); // } - // new System.Threading.Thread(() => + // HdlThreadLogic.Current.Run(() => // { // string fVersion = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxFWVersion").ToString(); // string imageType = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxImageType").ToString(); @@ -140,8 +140,7 @@ // this.AddRowlayout(data, FirmwareLevelType.VirtualDevice); // }); // } - // }) - // { IsBackground = true }.Start(); + // }); //} ///// <summary> @@ -170,7 +169,7 @@ // rowlayout.AddChidren(btnVersion); // //鍚戝彸鐨勫浘鏍� - // rowlayout.AddRightIconControl(); + // rowlayout.AddRightArrow(); // rowlayout.MouseUpEvent += (sender, e) => // { -- Gitblit v1.8.0