feat(task-0004): add ViewModel layer and improve UIView initialization safety
- Create SplashUIViewModel, MenuUIViewModel and LoadingUIViewModel classes implementing IUIViewModel - Convert UI views to use generic UIView<TVm> pattern for strong typing - Bind ViewModels in state EnterAsync methods before view initialization - Add null check validation in UIView.Bind method with ArgumentNullException - Track initialization state with _isInitialized flag to prevent duplicate Initialize/Release calls Выполнена задача TASK-0004 и добавлен слой ViewModel: - Созданы классы SplashUIViewModel, MenuUIViewModel и LoadingUIViewModel с реализацией IUIViewModel - Преобразованы UI представления для использования общего паттерна UIView<TVm> - Добавлено связывание ViewModels в методах EnterAsync состояний перед инициализацией вида - Добавлена проверка на null в методе Bind с выбросом ArgumentNullException - Добавлен флаг _isInitialized для предотвращения повторных вызовов Initialize/Release
This commit is contained in:
@@ -16,6 +16,7 @@ namespace QuizPleaseTest.Boot.States
|
|||||||
|
|
||||||
public UniTask EnterAsync(CancellationToken ct)
|
public UniTask EnterAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
_view.Bind(new LoadingUIViewModel());
|
||||||
_view.Initialize();
|
_view.Initialize();
|
||||||
return UniTask.CompletedTask;
|
return UniTask.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ namespace QuizPleaseTest.Boot.States
|
|||||||
|
|
||||||
public async UniTask EnterAsync(CancellationToken ct)
|
public async UniTask EnterAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
_view.Bind(new MenuUIViewModel());
|
||||||
_view.Initialize();
|
_view.Initialize();
|
||||||
await _restartSignal.WaitAsync(ct);
|
await _restartSignal.WaitAsync(ct);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace QuizPleaseTest.Boot.States
|
|||||||
|
|
||||||
public UniTask EnterAsync(CancellationToken ct)
|
public UniTask EnterAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
_view.Bind(new SplashUIViewModel());
|
||||||
_view.Initialize();
|
_view.Initialize();
|
||||||
return UniTask.CompletedTask;
|
return UniTask.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ using QuizPleaseTest.Common.UI;
|
|||||||
|
|
||||||
namespace QuizPleaseTest.Boot.UI
|
namespace QuizPleaseTest.Boot.UI
|
||||||
{
|
{
|
||||||
public class LoadingUIView : UIView
|
public class LoadingUIView : UIView<LoadingUIViewModel>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
using QuizPleaseTest.Common.UI;
|
||||||
|
|
||||||
|
namespace QuizPleaseTest.Boot.UI
|
||||||
|
{
|
||||||
|
public class LoadingUIViewModel : IUIViewModel
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a5555555555555555555555555555555
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -2,7 +2,7 @@ using QuizPleaseTest.Common.UI;
|
|||||||
|
|
||||||
namespace QuizPleaseTest.Boot.UI
|
namespace QuizPleaseTest.Boot.UI
|
||||||
{
|
{
|
||||||
public class MenuUIView : UIView
|
public class MenuUIView : UIView<MenuUIViewModel>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
using QuizPleaseTest.Common.UI;
|
||||||
|
|
||||||
|
namespace QuizPleaseTest.Boot.UI
|
||||||
|
{
|
||||||
|
public class MenuUIViewModel : IUIViewModel
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a6666666666666666666666666666666
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -2,7 +2,7 @@ using QuizPleaseTest.Common.UI;
|
|||||||
|
|
||||||
namespace QuizPleaseTest.Boot.UI
|
namespace QuizPleaseTest.Boot.UI
|
||||||
{
|
{
|
||||||
public class SplashUIView : UIView
|
public class SplashUIView : UIView<SplashUIViewModel>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
using QuizPleaseTest.Common.UI;
|
||||||
|
|
||||||
|
namespace QuizPleaseTest.Boot.UI
|
||||||
|
{
|
||||||
|
public class SplashUIViewModel : IUIViewModel
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a4444444444444444444444444444444
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
namespace QuizPleaseTest.Common.UI
|
namespace QuizPleaseTest.Common.UI
|
||||||
{
|
{
|
||||||
public class UIView<TVm> : UIView where TVm : IUIViewModel
|
public class UIView<TVm> : UIView where TVm : IUIViewModel
|
||||||
@@ -6,6 +8,11 @@ namespace QuizPleaseTest.Common.UI
|
|||||||
|
|
||||||
public virtual void Bind(TVm viewModel)
|
public virtual void Bind(TVm viewModel)
|
||||||
{
|
{
|
||||||
|
if (viewModel == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(viewModel));
|
||||||
|
}
|
||||||
|
|
||||||
ViewModel = viewModel;
|
ViewModel = viewModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,27 @@ namespace QuizPleaseTest.Common.UI
|
|||||||
{
|
{
|
||||||
public class UIView : MonoBehaviour
|
public class UIView : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
private bool _isInitialized;
|
||||||
|
|
||||||
public virtual void Initialize()
|
public virtual void Initialize()
|
||||||
{
|
{
|
||||||
|
if (_isInitialized)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_isInitialized = true;
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void Release()
|
public virtual void Release()
|
||||||
{
|
{
|
||||||
|
if (!_isInitialized)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_isInitialized = false;
|
||||||
gameObject.SetActive(false);
|
gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user