Release:V1.2.0

lisongkun · web-flow · commit ccf4c342057f · 2023-08-13T11:24:48.000+08:00
Release:V1.2.0
diff --git a/Domain/MainWindowViewModel.cs b/Domain/MainWindowViewModel.cs
@@ -6,6 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using hygge_imaotai.Entity;
 using hygge_imaotai.UserInterface.UserControl;
 using hygge_imaotai.UserInterface.UserControls;
 using MaterialDesignThemes.Wpf;
diff --git a/Domain/UserManageViewModel.cs b/Domain/UserManageViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Drawing.Printing;
 using System.Linq;
 using System.Windows.Input;
 using hygge_imaotai.Entity;
diff --git a/Entity/MenuItemEntity.cs b/Entity/MenuItemEntity.cs
@@ -1,10 +1,10 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using hygge_imaotai.Domain;
 using MaterialDesignThemes.Wpf;
 
-namespace hygge_imaotai.Domain
+namespace hygge_imaotai.Entity
 {
     public class DemoItem : ViewModelBase
     {
diff --git a/Repository/ShopRepository.cs b/Repository/ShopRepository.cs
@@ -159,8 +159,16 @@ private static List<ShopEntity> GetAllShopList()
             var response =
                 await
                     requestUrl
-                        .GetStringAsync();
-            var responseJObject = JObject.Parse(response);
+                        .AllowAnyHttpStatus()
+                        .GetAsync();
+            if (response.StatusCode == 404)
+            {
+                throw new Exception("本次抢购会话已过期,请手动刷新一下商品列表和店铺列表后重试");
+            }
+
+            var responseText = await response.GetStringAsync();
+
+            var responseJObject = JObject.Parse(responseText);
             if (responseJObject["code"].Value<int>() != 2000)
             {
                 Console.WriteLine($"查询所在省市的投放产品和数量error,{province}-{itemId}");
diff --git a/UserInterface/Dialogs/DirectAddAccountDialog/DirectAddAccountDialogUserControl.xaml b/UserInterface/Dialogs/DirectAddAccountDialog/DirectAddAccountDialogUserControl.xaml
@@ -81,12 +81,12 @@
                  Text="{Binding ShopType}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
         <TextBox Grid.Row="8"
-                 wpf:HintAssist.Hint="请输入纬度(eg:110.21)"
+                 wpf:HintAssist.Hint="请输入纬度(eg:36.62)"
                  FontSize="16"
                  Text="{Binding Lat}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
         <TextBox Grid.Row="9"
-                 wpf:HintAssist.Hint="请输入经度(eg:36.62)"
+                 wpf:HintAssist.Hint="请输入经度(eg:114.48)"
                  FontSize="16"
                  Text="{Binding Lng}"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
diff --git a/UserInterface/Dialogs/DirectAddAccountDialog/DirectAddAccountDialogUserControl.xaml.cs b/UserInterface/Dialogs/DirectAddAccountDialog/DirectAddAccountDialogUserControl.xaml.cs
@@ -1,11 +1,10 @@
-﻿using System;
-using System.Linq;
+﻿using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows;
 using hygge_imaotai.Domain;
 using hygge_imaotai.Entity;
 using hygge_imaotai.Repository;
-using MaterialDesignThemes.Wpf;
+using hygge_imaotai.UserInterface.UserControls;
 
 namespace hygge_imaotai.UserInterface.Dialogs.DirectAddAccountDialog
 {
@@ -71,6 +70,9 @@ private void LoginButton_OnClick(object sender, RoutedEventArgs e)
             }
 
             DB.Sqlite.Insert(_dataContext).ExecuteAffrows();
+
+            // 刷新用户列表
+            UserManageControl.RefreshData(UserManageControl.UserListViewModel);
         }
     }
 }
diff --git a/UserInterface/UserControls/ShopManageUserControl.xaml.cs b/UserInterface/UserControls/ShopManageUserControl.xaml.cs
@@ -1,5 +1,4 @@
 ﻿using System.IO;
-using System.Reflection.Metadata;
 using System.Threading;
 using System.Windows;
 using Flurl.Http;
diff --git a/UserInterface/UserControls/UserManageControl.xaml.cs b/UserInterface/UserControls/UserManageControl.xaml.cs
@@ -1,5 +1,4 @@
-﻿using System.Reflection.Metadata;
-using System.Windows;
+﻿using System.Windows;
 using hygge_imaotai.Domain;
 using hygge_imaotai.Entity;
 using hygge_imaotai.Repository;
@@ -11,16 +10,21 @@ namespace hygge_imaotai.UserInterface.UserControls
     /// </summary>
     public partial class UserManageControl
     {
+        #region Properties
+
+        public static UserManageViewModel UserListViewModel { get; } = new();
+
+        #endregion
         public UserManageControl()
         {
             InitializeComponent();
-            DataContext = new UserManageViewModel();
-            RefreshData();
+            DataContext = UserListViewModel;
+
+            RefreshData(UserListViewModel);
         }
 
-        private void RefreshData()
+        public static void RefreshData(UserManageViewModel userListViewModel)
         {
-            var userListViewModel = (UserManageViewModel)DataContext;
             UserManageViewModel.UserList.Clear();
 
             DB.Sqlite.Select<UserEntity>()
@@ -41,7 +45,7 @@ private void RefreshData()
 
         private void QueryButton_OnClick(object sender, RoutedEventArgs e)
         {
-            RefreshData();
+            RefreshData((UserManageViewModel)DataContext);
         }
 
         private void ResetButton_OnClick(object sender, RoutedEventArgs e)
@@ -52,5 +56,6 @@ private void ResetButton_OnClick(object sender, RoutedEventArgs e)
             userListViewModel.Province = "";
             userListViewModel.City = "";
         }
+
     }
 }
diff --git a/UserInterface/Window/MainWindow.xaml b/UserInterface/Window/MainWindow.xaml
@@ -6,6 +6,8 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
         xmlns:domain="clr-namespace:hygge_imaotai.Domain"
+        xmlns:entity="clr-namespace:hygge_imaotai.Entity"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
         Title="i茅台预约小助手"
         Width="1215"
         Height="800" 
@@ -21,6 +23,7 @@
         <CommandBinding Command="Copy" Executed="OnCopy" />
     </Window.CommandBindings>
 
+
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -126,7 +129,7 @@
                         <ListBox.Resources>
                             <Style TargetType="ScrollViewer" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
                             <Style TargetType="ScrollBar" BasedOn="{StaticResource MaterialDesignScrollBarMinimal}" />
-                            <DataTemplate DataType="{x:Type domain:DemoItem}">
+                            <DataTemplate DataType="{x:Type entity:DemoItem}">
                                 <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
                             </DataTemplate>
                         </ListBox.Resources>
@@ -145,6 +148,7 @@
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="*" />
                     <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
                 <materialDesign:ColorZone Padding="16"
                                   materialDesign:ElevationAssist.Elevation="Dp0"
@@ -310,7 +314,17 @@
                                    Height="36"
                                    Kind="Github" />
                 </Button>
+
+                <tb:TaskbarIcon Grid.Row="3"
+                    IconSource="/Resources/favicon.ico"
+                    PopupActivation="LeftClick"
+                    TrayLeftMouseUp="TaskbarIcon_OnTrayLeftMouseUp"
+                    ToolTipText="茅台预约器"/>
             </Grid>
+
+
         </materialDesign:DrawerHost>
+
+
     </materialDesign:DialogHost>
 </Window>
diff --git a/UserInterface/Window/MainWindow.xaml.cs b/UserInterface/Window/MainWindow.xaml.cs
@@ -10,13 +10,17 @@
 using hygge_imaotai.Domain;
 using MaterialDesignThemes.Wpf;
 
+
+
 namespace hygge_imaotai.UserInterface.Window
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
     public partial class MainWindow
     {
+
+
         public MainWindow()
         {
             InitializeComponent();
@@ -133,5 +137,9 @@ private async void MenuPopupButton_OnClick(object sender, RoutedEventArgs e)
         private void OnSelectedItemChanged(object sender, DependencyPropertyChangedEventArgs e)
             => MainScrollViewer.ScrollToHome();
 
+        private void TaskbarIcon_OnTrayLeftMouseUp(object sender, RoutedEventArgs e)
+        {
+            this.Visibility = this.Visibility == Visibility.Hidden ? Visibility.Visible : Visibility.Hidden;
+        }
     }
 }
diff --git a/hygge-imaotai.csproj b/hygge-imaotai.csproj
@@ -27,6 +27,15 @@
     <None Remove="Resources\ProfilePic.jpg" />
   </ItemGroup>
 
+  <ItemGroup>
+    <COMReference Include="{d37e2a3e-8545-3a39-9f4f-31827c9124ab}">
+      <WrapperTool>tlbimp</WrapperTool>
+      <VersionMinor>4</VersionMinor>
+      <VersionMajor>2</VersionMajor>
+      <Guid>d37e2a3e-8545-3a39-9f4f-31827c9124ab</Guid>
+    </COMReference>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="5.7.0">
       <PrivateAssets>all</PrivateAssets>
@@ -36,6 +45,7 @@
     <PackageReference Include="Flurl.Http" Version="3.2.4" />
     <PackageReference Include="FreeSql" Version="3.2.698" />
     <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.698" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <PackageReference Include="NLog" Version="5.2.2" />
     <PackageReference Include="Quartz" Version="3.6.3" />

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.Windows;`
`4`	`3`	`using System.Windows.Controls;`
	`4`	`+using hygge_imaotai.Domain;`
`5`	`5`	`using MaterialDesignThemes.Wpf;`
`6`	`6`
`7`		`-namespace hygge_imaotai.Domain`
	`7`	`+namespace hygge_imaotai.Entity`
`8`	`8`	`{`
`9`	`9`	`public class DemoItem : ViewModelBase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`		`-using System;`
`2`		`-using System.Linq;`
	`1`	`+using System.Linq;`
`3`	`2`	`using System.Text.RegularExpressions;`
`4`	`3`	`using System.Windows;`
`5`	`4`	`using hygge_imaotai.Domain;`
`6`	`5`	`using hygge_imaotai.Entity;`
`7`	`6`	`using hygge_imaotai.Repository;`
`8`		`-using MaterialDesignThemes.Wpf;`
	`7`	`+using hygge_imaotai.UserInterface.UserControls;`
`9`	`8`
`10`	`9`	`namespace hygge_imaotai.UserInterface.Dialogs.DirectAddAccountDialog`
`11`	`10`	`{`
`@@ -71,6 +70,9 @@ private void LoginButton_OnClick(object sender, RoutedEventArgs e)`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`DB.Sqlite.Insert(_dataContext).ExecuteAffrows();`
	`73`	`+`
	`74`	`+ // 刷新用户列表`
	`75`	`+ UserManageControl.RefreshData(UserManageControl.UserListViewModel);`
`74`	`76`	`}`
`75`	`77`	`}`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.IO;`
`2`		`-using System.Reflection.Metadata;`
`3`	`2`	`using System.Threading;`
`4`	`3`	`using System.Windows;`
`5`	`4`	`using Flurl.Http;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Reflection.Metadata;`
`2`		`-using System.Windows;`
	`1`	`+using System.Windows;`
`3`	`2`	`using hygge_imaotai.Domain;`
`4`	`3`	`using hygge_imaotai.Entity;`
`5`	`4`	`using hygge_imaotai.Repository;`
`@@ -11,16 +10,21 @@ namespace hygge_imaotai.UserInterface.UserControls`
`11`	`10`	`/// </summary>`
`12`	`11`	`public partial class UserManageControl`
`13`	`12`	`{`
	`13`	`+ #region Properties`
	`14`	`+`
	`15`	`+ public static UserManageViewModel UserListViewModel { get; } = new();`
	`16`	`+`
	`17`	`+ #endregion`
`14`	`18`	`public UserManageControl()`
`15`	`19`	`{`
`16`	`20`	`InitializeComponent();`
`17`		`- DataContext = new UserManageViewModel();`
`18`		`- RefreshData();`
	`21`	`+ DataContext = UserListViewModel;`
	`22`	`+`
	`23`	`+ RefreshData(UserListViewModel);`
`19`	`24`	`}`
`20`	`25`
`21`		`- private void RefreshData()`
	`26`	`+ public static void RefreshData(UserManageViewModel userListViewModel)`
`22`	`27`	`{`
`23`		`- var userListViewModel = (UserManageViewModel)DataContext;`
`24`	`28`	`UserManageViewModel.UserList.Clear();`
`25`	`29`
`26`	`30`	`DB.Sqlite.Select<UserEntity>()`
`@@ -41,7 +45,7 @@ private void RefreshData()`
`41`	`45`
`42`	`46`	`private void QueryButton_OnClick(object sender, RoutedEventArgs e)`
`43`	`47`	`{`
`44`		`- RefreshData();`
	`48`	`+ RefreshData((UserManageViewModel)DataContext);`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`private void ResetButton_OnClick(object sender, RoutedEventArgs e)`
`@@ -52,5 +56,6 @@ private void ResetButton_OnClick(object sender, RoutedEventArgs e)`
`52`	`56`	`userListViewModel.Province = "";`
`53`	`57`	`userListViewModel.City = "";`
`54`	`58`	`}`
	`59`	`+`
`55`	`60`	`}`
`56`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,17 @@`
`10`	`10`	`using hygge_imaotai.Domain;`
`11`	`11`	`using MaterialDesignThemes.Wpf;`
`12`	`12`
	`13`	`+`
	`14`	`+`
`13`	`15`	`namespace hygge_imaotai.UserInterface.Window`
`14`	`16`	`{`
`15`	`17`	`/// <summary>`
`16`	`18`	`/// Interaction logic for MainWindow.xaml`
`17`	`19`	`/// </summary>`
`18`	`20`	`public partial class MainWindow`
`19`	`21`	`{`
	`22`	`+`
	`23`	`+`
`20`	`24`	`public MainWindow()`
`21`	`25`	`{`
`22`	`26`	`InitializeComponent();`
`@@ -133,5 +137,9 @@ private async void MenuPopupButton_OnClick(object sender, RoutedEventArgs e)`
`133`	`137`	`private void OnSelectedItemChanged(object sender, DependencyPropertyChangedEventArgs e)`
`134`	`138`	`=> MainScrollViewer.ScrollToHome();`
`135`	`139`
	`140`	`+ private void TaskbarIcon_OnTrayLeftMouseUp(object sender, RoutedEventArgs e)`
	`141`	`+ {`
	`142`	`+ this.Visibility = this.Visibility == Visibility.Hidden ? Visibility.Visible : Visibility.Hidden;`
	`143`	`+ }`
`136`	`144`	`}`
`137`	`145`	`}`