From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码,安卓和 IOS 都测试通过了

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs |   58 ++++++++++++----------------------------------------------
 1 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index d7d27e5..7d156a6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -177,6 +177,11 @@
             var btnGoBack = new BottomClickButton(688);
             btnGoBack.Y = Application.GetRealHeight(1495);
             btnGoBack.TextID = R.MyInternationalizationString.uGobackGatewayManage;
+            if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+            {
+                //杩斿洖涓婚〉
+                btnGoBack.TextID = R.MyInternationalizationString.uGobackToHomePage;
+            }
             bodyFrameLayout.AddChidren(btnGoBack);
             btnGoBack.ButtonClickEvent += (sender, e) =>
             {
@@ -289,7 +294,7 @@
                     {
                         if (this.Parent != null)
                         {
-                            var form = new WiredGatewayListForm();
+                            var form = new GatewayManage.GatewaySearchListForm();
                             this.AddFromAndRemoveNowForm(form, listZbGateway, dicZbGatewayDiv);
                         }
                     });
@@ -309,8 +314,7 @@
             List<string> listId = new List<string>();
             for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
             {
-                string strip = HdlGatewayLogic.Current.GetGatewayBaseInfoAttribute(ZbGateway.GateWayList[i], "IpAddress").ToString();
-                if (strip == string.Empty)
+                if (ZbGateway.GateWayList[i].getGatewayBaseInfo.IpAddress == string.Empty)
                 {
                     //IP娌℃湁鐨勭綉鍏筹紝鎴戜篃涓嶇煡閬撳畠鏄共鍢涚殑
                     continue;
@@ -342,8 +346,6 @@
                 {
                     continue;
                 }
-                //鏀堕泦缃戝叧瀵硅薄
-                this.listZbGateway.Add(way);
 
                 //缃戝叧缁戝畾妯″紡
                 GatewayBindMode mode = GatewayBindMode.BindAgain;
@@ -351,7 +353,7 @@
                 if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true
                     || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
                 {
-                    if (way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
+                    if (way.getGatewayBaseInfo.HomeId != Common.Config.Instance.HomeId)
                     {
                         //绗竴娆$粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
                         mode = GatewayBindMode.First;
@@ -364,12 +366,14 @@
 
                     //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
                     ShowErrorMode showMode = this.dicIdCheckCount[listId[i]] == 0 ? ShowErrorMode.YES : ShowErrorMode.NO;
-                    var result = await this.DoSaveGateway(way, showMode);
+                    var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
                     if (result == false)
                     {
                         continue;
                     }
                 }
+                //鏀堕泦缃戝叧瀵硅薄
+                this.listZbGateway.Add(way);
 
                 //濡傛灉瀹冨凡缁忓畬鍏ㄦ垚鍔熶簡鐨勮瘽锛屽垯灏嗗畠鐨勫墿浣欐鏁扮疆闆�
                 this.dicIdCheckCount[listId[i]] = 0;
@@ -403,44 +407,6 @@
 
         #endregion
 
-        #region 鈻� 鎵ц缃戝叧淇濆瓨_______________________
-
-        /// <summary>
-        /// 鎵ц缃戝叧淇濆瓨
-        /// </summary>
-        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
-        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
-        /// <returns></returns>
-        private async Task<bool> DoSaveGateway(ZbGateway zbGateway, ShowErrorMode mode)
-        {
-            //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�
-            //1:姝e父  -1:寮傚父  0:褰撳墠鐨勭綉鍏崇粦瀹氬湪浜嗗綋鍓嶈处鍙蜂笅鐨勪笉鍚屼綇瀹呴噷闈�
-            int result = await HdlGatewayLogic.Current.AddNewGateway(zbGateway, mode);
-            if (result == -1)
-            {
-                return false;
-            }
-
-            //鍓嶇殑缃戝叧缁戝畾鍦ㄤ簡褰撳墠璐﹀彿涓嬬殑涓嶅悓浣忓畢閲岄潰
-            if (result == 0)
-            {
-                if (mode == ShowErrorMode.YES)
-                {
-                    //缃戝叧缁戝畾鍦ㄥ綋鍓嶈处鍙蜂笅鐨勫叾浠栦綇瀹呴噷\r\n璇疯В闄ょ粦瀹氬悗鍐嶈瘯
-                    string msg = Language.StringByID(R.MyInternationalizationString.uTheGatewayInOtherResidenceMsg);
-                    if (msg.Contains("{0}") == true)
-                    {
-                        msg = string.Format(msg, "\r\n");
-                    }
-                    this.ShowMassage(ShowMsgType.Tip, msg);
-                }
-                return false;
-            }
-            return true;
-        }
-
-        #endregion
-
         #region 鈻� 鐣岄潰鍏抽棴___________________________
 
         /// <summary>
@@ -466,7 +432,7 @@
                     way.DisConnect("Search");
                 }
             }
-            if (UserCenterResourse.listActionFormId.Contains("GatewayManagementForm") == false)
+            if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
             {
                 //鍒锋柊涓婚〉
                 UserView.UserPage.Instance.Fresh();

--
Gitblit v1.8.0