add: 再套一个view，方便以后移植安卓端不会出bug

chenxuuu · Feb 1, 2025 · 235d34c · 235d34c
1 parent ed27390
commit 235d34c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 15 deletions.
diff --git a/llcomNext/LLCOM/ViewModels/MainViewModel.cs b/llcomNext/LLCOM/ViewModels/MainViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LLCOM.ViewModels;
+
+public partial class MainViewModel : ViewModelBase
+{
+
+}
diff --git a/llcomNext/LLCOM/ViewModels/MainWindowViewModel.cs b/llcomNext/LLCOM/ViewModels/MainWindowViewModel.cs
@@ -6,12 +6,6 @@ namespace LLCOM.ViewModels
 
     public partial class MainWindowViewModel : ViewModelBase
     {
-        /// <summary>
-        /// 标题栏
-        /// </summary>
-        [ObservableProperty]
-        public string _title = "LLCOM";
-
         public MainWindowViewModel()
         {
 

diff --git a/llcomNext/LLCOM/Views/MainView.axaml b/llcomNext/LLCOM/Views/MainView.axaml
@@ -0,0 +1,18 @@
+<UserControl
+    x:Class="LLCOM.Views.MainView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:LLCOM.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:DataType="vm:MainViewModel"
+    mc:Ignorable="d">
+    <Grid>
+        <TextBlock
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Text="Welcome to Avalonia!" />
+    </Grid>
+</UserControl>
diff --git a/llcomNext/LLCOM/Views/MainView.axaml.cs b/llcomNext/LLCOM/Views/MainView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace LLCOM.Views;
+
+public partial class MainView : UserControl
+{
+    public MainView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/llcomNext/LLCOM/Views/MainWindow.axaml b/llcomNext/LLCOM/Views/MainWindow.axaml
@@ -4,18 +4,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:views="clr-namespace:LLCOM.Views"
     xmlns:vm="using:LLCOM.ViewModels"
-    Title="{Binding Title}"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
+    Title="LLCOM Next"
+	Height="800"
+	Width="1200"
     x:DataType="vm:MainWindowViewModel"
     Icon="/Assets/llcom-logo.ico"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-
-    <Design.DataContext>
-        <vm:MainWindowViewModel />
-    </Design.DataContext>
-
-
+    <!--  这里别写别的ui控件，不然跨平台会出问题  -->
+    <views:MainView />
 </Window>