From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
index 93c6491..220c220 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
@@ -13,6 +13,15 @@
     {
         #region 鈻� 鍙橀噺澹版槑___________________________
 
+        /// <summary>
+        /// wifi鍚�
+        /// </summary>
+        private string wifiName = string.Empty;
+        /// <summary>
+        /// wifi瀵嗙爜
+        /// </summary>
+        private string wifiPassword = string.Empty;
+
         #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
@@ -20,8 +29,13 @@
         /// <summary>
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
-        public void ShowForm()
+        /// <param name="i_wifiName">wifi鍚�(鍒殑鐣岄潰浼犺繃鏉ョ殑)</param>
+        /// <param name="i_wifiPassword">(鍒殑鐣岄潰浼犺繃鏉ョ殑)</param>
+        public void ShowForm(string i_wifiName, string i_wifiPassword)
         {
+            this.wifiName = i_wifiName;
+            this.wifiPassword = i_wifiPassword;
+
             //璁剧疆澶撮儴淇℃伅
             base.SetTitleText(Language.StringByID(StringId.AddInfraredRemoteControl));
             //杩欎釜鐣岄潰鐨勮儗鏅渶瑕佺櫧鑹�
@@ -124,8 +138,12 @@
                             {
                                 this.CloseForm();
                                 var form = new AddMiniRemoteControlDirection3Page();
-                                form.AddForm();
+                                form.AddForm(this.wifiName, this.wifiPassword);
                             });
+                        }
+                        else
+                        {
+                            HdlBluetoothLogic.Current.Dispone();
                         }
                     });
                 }
@@ -149,9 +167,13 @@
                                 {
                                     this.CloseForm();
                                     var form = new AddMiniRemoteControlDirection3Page();
-                                    form.AddForm();
+                                    form.AddForm(this.wifiName, this.wifiPassword);
                                 });
                             }
+                            else
+                            {
+                                HdlBluetoothLogic.Current.Dispone();
+                            }
                         });
                     });
                 }

--
Gitblit v1.8.0