Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs

@@ -5,7 +5,7 @@
namespace Shared.Phone.UserCenter

{

    /// <summary>

    /// 做成一个简单场景选择的行控件

    /// 做成一个简单场景选择的行控件(它会自动设置选择状态)

    /// </summary>

    public class SceneSimpleSelectControl : FrameRowControl

    {

@@ -20,7 +20,7 @@
        /// </summary>

        public Common.SceneUI Scene

        {

            get { return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId); }

            get { return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId); }

        }

        /// <summary>

        /// 选择控件

@@ -62,10 +62,10 @@
        #region ■ 初始化_____________________________



        /// <summary>

        /// 做成一个简单场景选择的行控件

        /// 做成一个简单场景选择的行控件(它会自动设置选择状态)

        /// </summary>

        /// <param name="i_Scene">场景对象</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public SceneSimpleSelectControl(Common.SceneUI i_Scene, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

            this.SceneId = i_Scene.Id;

@@ -84,23 +84,14 @@


            //图标

            var btnIcon = this.AddLeftIcon();

            btnIcon.UnSelectedImagePath = "Item/Scene.png";

            btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";



            //场景

            var btnScene = this.AddLeftCaption(SceneTemp.Name, 850, 60);

            btnScene.TextSize = 15;

            //这个坐标有点特殊

            btnScene.Y = Application.GetRealHeight(12) + this.chidrenYaxis;

            this.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);

            this.AddTopView(SceneTemp.Name, 850);



            //房间

            string roomName = Common.Room.CurrentRoom.GetRoomNameBySceneId(SceneId);

            var btnRoom = this.AddLeftCaption(roomName, 850, 50, true);

            //这个坐标有点特殊

            btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            btnRoom.TextSize = 12;

            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            this.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);

            string roomName = HdlRoomLogic.Current.GetRoomNameBySceneId(SceneId);

            this.AddBottomView(roomName, 850);



            btnSelect = this.AddMostRightEmptyIcon(58, 58);

            btnSelect.Visible = false;