From c1ae6088d615c6c1b42daf87428ea106969d77d4 Mon Sep 17 00:00:00 2001 From: zhouleonlei Date: Mon, 16 Aug 2021 14:27:31 +0800 Subject: [PATCH] [NUI] Fix svace defects --- src/Tizen.NUI.Components/Controls/Menu.cs | 2 +- src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs | 2 +- src/Tizen.NUI/src/internal/EXaml/Action/GetObjectByPropertyAction.cs | 4 ++-- src/Tizen.NUI/src/internal/EXaml/Operation/SetBinding.cs | 5 ++++- src/Tizen.NUI/src/internal/XamlBinding/WeakEventManager.cs | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Tizen.NUI.Components/Controls/Menu.cs b/src/Tizen.NUI.Components/Controls/Menu.cs index 323ef32..beeab4f 100755 --- a/src/Tizen.NUI.Components/Controls/Menu.cs +++ b/src/Tizen.NUI.Components/Controls/Menu.cs @@ -474,7 +474,7 @@ namespace Tizen.NUI.Components while (parent) { root = parent; - parent = parent.GetParent() as View; + parent = parent?.GetParent() as View; } return root; diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs index 89a36eb..e4d7f6d 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs @@ -971,7 +971,7 @@ namespace Tizen.NUI.Components if (item == null) return; if (item == Header) { - item.Hide(); + item?.Hide(); return; } if (item == Footer) diff --git a/src/Tizen.NUI/src/internal/EXaml/Action/GetObjectByPropertyAction.cs b/src/Tizen.NUI/src/internal/EXaml/Action/GetObjectByPropertyAction.cs index cd82b34..bd2343d 100755 --- a/src/Tizen.NUI/src/internal/EXaml/Action/GetObjectByPropertyAction.cs +++ b/src/Tizen.NUI/src/internal/EXaml/Action/GetObjectByPropertyAction.cs @@ -61,9 +61,9 @@ namespace Tizen.NUI.EXaml public void OnActive() { - if (null != childOp) + if (null != childOp && childOp.ValueList[0] is Instance valueList0) { - int instanceIndex = (childOp.ValueList[0] as Instance).Index; + int instanceIndex = valueList0.Index; string propertyName = childOp.ValueList[1] as string; globalDataList.Operations.Add(new GetObjectByProperty(globalDataList, instanceIndex, propertyName)); } diff --git a/src/Tizen.NUI/src/internal/EXaml/Operation/SetBinding.cs b/src/Tizen.NUI/src/internal/EXaml/Operation/SetBinding.cs index ea45641..246e64d 100755 --- a/src/Tizen.NUI/src/internal/EXaml/Operation/SetBinding.cs +++ b/src/Tizen.NUI/src/internal/EXaml/Operation/SetBinding.cs @@ -41,7 +41,10 @@ namespace Tizen.NUI.EXaml BindableObject bindableObject = globalDataList.GatheredInstances[instanceIndex] as BindableObject; var property = globalDataList.GatheredBindableProperties[bindablePropertyIndex]; var value = globalDataList.GatheredInstances[valueIndex] as BindingBase; - bindableObject?.SetBinding(property, value); + if (value != null) + { + bindableObject?.SetBinding(property, value); + } } private int instanceIndex; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/WeakEventManager.cs b/src/Tizen.NUI/src/internal/XamlBinding/WeakEventManager.cs index 802e1d4..128a35d 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/WeakEventManager.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/WeakEventManager.cs @@ -95,7 +95,7 @@ namespace Tizen.NUI.Binding foreach (Tuple tuple in toRaise) { - tuple.Item2.Invoke(tuple.Item1, new[] { sender, args }); + tuple.Item2?.Invoke(tuple.Item1, new[] { sender, args }); } } -- 2.7.4