From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index fe8e625..a9ac393 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -226,7 +226,7 @@
             this.rightIconSize = Application.GetMinRealAverage(i_width);
             if (chidrenYaxis != 0)
             {
-                btnContr.Y += chidrenYaxis;
+                btnContr.btnIcon.Y += chidrenYaxis;
             }
 
             return btnContr;
@@ -234,6 +234,24 @@
 
         #endregion
 
+        #region 鈻� 娣诲姞鍙宠竟鐨勫紑鍏冲浘鏍嘷________________
+
+        /// <summary>
+        /// 娣诲姞鍙宠竟鐨勫紑鍏冲浘鏍�
+        /// </summary>
+        /// <returns></returns>
+        public MostRightIconControl AddMostRightSwitchIcon()
+        {
+            var btnSwitch = this.AddMostRightEmptyIcon(104, 63);
+            this.ChangedChidrenBindMode(btnSwitch, ChidrenBindMode.NotBind);
+            btnSwitch.UnSelectedImagePath = "Item/Switch2.png";
+            btnSwitch.SelectedImagePath = "Item/Switch2Selected.png";
+
+            return btnSwitch;
+        }
+
+        #endregion
+
         #region 鈻� 娣诲姞鏈�鍙崇殑鏄剧ず鏂囨湰_________________
 
         /// <summary>

--
Gitblit v1.8.0