Merge branch 'eesast:dev' into dev

hhzzff · Apr 20, 2024 · d79d608 · d79d608
2 parents 1d71444 + e858be3
commit d79d608
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 511 deletions.
diff --git a/CAPI/python/requirements.txt b/CAPI/python/requirements.txt
@@ -1,3 +1,3 @@
-grpcio==1.62.1
+grpcio==1.62.2
 grpcio-tools==1.54.2
 numpy
diff --git a/CAPI/python_exp/requirements.txt b/CAPI/python_exp/requirements.txt
@@ -1,3 +1,3 @@
-grpcio==1.54.2
+grpcio==1.62.2
 grpcio-tools==1.54.2
 numpy
diff --git a/installer/Data/ConfigFileData.cs b/installer/Data/ConfigFileData.cs
@@ -1,16 +1,30 @@
-using installer.ViewModel;
+//using installer.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace installer.Data
 {
+    public abstract class NotificationObject : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler? PropertyChanged;
+        ///<summary>
+        ///announce notification
+        ///</summary>
+        ///<param name="propertyName">property name</param>
+        public virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
     public enum LanguageOption
     {
         cpp = 0, python = 1

diff --git a/logic/Client/Client.csproj b/logic/Client/Client.csproj
@@ -61,6 +61,11 @@
 	  <None Remove="View\uhlobqco.ueo~" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Include="..\..\installer\Data\ConfigFileData.cs" Link="Interact\ConfigFileData.cs" />
+	  <Compile Include="..\..\installer\Model\Logger.cs" Link="Interact\Logger.cs" />
+	</ItemGroup>
+
 
 	<ItemGroup>
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
@@ -76,12 +81,12 @@
 
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="SkiaSharp" Version="2.88.7" />
+		<PackageReference Include="SkiaSharp" Version="2.88.8" />
 
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 
-		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
-		<PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.7" />
+		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
+		<PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.8" />
 
 	</ItemGroup>