From 642fcdaeb496d9a8f3154e17fd76005be3fcf197 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 12:00:24 +0800
Subject: [PATCH] 2019.12.3

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs |   80 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index 2cb58a4..c168dc1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -30,50 +30,50 @@
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
         /// <param name="device">ota璁惧瀵硅薄</param>
-        /// <param name="deviceFirmware">鍥轰欢鍗囩骇淇℃伅</param>
-        public void ShowForm(OTADevice device, FirmwareVersionInfo deviceFirmware)
-        {
-            this.deviceMac = device.DeviceAddr;
-            //鍒濆鍖栦腑閮ㄤ俊鎭�
-            this.InitMiddleFrame(device, deviceFirmware);
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
-        /// </summary>
-        /// <param name="device">ota璁惧瀵硅薄</param>
-        /// <param name="deviceFirmware">鍥轰欢鍗囩骇淇℃伅</param>
-        private void InitMiddleFrame(OTADevice device, FirmwareVersionInfo deviceFirmware)
+        /// <param name="deviceFirmware">鍥轰欢鍗囩骇淇℃伅</param>
+        public void ShowForm(OTADevice device, FirmwareVersionInfo deviceFirmware)
         {
-            var frameBack = new FrameLayout();
-            frameBack.Width = Application.GetRealWidth(674);
-            frameBack.Height = Application.GetRealHeight(386);
-            frameBack.BackgroundColor = UserCenterColor.Current.White;
-            frameBack.Gravity = Gravity.CenterHorizontal;
-            frameBack.Y = Application.GetRealHeight(683);
-            frameBack.Radius = 6;
-            bodyFrameLayout.AddChidren(frameBack);
-
-            //杩涘害鏄剧ず鏂囨湰
-            var btnText = new NormalViewControl(frameBack.Width, Application.GetRealHeight(58), false);
-            btnText.Y = Application.GetRealHeight(248);
-            btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnText.TextAlignment = TextAlignment.Center;
-            //btnText.Text = "鍗囩骇涓�";
+            this.deviceMac = device.DeviceAddr;
+            //鍒濆鍖栦腑閮ㄤ俊鎭�
+            this.InitMiddleFrame(device, deviceFirmware);
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        /// <param name="device">ota璁惧瀵硅薄</param>
+        /// <param name="deviceFirmware">鍥轰欢鍗囩骇淇℃伅</param>
+        private void InitMiddleFrame(OTADevice device, FirmwareVersionInfo deviceFirmware)
+        {
+            var frameBack = new FrameLayout();
+            frameBack.Width = Application.GetRealWidth(674);
+            frameBack.Height = Application.GetRealHeight(386);
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.Gravity = Gravity.CenterHorizontal;
+            frameBack.Y = Application.GetRealHeight(683);
+            frameBack.Radius = 6;
+            bodyFrameLayout.AddChidren(frameBack);
+
+            //杩涘害鏄剧ず鏂囨湰
+            var btnText = new NormalViewControl(frameBack.Width, Application.GetRealHeight(58), false);
+            btnText.Y = Application.GetRealHeight(248);
+            btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnText.TextAlignment = TextAlignment.Center;
+            //btnText.Text = "鍗囩骇涓�";
             frameBack.AddChidren(btnText);
 
             //杩涘害鏉�
-            var btnProRow = new FrameLayout();
-            btnProRow.Gravity = Gravity.CenterHorizontal;
-            btnProRow.Y = Application.GetRealHeight(161);
-            btnProRow.Width = Application.GetRealWidth(559);
-            btnProRow.Height = Application.GetRealHeight(29);
+            var btnProRow = new FrameLayout();
+            btnProRow.Gravity = Gravity.CenterHorizontal;
+            btnProRow.Y = Application.GetRealHeight(161);
+            btnProRow.Width = Application.GetRealWidth(559);
+            btnProRow.Height = Application.GetRealHeight(29);
             btnProRow.BackgroundColor = 0xfff5f5f5;
             btnProRow.Radius = (uint)Application.GetRealHeight(29) / 2;
-            frameBack.AddChidren(btnProRow);
-            var btnProgressBar = new FrameLayout();
-            btnProgressBar.Width = 0;
-            btnProgressBar.Height = btnProRow.Height;
+            frameBack.AddChidren(btnProRow);
+            var btnProgressBar = new FrameLayout();
+            btnProgressBar.Width = 0;
+            btnProgressBar.Height = btnProRow.Height;
             btnProgressBar.Radius = btnProRow.Radius;
             btnProgressBar.BackgroundColor = 0xfffb744a;
             btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
@@ -183,7 +183,7 @@
         /// <summary>
         /// 鐢婚潰鍏抽棴
         /// </summary>
-        public override void CloseForm()
+        public override void CloseFormBefore()
         {
             //瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
             UserView.HomePage.Instance.ScrollEnabled = true;
@@ -199,7 +199,7 @@
             }
             this.FinishUpdateEvent = null;
 
-            base.CloseForm();
+            base.CloseFormBefore();
         }
 
         #endregion

--
Gitblit v1.8.0