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/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 21 ++++++++++++++++++++- 1 files changed, 20 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..101b40e 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs @@ -214,6 +214,7 @@ public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height) { var btnContr = new MostRightIconControl(i_width, i_height); + btnContr.UseClickStatu = false; this.AddChidren(btnContr, ChidrenBindMode.NotBind); btnContr.InitControl(); //澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞� @@ -226,7 +227,7 @@ this.rightIconSize = Application.GetMinRealAverage(i_width); if (chidrenYaxis != 0) { - btnContr.Y += chidrenYaxis; + btnContr.btnIcon.Y += chidrenYaxis; } return btnContr; @@ -234,6 +235,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