合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs

@@ -12,8 +12,7 @@
        /// </summary>
        private FrameLayout bodyFrameLayout;


        public  Action action;
        public  Action<string> action;

        public CategorySceneSelectImgByLocal()
        {
@@ -95,8 +94,8 @@
                    EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
                    {
                        //CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
                        Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
                        action?.Invoke();
                        //Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
                        action?.Invoke(icon.UnSelectedImagePath);
                        action = null;
                        this.RemoveFromParent();