Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -84,7 +84,7 @@


            //图标

            var btnIcon = this.AddLeftIcon();

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

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



            //场景

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

@@ -104,7 +104,7 @@


            btnSelect = this.AddMostRightEmptyIcon(58, 58);

            btnSelect.Visible = false;

            btnSelect.UnSelectedImagePath = "Item/Tick.png";

            btnSelect.UnSelectedImagePath = "Item/ItemSelected.png";

        }



        #endregion