From 18d4b849131c1d44b0a8dc1abee4a57207d1c497 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 11 十一月 2019 17:23:59 +0800
Subject: [PATCH] 2019-11-11-1

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs |   51 ++++++++++-----------------------------------------
 1 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
old mode 100755
new mode 100644
index 7cd78f3..434417d
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -513,13 +513,7 @@
             }
 
             //缂栬緫
-            var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
-            btnEditor.BackgroundColor = 0xff4a4a4a;
-            btnEditor.TextSize = 12;
-            btnEditor.TextColor = UserCenterColor.Current.White;
-            btnEditor.TextAlignment = TextAlignment.Center;
-            btnEditor.TextID = R.MyInternationalizationString.uEditor;
-            frameRow.AddRightView(btnEditor);
+            var btnEditor = frameRow.AddEditorControl();
             btnEditor.ButtonClickEvent += (sender, e) =>
             {
                 var form = new EditorRoomInforForm();
@@ -531,13 +525,7 @@
             };
 
             //鍒犻櫎
-            var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
-            btnDelete.BackgroundColor = 0xfff75858;
-            btnDelete.TextSize = 12;
-            btnDelete.TextColor = UserCenterColor.Current.White;
-            btnDelete.TextAlignment = TextAlignment.Center;
-            btnDelete.TextID = R.MyInternationalizationString.uDelete;
-            frameRow.AddRightView(btnDelete);
+            var btnDelete = frameRow.AddDeleteControl();
             btnDelete.ButtonClickEvent += (sender, e) =>
             {
                 //纭鍒犻櫎鎴块棿?
@@ -569,10 +557,10 @@
 
         #endregion
 
-        #region 鈻� 鍒犻櫎妤煎眰___________________________
+        #region 鈻� 鍒犻櫎浣忓畢___________________________
 
         /// <summary>
-        /// 鍒犻櫎妤煎眰
+        /// 鍒犻櫎浣忓畢
         /// </summary>
         public async void DeleteResidence()
         {
@@ -635,7 +623,7 @@
 
         #endregion
 
-        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+        #region 鈻� 涓�鑸柟娉昣__________________________
 
         /// <summary>
         /// 妫�娴婣pp鐨勪綇瀹呮ā寮� 0:杩樻病鏈夎缃湁妯″紡 1:妤煎眰妯″紡 2:娌℃湁妤煎眰妯″紡
@@ -683,31 +671,12 @@
                     return false;
                 }
             }
+            return true;
+        }
 
-            HdlThreadLogic.Current.RunThread(async () =>
-            {
-                //鍥犱负鍒犻櫎鐨勬槸褰撳墠鐨勪綇瀹�,鎵�浠ラ渶瑕佸厛鍒囨崲鍒板埆鐨勪綇瀹�
-                string deleteId = Common.Config.Instance.Home.Id;
-                string deleteFile = Common.Config.Instance.Home.FileName;
-                int index = 0;
-                for (; index < Common.Config.Instance.HomeFilePathList.Count; index++)
-                {
-                    if (Common.Config.Instance.HomeFilePathList[index] == deleteFile)
-                    {
-                        //褰撳墠浣忓畢鎵�澶勭殑浣嶇疆(浣忓畢鏁拌偗瀹氬ぇ浜�1,涓嶇劧涓嶄細鍑虹幇鍒犻櫎鎸夐挳)
-                        if (index == 0)
-                        {
-                            //鍙栦笅涓�浣�
-                            index++;
-                        }
-                        else
-                        {
-                            //鍙栧墠涓�浣�
-                            index--;
-                        }
-                        break;
-                    }
-                }
+        #endregion
+
+        #region 鈻� 缁撴瀯浣揰____________________________
 
         /// <summary>
         ///  鍒犻櫎浣忓畢鐨勫惎鍔ㄥ弬鏁�

--
Gitblit v1.8.0