From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 16 十二月 2020 13:09:08 +0800 Subject: [PATCH] 新云端代码Ver1.2 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 74 ++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs index 223988d..212caf9 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs @@ -12,9 +12,9 @@ { #region 鈻� 鍙橀噺澹版槑___________________________ - /// <summary> - /// 璁惧mac鍦板潃 - /// </summary> + /// <summary> + /// 璁惧mac鍦板潃 + /// </summary> private string deviceMac = null; /// <summary> /// 鍥轰欢淇℃伅 @@ -28,34 +28,34 @@ /// <summary> /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓) /// </summary> - /// <param name="i_deviceMac">璁惧mac鍦板潃</param> - public void ShowForm(string i_deviceMac) + /// <param name="i_deviceMac">璁惧mac鍦板潃</param> + public void ShowForm(string i_deviceMac) { if (deviceMac != null && deviceMac != i_deviceMac) { //涓嶆槸鍚屼竴涓笢瑗� return; } - this.deviceMac = i_deviceMac; - - //璁剧疆鏍囬淇℃伅 - base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate)); - - //鍒濆鍖栦腑閮ㄦ帶浠� - this.InitMiddleFrame(); - - //鍘嗗彶鐗堟湰 - this.InitTopRightMenu(); - } - + this.deviceMac = i_deviceMac; + + //璁剧疆鏍囬淇℃伅 + base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate)); + + //鍒濆鍖栦腑閮ㄦ帶浠� + this.InitMiddleFrame(); + + //鍘嗗彶鐗堟湰 + this.InitTopRightMenu(); + } + /// <summary> /// 鍒濆鍖栦腑閮ㄦ帶浠� - /// </summary> - private void InitMiddleFrame() + /// </summary> + private void InitMiddleFrame() { - var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac); + var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac); //鑾峰彇璁惧鏈�鏂扮増鏈� - this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧, + this.deviceFirmware = HdlFirmwareUpdateLogic.Current.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString(), oTADevice.ImgVersion); @@ -76,19 +76,19 @@ { //娌℃湁鏂扮増鏈� this.InitControlByNotNewVersion(); - } + } } #endregion - #region 鈻� 鍙充笂瑙掕彍鍗昣________________________ + #region 鈻� 鍙充笂瑙掕彍鍗昣________________________ /// <summary> /// 鍒濆鍖栧彸涓婅鑿滃崟 - /// </summary> + /// </summary> private void InitTopRightMenu() { - if (UserCenterResourse.HideOption.DeviceHistory != 1) + if (HdlUserCenterResourse.HideOption.DeviceHistory != 1) { return; } @@ -105,7 +105,7 @@ /// <summary> /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈� - /// </summary> + /// </summary> private void ShowTopRightMenu() { var frame = new TopRightMenuControl(1, 2); @@ -136,7 +136,7 @@ //娓呯┖bodyFrame this.ClearBodyFrame(); - var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac); + var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac); //鍗囩骇 var btnUpdate = new BottomClickButton(); @@ -162,7 +162,7 @@ frameNow.Y = Application.GetRealHeight(20); frameWhiteBack.AddChidren(frameNow); frameNow.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNowFirmwareVersion), 500); - frameNow.AddMostRightView(Common.LocalDevice.Current.AppendVersion(oTADevice.ImgVersion), 500); + frameNow.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(oTADevice.ImgVersion), 500); frameNow.AddBottomLine(); //鏈�鏂板浐浠剁増鏈� @@ -171,11 +171,11 @@ frameNew.Y = frameNow.Bottom + Application.GetRealHeight(12); frameWhiteBack.AddChidren(frameNew); frameNew.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewFirmwareVersion), 500); - frameNew.AddMostRightView(Common.LocalDevice.Current.AppendVersion(deviceFirmware.FirmwareVersion), 500); + frameNew.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(deviceFirmware.FirmwareVersion), 500); frameNew.AddBottomLine(); //娣诲姞鍥轰欢浠嬬粛琛� - int maxHeight = btnUpdate.Y - ControlCommonResourse.BottomButtonAndListViewSpace - frameNew.Bottom; + int maxHeight = btnUpdate.Y - HdlControlResourse.BottomButtonAndListViewSpace - frameNew.Bottom; this.AddUpdateContent(deviceFirmware, maxHeight, frameNew.Bottom); } @@ -191,7 +191,7 @@ //娓呯┖bodyFrame this.ClearBodyFrame(); - var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac); + var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac); var frameWhiteBack = new FrameLayout(); frameWhiteBack.Height = Application.GetRealHeight(308); @@ -204,7 +204,7 @@ frameNow.Y = Application.GetRealHeight(20); frameWhiteBack.AddChidren(frameNow); frameNow.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNowFirmwareVersion), 500); - frameNow.AddMostRightView(Common.LocalDevice.Current.AppendVersion(oTADevice.ImgVersion), 500); + frameNow.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(oTADevice.ImgVersion), 500); frameNow.AddBottomLine(); //鏈�鏂板浐浠剁増鏈� @@ -225,7 +225,7 @@ /// </summary> /// <param name="versionInfo">鍥轰欢瀵硅薄</param> /// <param name="Maxheight">鏈�澶ч珮搴�</param> - /// <param name="YY"></param> + /// <param name="YY"></param> private void AddUpdateContent(FirmwareVersionInfo versionInfo, int Maxheight,int YY) { FrameListControl listFrame = null; @@ -362,12 +362,12 @@ ProgressFormBar.Current.CloseEvent += () => { //鍗囩骇瀵硅薄 - if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceMac) == true - && FirmwareUpdateResourse.dicUpdateList[deviceMac].IsFinishUpdate == true) + if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceMac) == true + && HdlFirmwareUpdateResourse.dicUpdateList[deviceMac].IsFinishUpdate == true) { //濡傛灉璁惧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨 - FirmwareUpdateResourse.dicUpdateList[deviceMac].Dispose(); - FirmwareUpdateResourse.dicUpdateList.Remove(deviceMac); + HdlFirmwareUpdateResourse.dicUpdateList[deviceMac].Dispose(); + HdlFirmwareUpdateResourse.dicUpdateList.Remove(deviceMac); } }; } -- Gitblit v1.8.0