From b129359c5a0df75f63d9131e5e41d3060ac38cc3 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期一, 30 十二月 2019 14:14:06 +0800 Subject: [PATCH] 2019.12.30 --- ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs index 7748134..ee43ad7 100644 --- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs +++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs @@ -23,7 +23,7 @@ /// <summary> /// sceneImg /// </summary> - private Button sceneImg; + private ImageView sceneImg; /// <summary> /// SceneCategoryView @@ -60,21 +60,21 @@ { Y = Application.GetRealHeight(46), Height = Application.GetRealHeight(446 - 46), - LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor + LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor, + Tag= scene }; AddChidren(sceneRowLayout); - sceneImg = new Button() + sceneImg = new ImageView() { X = Application.GetRealWidth(179), Width = Application.GetRealWidth(844), Height = Application.GetRealHeight(400), - UnSelectedImagePath = scene.IconPathType == 0 ? scene.IconPath : System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath), + ImagePath = scene.IconPathType == 0 ? scene.IconPath : System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath), Radius = (uint)Application.GetRealHeight(17) }; sceneRowLayout.AddChidren(sceneImg); - - sceneImg.SetViewShadow(true); + //sceneImg.SetViewShadow(true); var leftFL = new FrameLayout { @@ -193,6 +193,7 @@ { sceneRowLayout.AddRightView(settingBtn); sceneRowLayout.AddRightView(deleteBtn); + } } @@ -202,12 +203,12 @@ if (room.IsLove) { Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene); - RemoveViewByTag((sender as Button).Tag); + RemoveFromParent(); } else { var tip = new CustomAlert { }; - AddChidren(tip); + Common.CommonPage.Instance.AddChidren(tip); tip.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete)); tip.ResultEventHandler += async (e1) => @@ -226,7 +227,7 @@ { room.RemoveScene(scene); //RefreshBodyView(); - RemoveViewByTag((sender as Button).Tag); + RemoveFromParent(); } //0 绉婚櫎澶辫触 else if (removeSceneAllData.removeSceneData.Result == 0) @@ -239,7 +240,7 @@ { room.RemoveScene(scene); //RefreshBodyView(); - RemoveViewByTag((sender as Button).Tag); + RemoveFromParent(); CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneIsNull); return; } -- Gitblit v1.8.0