From aad65b63c6ff4ff7abc133e9c2099a20487798be Mon Sep 17 00:00:00 2001 From: zhuce <821293938@qq.com> Date: Fri, 29 Dec 2023 17:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.xaml | 2 ++ App.xaml.cs | 8 ++++-- Converters/BoolNegationConverter.cs | 21 ++++++++++++++++ MauiProgram.cs | 3 ++- Resources/Images/order_receiving_end.png | Bin 0 -> 5191 bytes Resources/Images/order_receiving_start.png | Bin 0 -> 4911 bytes ViewModels/HomeViewModel.cs | 15 +++++++++++ ViewModels/LoginViewModel.cs | 19 +++++++++++--- Views/HomeView.xaml | 28 +++++++++++++++++++++ Views/HomeView.xaml.cs | 19 ++++++++++++++ 10 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 Converters/BoolNegationConverter.cs create mode 100644 Resources/Images/order_receiving_end.png create mode 100644 Resources/Images/order_receiving_start.png create mode 100644 ViewModels/HomeViewModel.cs create mode 100644 Views/HomeView.xaml create mode 100644 Views/HomeView.xaml.cs diff --git a/App.xaml b/App.xaml index 30adc2c..ccdc506 100644 --- a/App.xaml +++ b/App.xaml @@ -2,6 +2,7 @@ @@ -9,6 +10,7 @@ + diff --git a/App.xaml.cs b/App.xaml.cs index 8c7be9e..2b0f2d1 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -1,4 +1,6 @@ -namespace autosos_maui; +using autosos_maui.Views; + +namespace autosos_maui; public partial class App : Application { @@ -7,5 +9,7 @@ public partial class App : Application InitializeComponent(); MainPage = new AppShell(); + + Routing.RegisterRoute("HomeView",typeof(HomeView)); } -} \ No newline at end of file +} diff --git a/Converters/BoolNegationConverter.cs b/Converters/BoolNegationConverter.cs new file mode 100644 index 0000000..e9758ca --- /dev/null +++ b/Converters/BoolNegationConverter.cs @@ -0,0 +1,21 @@ +using System.Globalization; + +namespace autosos_maui.Converters; + +public class BoolNegationConverter: IValueConverter +{ + public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) + { + if (value is bool boolValue) + { + return !boolValue; // 返回布尔值的相反值 + } + + return value; // 返回原始值（或者你可以返回默认的可见性） + } + + public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/MauiProgram.cs b/MauiProgram.cs index ce1540f..94e0ba6 100644 --- a/MauiProgram.cs +++ b/MauiProgram.cs @@ -32,6 +32,7 @@ public static class MauiProgram public static MauiAppBuilder RegisterViews(this MauiAppBuilder mauiAppBuilder) { mauiAppBuilder.Services.AddTransient(); + mauiAppBuilder.Services.AddTransient(); return mauiAppBuilder; } @@ -39,7 +40,7 @@ public static class MauiProgram public static MauiAppBuilder RegisterViewModels(this MauiAppBuilder mauiAppBuilder) { mauiAppBuilder.Services.AddSingleton(); - + mauiAppBuilder.Services.AddSingleton(); return mauiAppBuilder; } diff --git a/Resources/Images/order_receiving_end.png b/Resources/Images/order_receiving_end.png new file mode 100644 index 0000000000000000000000000000000000000000..507636c5a808065053305328d325b5605fcc9035 GIT binary patch literal 5191 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 literal 0 HcmV?d00001 diff --git a/ViewModels/HomeViewModel.cs b/ViewModels/HomeViewModel.cs new file mode 100644 index 0000000..2936c0b --- /dev/null +++ b/ViewModels/HomeViewModel.cs @@ -0,0 +1,15 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace autosos_maui.ViewModels; + +public partial class HomeViewModel: ObservableObject +{ + private bool _isToggled = false; + + public bool IsToggled + { + get => _isToggled; + set => SetProperty(ref _isToggled, value); + } + +} \ No newline at end of file diff --git a/ViewModels/LoginViewModel.cs b/ViewModels/LoginViewModel.cs index 33ae16a..118d6c6 100644 --- a/ViewModels/LoginViewModel.cs +++ b/ViewModels/LoginViewModel.cs @@ -6,13 +6,26 @@ namespace autosos_maui.ViewModels; public partial class LoginViewModel : ObservableObject { - [ObservableProperty] private string _userName = ""; - [ObservableProperty] private string _password = ""; + private string _userName = ""; + private string _password = ""; + + public string UserName + { + get => _userName; + set => SetProperty(ref _userName, value); + } + + public string Password + { + get => _password; + set => SetProperty(ref _password, value); + } [RelayCommand] public void Login() { Debug.WriteLine("login"); - Debug.WriteLine("username:{0},password:{1}",_userName,_password); + Debug.WriteLine("username:{0},password:{1}", UserName, Password); + Shell.Current.GoToAsync("HomeView"); } } \ No newline at end of file diff --git a/Views/HomeView.xaml b/Views/HomeView.xaml new file mode 100644 index 0000000..8c11e32 --- /dev/null +++ b/Views/HomeView.xaml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Views/HomeView.xaml.cs b/Views/HomeView.xaml.cs new file mode 100644 index 0000000..189bfb1 --- /dev/null +++ b/Views/HomeView.xaml.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using autosos_maui.ViewModels; + +namespace autosos_maui.Views; + +public partial class HomeView : ContentPage +{ + private readonly HomeViewModel _homeViewModel; + + public HomeView(HomeViewModel homeViewModel) + { + BindingContext = _homeViewModel = homeViewModel; + InitializeComponent(); + } +} \ No newline at end of file