From ade5917841b0fdcb1df7353ef7c56b1a1bdc9282 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:03:32 +0800
Subject: [PATCH] 删除 Gateway.Ios文件

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index 80f6c2c..f023899 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -1,227 +1,370 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Text;
-using System.Threading.Tasks;
 using ZigBee.Device;
 
 namespace Shared.Phone.UserCenter.Device
 {
     /// <summary>
-    /// 鍥轰欢鍗囩骇鐢婚潰
+    /// 璁惧鍥轰欢鍗囩骇鐣岄潰
     /// </summary>
-    public class DeviceFirmwareUpdateForm : UserCenterCommonForm
+    public class DeviceFirmwareUpdateForm : EditorCommonForm
     {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
         /// <summary>
-        /// 鍗囩骇鐨勮澶�
+        /// 璁惧mac鍦板潃
         /// </summary>
-        private List<CommonDevice> listUpdateDevice = null;
+        private string deviceMac = null;
         /// <summary>
-        /// 璁惧鏂扮増鏈殑鍥轰欢淇℃伅
-        /// </summary>
-        private FirmwareVersionInfo deviceFirmware = null;
-        /// <summary>
-        /// 褰撳墠闀滃儚鐗堟湰
+        /// 鍥轰欢淇℃伅
         /// </summary>
-        private int imageVersion = 0;
+        private FirmwareVersionInfo deviceFirmware = null;
+
+        #endregion
+
+        #region 鈻� 鍒濆鍖朹____________________________
 
         /// <summary>
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
-        /// <param name="i_listdevice">璁惧</param>
-        /// <param name="i_deviceFirmware">璁惧鏂扮増鏈�</param>
-        /// <param name="i_imageVersion">褰撳墠闀滃儚鐗堟湰</param>
-        public void ShowForm(List<CommonDevice> i_listdevice, FirmwareVersionInfo i_deviceFirmware, int i_imageVersion)
-        {
-            this.listUpdateDevice = i_listdevice;
-            this.imageVersion = i_imageVersion;
-            this.deviceFirmware = i_deviceFirmware;
+        /// <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));
-
-            var btnIcon = new TopLayoutMostRightView();
-            btnIcon.UnSelectedImagePath = "Item/More.png";
-            btnIcon.SelectedImagePath = "Item/MoreSelected.png";
-            topFrameLayout.AddChidren(btnIcon);
-            btnIcon.MouseUpEventHandler += (sender, e) =>
-            {
-                //鑿滃崟鎺т欢
-                var frameMenu = new TopRightMenuControl(this, 1);
-                //鍘嗗彶鐗堟湰
-                string menu1 = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
-                frameMenu.AddRowMenu(menu1, (obj) =>
-                {
-                    var form = new DeviceHistoryFirmwareVersionForm();
-                    this.AddForm(form, listUpdateDevice);
-                    form.FormCloseAction += ((firmwareInfo) =>
-                    {
-                        //濡傛灉褰撳墠姝e湪鍗囩骇锛屽垯鍘嗗彶鐗堟湰鏃犳晥
-                        if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(this.listUpdateDevice[0].DeviceAddr) == false)
-                        {
-                            //閲嶆柊鍒锋柊鐣岄潰
-                            this.ShowForm(listUpdateDevice, firmwareInfo, firmwareInfo.FirmwareVersion);
-                        }
-                    });
-                });
-            };
+            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate));
 
             //鍒濆鍖栦腑閮ㄦ帶浠�
             this.InitMiddleFrame();
+
+            //鍘嗗彶鐗堟湰
+            this.InitTopRightMenu();
         }
 
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄦ帶浠�
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄦ帶浠�
         /// </summary>
         private void InitMiddleFrame()
         {
-            bodyFrameLayout.RemoveAll();
+            var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac);
+            //鑾峰彇璁惧鏈�鏂扮増鏈�
+            this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+                oTADevice.HwVersion.ToString(),
+                oTADevice.ImgTypeId.ToString(),
+                oTADevice.ImgVersion);
 
-            //娌℃湁鏂扮増鏈�
-            if (deviceFirmware == null)
+            if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
             {
-                //鏄剧ず宸茬粡鏄柊鐗堟湰
-                this.ShowIsMostVewVersion();
+                //鎷ユ湁鏂扮増鏈�
+                this.InitControlByNewVersion();
             }
             else
             {
-                //鏄剧ず宸茬粡鏄柊鐗堟湰
-                this.ShowIsHadNewVersion();
-            }
+                //娌℃湁鏂扮増鏈�
+                this.InitControlByNotNewVersion();
+            }
         }
 
+        #endregion
+
+        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+
         /// <summary>
-        /// 鏄剧ず宸茬粡鏄柊鐗堟湰
-        /// </summary>
-        private void ShowIsMostVewVersion()
+        /// 鍒濆鍖栧彸涓婅鑿滃崟
+        /// </summary>
+        private void InitTopRightMenu()
         {
-            //濡傛灉鐐圭殑鏄巻鍙茬増鏈紝鍒欏悓姝ョ晫闈�
-            string mainKeys = this.listUpdateDevice[0].DeviceAddr;
-            if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(mainKeys) == true)
+            if (UserCenterResourse.HideOption.DeviceHistory != 1)
             {
-                var btnUpdateControl = FirmwareUpdateResourse.dicDeviceUpdateList[mainKeys];
-                bodyFrameLayout.AddChidren(btnUpdateControl);
-                //鍒濆鍖栧崌绾ф帶浠�
-                this.InitDeviceUpdateControl(btnUpdateControl);
                 return;
             }
-
-            //褰撳墠绋嬪簭鐗堟湰
-            var btnVersionMsg = new MsgViewControl(800, true);
-            btnVersionMsg.TextID = R.MyInternationalizationString.uIsMostNewVersion;
-            btnVersionMsg.Y = Application.GetRealHeight(100);
-            btnVersionMsg.TextAlignment = TextAlignment.Center;
-            btnVersionMsg.Gravity = Gravity.CenterHorizontal;
-            bodyFrameLayout.AddChidren(btnVersionMsg);
-
-            //鐗堟湰
-            var btnVersion = new MsgViewControl(800, true);
-            btnVersion.Text = Common.LocalDevice.Current.AppendVersion(this.imageVersion);
-            btnVersion.Y = btnVersionMsg.Bottom + Application.GetRealHeight(10);
-            btnVersion.TextAlignment = TextAlignment.Center;
-            btnVersion.Gravity = Gravity.CenterHorizontal;
-            bodyFrameLayout.AddChidren(btnVersion);
+            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 ShowIsHadNewVersion()
+        /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+        /// </summary>
+        private void ShowTopRightMenu()
         {
-            //鍗囩骇鎺т欢
-            string mainKeys = this.listUpdateDevice[0].DeviceAddr;
-
-            //涓存椂鎺т欢
-            var btnTemp = new ButtonCommon();
-            Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnTemp, this.listUpdateDevice);
-
-            DeviceFirmwareUpdateControl btnUpdateControl = null;
-            if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(mainKeys) == true)
+            var frame = new TopRightMenuControl(1, 2);
+            //鍘嗗彶鐗堟湰
+            var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
+            frame.AddRowMenu(deviceMenu, "", "", () =>
             {
-                btnUpdateControl = FirmwareUpdateResourse.dicDeviceUpdateList[mainKeys];
-                bodyFrameLayout.AddChidren(btnUpdateControl);
+                var form = new DeviceHistoryFirmwareVersionForm();
+                form.AddForm(deviceMac);
+                form.SelectFirmwareInfoEvent += (info) =>
+                {
+                    this.deviceFirmware = info;
+                    //鎷ユ湁鏂扮増鏈�
+                    this.InitControlByNewVersion();
+                };
+            });
+        }
+
+        #endregion
+
+        #region 鈻� 鎷ユ湁鏂扮増鏈琠________________________
+
+        /// <summary>
+        /// 鎷ユ湁鏂扮増鏈�
+        /// </summary>
+        private void InitControlByNewVersion()
+        {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac);
+
+            //鍗囩骇
+            var btnUpdate = new BottomClickButton();
+            btnUpdate.TextID = R.MyInternationalizationString.uLevelUp;
+            bodyFrameLayout.AddChidren(btnUpdate);
+            btnUpdate.ButtonClickEvent += (sender, e) =>
+            {
+                //璁惧鍗囩骇
+                HdlThreadLogic.Current.RunThread(() =>
+                {
+                    this.DoDeviceUpdate(oTADevice);
+                });
+            };
+
+            var frameWhiteBack = new FrameLayout();
+            frameWhiteBack.Height = Application.GetRealHeight(286);
+            frameWhiteBack.BackgroundColor = UserCenterColor.Current.White;
+            bodyFrameLayout.AddChidren(frameWhiteBack);
+
+            //褰撳墠鍥轰欢鐗堟湰
+            var frameNow = new FrameRowControl();
+            frameNow.UseClickStatu = false;
+            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.AddBottomLine();
+
+            //鏈�鏂板浐浠剁増鏈�
+            var frameNew = new FrameRowControl();
+            frameNew.UseClickStatu = false;
+            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.AddBottomLine();
+
+            //娣诲姞鍥轰欢浠嬬粛琛�
+            int maxHeight = btnUpdate.Y - ControlCommonResourse.BottomButtonAndListViewSpace - frameNew.Bottom;
+            this.AddUpdateContent(deviceFirmware, maxHeight, frameNew.Bottom);
+        }
+
+        #endregion
+
+        #region 鈻� 娌℃湁鏂扮増鏈琠________________________
+
+        /// <summary>
+        /// 娌℃湁鏂扮増鏈�
+        /// </summary>
+        private void InitControlByNotNewVersion()
+        {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac);
+
+            var frameWhiteBack = new FrameLayout();
+            frameWhiteBack.Height = Application.GetRealHeight(308);
+            frameWhiteBack.BackgroundColor = UserCenterColor.Current.White;
+            bodyFrameLayout.AddChidren(frameWhiteBack);
+
+            //褰撳墠鍥轰欢鐗堟湰
+            var frameNow = new FrameRowControl();
+            frameNow.UseClickStatu = false;
+            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.AddBottomLine();
+
+            //鏈�鏂板浐浠剁増鏈�
+            var frameNew = new FrameRowControl();
+            frameNew.UseClickStatu = false;
+            frameNew.Y = frameNow.Bottom + Application.GetRealHeight(12);
+            frameWhiteBack.AddChidren(frameNew);
+            frameNew.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewFirmwareVersion), 500);
+            frameNew.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uNothing), 500);
+        }
+
+        #endregion
+
+        #region 鈻� 娣诲姞鍥轰欢浠嬬粛琛宊____________________
+
+        /// <summary>
+        /// 娣诲姞鍥轰欢浠嬬粛琛�
+        /// </summary>
+        /// <param name="versionInfo">鍥轰欢瀵硅薄</param>
+        /// <param name="Maxheight">鏈�澶ч珮搴�</param>
+        /// <param name="YY"></param>
+        private void AddUpdateContent(FirmwareVersionInfo versionInfo, int Maxheight,int YY)
+        {
+            FrameListControl listFrame = null;
+            VerticalListControl listView = null;
+
+            var realHeight = Application.GetRealHeight(40 + 12) * versionInfo.UpdateContent.Count;
+            realHeight += Application.GetRealHeight(17 + 12 + 49 + 8 + 63);
+
+            //琛岄棿璺�
+            int rowSpace = 0;
+            if (realHeight > Maxheight)
+            {
+                realHeight = Maxheight;
+                listView = new VerticalListControl(12);
+                listView.Height = realHeight;
+                listView.Y = YY;
+                listView.BackgroundColor = UserCenterColor.Current.White;
+                bodyFrameLayout.AddChidren(listView);
+                rowSpace = listView.rowSpace / 2;
             }
             else
             {
-                btnUpdateControl = new DeviceFirmwareUpdateControl(null, this.listUpdateDevice, this.deviceFirmware);
-                bodyFrameLayout.AddChidren(btnUpdateControl);
-                btnUpdateControl.InitChidrenControl(btnTemp.UnSelectedImagePath);
+                listFrame = new FrameListControl(12);
+                listFrame.Height = realHeight;
+                listFrame.Y = YY;
+                listFrame.BackgroundColor = UserCenterColor.Current.White;
+                bodyFrameLayout.AddChidren(listFrame);
+                rowSpace = listFrame.rowSpace / 2;
             }
-            //鍒濆鍖栧崌绾ф帶浠�
-            this.InitDeviceUpdateControl(btnUpdateControl);
+
+            //娣诲姞澶撮儴绌虹櫧闂撮殭
+            var frameSpace1 = new FrameLayout();
+            frameSpace1.Height = Application.GetRealHeight(17);
+            listView?.AddChidren(frameSpace1);
+            listFrame?.AddChidren(frameSpace1);
+
+            //淇敼鍐呭
+            var btnContentRow = new FrameRowControl(rowSpace);
+            btnContentRow.UseClickStatu = false;
+            btnContentRow.Height = Application.GetRealHeight(49);
+            listView?.AddChidren(btnContentRow);
+            listFrame?.AddChidren(btnContentRow);
+            var btnContent = btnContentRow.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEditorContent), 500);
+            btnContent.TextSize = 12;
+
+            //绋嶅井鍐嶆坊鍔犵┖鐧介棿闅�
+            var frameSpace2 = new FrameLayout();
+            frameSpace2.Height = Application.GetRealHeight(8);
+            listView?.AddChidren(frameSpace2);
+            listFrame?.AddChidren(frameSpace2);
+
+            foreach (var msg in versionInfo.UpdateContent)
+            {
+                var btnRow = new FrameRowControl(rowSpace);
+                btnRow.UseClickStatu = false;
+                btnRow.Height = Application.GetRealHeight(40);
+                listView?.AddChidren(btnRow);
+                listFrame?.AddChidren(btnRow);
+
+                var btnMsg = btnRow.AddLeftCaption(msg, 965);
+                btnMsg.TextSize = 10;
+                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
+            }
+
+            //娣诲姞搴曢儴绌虹櫧闂撮殭
+            var frameSpace3 = new FrameLayout();
+            frameSpace3.Height = Application.GetRealHeight(63);
+            listView?.AddChidren(frameSpace3);
+            listFrame?.AddChidren(frameSpace3);
         }
 
+        #endregion
+
+        #region 鈻� 璁惧鍗囩骇___________________________
+
         /// <summary>
-        /// 鍒濆鍖栧崌绾ф帶浠�
+        /// 璁惧鍗囩骇
         /// </summary>
-        /// <param name="btnUpdateControl"></param>
-        private void InitDeviceUpdateControl(DeviceFirmwareUpdateControl btnUpdateControl)
+        private void DoDeviceUpdate(OTADevice oTADevice)
         {
-            //鍗囩骇
-            BottomClickButton btnUpdate = btnUpdateControl.btnUpdateButton;
-            if (btnUpdate == null)
+            //鎵撳紑杩涘害鏉�
+            ProgressFormBar.Current.Start();
+            //璁惧鍗囩骇
+            var updateLogic = new HdlDeviceUpdateLogic(oTADevice, deviceFirmware);
+            //鏇存柊鐘舵�佸彉鍖栫殑浜嬩欢
+            updateLogic.UpdateStatuChangedEvent += (div, msg) =>
             {
-                btnUpdate = new BottomClickButton();
-                btnUpdate.UseClickStatu = false;
-                btnUpdate.TextID = R.MyInternationalizationString.uLevelUp;
-                btnUpdate.Gravity = Gravity.BottomCenter;
-                btnUpdate.MouseUpTime = 0;
-                btnUpdate.Radius = 0;
-                btnUpdate.Width = Application.CurrentWidth;
-                btnUpdate.MouseUpEvent += (sender, e) =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    if (btnUpdateControl.UpdateStatu == UpdateStatuMode.UpdateSuccess)
+                    if (div == -1)
                     {
-                        //鍗囩骇鎴愬姛鐨勬椂鍊欙紝濡傛灉鍗曞嚮姝ゆ寜閽紝鍒欏叧闂晫闈�
-                        this.CloseForm();
-                        return;
+                        //寮傚父
+                        this.ShowMassage(ShowMsgType.Tip, msg);
+                        ProgressFormBar.Current.Close();
                     }
-                    //杩涘叆鎵ц鏇存柊鎿嶄綔鍑嗗闃舵
-                    btnUpdateControl.StartUpdateReady();
-                };
-            }
-            btnUpdateControl.btnUpdateButton = btnUpdate;
-            bodyFrameLayout.AddChidren(btnUpdate);
+                    else if (div == 0)
+                    {
+                        //涓�鑸俊鎭�
+                        ProgressFormBar.Current.SetMsg(msg);
+                    }
+                    else if (div == 1)
+                    {
+                        //鍗囩骇瀹屾垚
+                        ProgressFormBar.Current.Close();
+                        this.ShowMassage(ShowMsgType.Tip, msg);
 
-            var listView = new VerticalScrolViewLayout();
-            listView.Y = btnUpdateControl.Bottom;
-            listView.Height = bodyFrameLayout.Height - btnUpdateControl.Height - btnUpdate.Height;
-            bodyFrameLayout.AddChidren(listView);
-
-            //鍋氭垚鏇存柊鍐呭鎺т欢
-            ViewNormalControl btnTempMsg = null;
-            //涓存椂鎺т欢
-            ButtonCommon btnTemp = null;
-            //鍋氭垚鏇存柊璁板綍鎺т欢
-            foreach (string msg in btnUpdateControl.deviceFirmware.UpdateContent)
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            //鍒濆鍖栦腑閮ㄦ帶浠�
+                            this.InitMiddleFrame();
+                        });
+                    }
+                    else if (div == 2)
+                    {
+                        //涓诲姩缁堟鍗囩骇
+                        ProgressFormBar.Current.Close();
+                    }
+                });
+            };
+            //杩涘害鍊兼敼鍙樹簨浠�
+            updateLogic.ProgressEvent += (value) =>
             {
-                var btnmsg = new ViewNormalControl(listView.Width);
-                btnmsg.X = ControlCommonResourse.XXLeft;
-                if (btnTemp != null)
+                ProgressFormBar.Current.SetValue(value, 100);
+            };
+            //璁惧鍗囩骇寮�濮�
+            updateLogic.StartUpdateReady();
+            //缁堟鍗囩骇
+            ProgressFormBar.Current.MsgClickEvent += () =>
+            {
+                //鍐嶆璋冪敤,鍐呴儴鏉′欢杈炬垚鏃�,鍙互閫夋嫨缁堟鍗囩骇
+                updateLogic.StartUpdateReady();
+            };
+            //鍏抽棴浜嬩欢
+            ProgressFormBar.Current.CloseEvent += () =>
+            {
+                //鍗囩骇瀵硅薄
+                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceMac) == true
+                    && FirmwareUpdateResourse.dicUpdateList[deviceMac].IsFinishUpdate == true)
                 {
-                    btnmsg.Y = btnTemp.Bottom + Application.GetRealHeight(5);
+                    //濡傛灉璁惧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
+                    FirmwareUpdateResourse.dicUpdateList[deviceMac].Dispose();
+                    FirmwareUpdateResourse.dicUpdateList.Remove(deviceMac);
                 }
-                btnmsg.Text = msg;
-                listView.AddChidren(btnmsg);
-                btnTempMsg = btnmsg;
-            }
+            };
         }
 
-        /// <summary>
-        /// 鐢婚潰鍏抽棴
-        /// </summary>
-        /// <param name="isCloseForm">鏄惁鍏抽棴鐣岄潰,false鐨勬椂鍊�,鍙細璋冪敤鍏抽棴鍑芥暟閲岄潰鐨勯檮鍔犲姛鑳�</param>
-        public override void CloseForm(bool isCloseForm = true)
-        {
-            //鍗囩骇鎺т欢
-            string mainKeys = this.listUpdateDevice[0].DeviceAddr;
-            if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(mainKeys) == true
-                && FirmwareUpdateResourse.dicDeviceUpdateList[mainKeys].IsFinishUpdate == true)
-            {
-                //濡傛灉璁惧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
-                FirmwareUpdateResourse.dicDeviceUpdateList.Remove(mainKeys);
-            }
-
-            base.CloseForm(isCloseForm);
-        }
+        #endregion
     }
 }

--
Gitblit v1.8.0