diff --git a/BBWYB.Client/App.xaml.cs b/BBWYB.Client/App.xaml.cs index 9b29706..669ad01 100644 --- a/BBWYB.Client/App.xaml.cs +++ b/BBWYB.Client/App.xaml.cs @@ -32,7 +32,7 @@ namespace BBWYB.Client #if DEBUG //齐越山鸡 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY"; //拳探店铺 陈默 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDM4Mjc0NzI1ODQ3MDQsMTYyMDM0NDAzMzczNTg3MjUxMiwxNjIwMzQ0MDkyODI5NDIxNTY4LDE2MjAzNDQxNDA4NTAwMDgwNjQiLCJleHAiOjE3MjA3NjQzMjV9.Q8fiKXCHgvzbm7NDEre-MeoSju_AmC6Ae6eDY22rUAw"; diff --git a/BBWYB.Client/BBWYB.Client.csproj b/BBWYB.Client/BBWYB.Client.csproj index 91a07a9..5fca9cb 100644 --- a/BBWYB.Client/BBWYB.Client.csproj +++ b/BBWYB.Client/BBWYB.Client.csproj @@ -53,17 +53,4 @@ - - - Code - - - - - - $(DefaultXamlRuntime) - Designer - - - diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 1471516..c3db6ad 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -2,7 +2,6 @@ using BBWYB.Client.Helpers; using BBWYB.Client.Models; using BBWYB.Client.Views.PackPurchaseTaska; -using BBWYB.Client.Views.WebB; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; @@ -119,7 +118,6 @@ namespace BBWYB.Client UpdatePurchaseTaskWindow packTask = new(res.Data, originShopName, orderSku); if (!packTask.IsClosed) packTask.Show(); - WeakReferenceMessenger.Default.Send(new Message_WebB_RefreshPack(null)); // } #endregion diff --git a/BBWYB.Client/ViewModels/MainViewModel.cs b/BBWYB.Client/ViewModels/MainViewModel.cs index 4903cbf..a3b73a8 100644 --- a/BBWYB.Client/ViewModels/MainViewModel.cs +++ b/BBWYB.Client/ViewModels/MainViewModel.cs @@ -1,7 +1,6 @@ using BBWYB.Client.APIServices; using BBWYB.Client.Models; using BBWYB.Client.Views.SelectShop; -using BBWYB.Client.Views.WebB; using BBWYB.Common.Extensions; using BBWYB.Common.Models; using CommunityToolkit.Mvvm.Input; @@ -233,10 +232,6 @@ namespace BBWYB.Client.ViewModels vm.OrderVM.Refresh(); if (vm.IsCreateWareManager) vm.WareManager.Refresh(); - if (SelectedMenuModel?.Name == "订单列表Bata") - { - WeakReferenceMessenger.Default.Send(new Message_WebB_Refresh(null)); - } } } catch (Exception ex) diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs index 715c23c..1bb322d 100644 --- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs +++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs @@ -1,24 +1,11 @@ using BBWYB.Client.Models; using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; using BBWYB.Client.ViewModels; -using BBWYB.Client.Views.Ware; -using BBWYB.Client.Views.WebB; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using SJ.Controls; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace BBWYB.Client.Views.PackPurchaseTaska { diff --git a/BBWYB.Client/Views/Web.xaml.cs b/BBWYB.Client/Views/Web.xaml.cs index 19ed019..6a31dde 100644 --- a/BBWYB.Client/Views/Web.xaml.cs +++ b/BBWYB.Client/Views/Web.xaml.cs @@ -43,6 +43,8 @@ namespace BBWYB.Client.Views private void initWebView() { #if DEBUG + //var url = "http://qtbbwy.qiyue666.com"; + //var registerName = "webContext"; var url = "http://192.168.1.2:8080"; var registerName = "webTestContext"; //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html"); diff --git a/BBWYB.Client/Views/WebB/WebB.xaml b/BBWYB.Client/Views/WebB/WebB.xaml deleted file mode 100644 index 9131a20..0000000 --- a/BBWYB.Client/Views/WebB/WebB.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/BBWYB.Client/Views/WebB/WebB.xaml.cs b/BBWYB.Client/Views/WebB/WebB.xaml.cs deleted file mode 100644 index b365133..0000000 --- a/BBWYB.Client/Views/WebB/WebB.xaml.cs +++ /dev/null @@ -1,105 +0,0 @@ -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.Mvvm.Messaging.Messages; -using Microsoft.Extensions.DependencyInjection; -using System.Windows; -using System.Windows.Controls; - -namespace BBWYB.Client.Views.WebB -{ - /// - /// WebB.xaml 的交互逻辑 - /// - public partial class WebB : Page - { - private WebView2Manager w2m; - private bool isNavigated; - - private GlobalContext globalContext; - - public WebB() - { - InitializeComponent(); - this.Loaded += WebB_Loaded; - this.Unloaded += WebB_Unloaded; - - WeakReferenceMessenger.Default.Register(this, (o, x) => - { - this.Dispatcher.Invoke(() => - { - _ = w2m.wb2.ExecuteScriptAsync("window.location.reload();"); - }); - }); - - WeakReferenceMessenger.Default.Register(this, (o, x) => - { - this.Dispatcher.Invoke(() => - { - _ = w2m.wb2.ExecuteScriptAsync("window.BBWY_B_WebContex('PACK_CONFIG_SUCCESS');"); - }); - }); - } - - private void WebB_Unloaded(object sender, RoutedEventArgs e) - { - grid.Children.Remove(w2m.wb2); - //w2m.wb2.Dispose(); - w2m.Close(); - WeakReferenceMessenger.Default.UnregisterAll(this); - } - - private void WebB_Loaded(object sender, System.Windows.RoutedEventArgs e) - { - var sp = (App.Current as App).ServiceProvider; - using (var s = sp.CreateScope()) - { - w2m = s.ServiceProvider.GetRequiredService(); - globalContext = s.ServiceProvider.GetRequiredService(); - } - -#if DEBUG - var url = "http://192.168.1.8:8080"; - var registerName = "webTestContext"; - //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html"); -#else - var url = "http://qtbbwy.qiyue666.com"; - var registerName = "webContext"; -#endif - //var url = "http://qtbbwy.qiyue666.com"; - w2m.CoreWebView2InitializationCompleted = (e) => - { - w2m.wb2.CoreWebView2.AddHostObjectToScript(registerName, this.globalContext); - isNavigated = true; - w2m.wb2.CoreWebView2.Navigate(url); - }; - - - w2m.Init("bbwyb_web"); - w2m.wb2.SetValue(Grid.RowProperty, 1); - w2m.wb2.Margin = new Thickness(1, 0, 1, 0); - //grid.Children.Clear(); - grid.Children.Add(w2m.wb2); - - if (w2m.IsInitializationCompleted && !isNavigated) - { - w2m.wb2.CoreWebView2.Navigate(url); - //w2m.wb2.CoreWebView2.NavigateToString(content); - isNavigated = true; - } - } - } - - - public class Message_WebB_Refresh : ValueChangedMessage - { - public Message_WebB_Refresh(object value) : base(value) - { - } - } - - public class Message_WebB_RefreshPack : ValueChangedMessage - { - public Message_WebB_RefreshPack(object value) : base(value) - { - } - } -} diff --git a/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml b/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml deleted file mode 100644 index 8df7144..0000000 --- a/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml.cs b/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml.cs deleted file mode 100644 index d4b329c..0000000 --- a/BBWYB.Client/Views/WebB/WebB_GoodsSource.xaml.cs +++ /dev/null @@ -1,104 +0,0 @@ -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.Mvvm.Messaging.Messages; -using Microsoft.Extensions.DependencyInjection; -using System.Windows; -using System.Windows.Controls; - -namespace BBWYB.Client.Views.WebB -{ - /// - /// WebB.xaml 的交互逻辑 - /// - public partial class WebB_GoodsSource : Page - { - private WebView2Manager w2m; - private bool isNavigated; - - private GlobalContext globalContext; - - public WebB_GoodsSource() - { - InitializeComponent(); - this.Loaded += WebB_Loaded; - this.Unloaded += WebB_Unloaded; - - //WeakReferenceMessenger.Default.Register(this, (o, x) => - //{ - // this.Dispatcher.Invoke(() => - // { - // _ = w2m.wb2.ExecuteScriptAsync("window.location.reload();"); - // }); - //}); - - //WeakReferenceMessenger.Default.Register(this, (o, x) => - //{ - // this.Dispatcher.Invoke(() => - // { - // _ = w2m.wb2.ExecuteScriptAsync("window.BBWY_B_WebContex('PACK_CONFIG_SUCCESS');"); - // }); - //}); - } - - private void WebB_Unloaded(object sender, RoutedEventArgs e) - { - grid.Children.Remove(w2m.wb2); - //w2m.wb2.Dispose(); - w2m.Close(); - WeakReferenceMessenger.Default.UnregisterAll(this); - } - - private void WebB_Loaded(object sender, System.Windows.RoutedEventArgs e) - { - var sp = (App.Current as App).ServiceProvider; - using (var s = sp.CreateScope()) - { - w2m = s.ServiceProvider.GetRequiredService(); - globalContext = s.ServiceProvider.GetRequiredService(); - } - -#if DEBUG - var url = "http://192.168.1.2:8080/#/goods-source"; - var registerName = "webTestContext"; - //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html"); -#else - var url = "http://qtbbwy.qiyue666.com/#/goods-source"; - var registerName = "webContext"; -#endif - w2m.CoreWebView2InitializationCompleted = (e) => - { - w2m.wb2.CoreWebView2.AddHostObjectToScript(registerName, this.globalContext); - isNavigated = true; - w2m.wb2.CoreWebView2.Navigate(url); - }; - - - w2m.Init("bbwyb_web"); - w2m.wb2.SetValue(Grid.RowProperty, 1); - w2m.wb2.Margin = new Thickness(1, 0, 1, 0); - //grid.Children.Clear(); - grid.Children.Add(w2m.wb2); - - if (w2m.IsInitializationCompleted && !isNavigated) - { - w2m.wb2.CoreWebView2.Navigate(url); - //w2m.wb2.CoreWebView2.NavigateToString(content); - isNavigated = true; - } - } - } - - - //public class Message_WebB_GoodsSource_Refresh : ValueChangedMessage - //{ - // public Message_WebB_GoodsSource_Refresh(object value) : base(value) - // { - // } - //} - - //public class Message_WebB_GoodsSource_RefreshPack : ValueChangedMessage - //{ - // public Message_WebB_GoodsSource_RefreshPack(object value) : base(value) - // { - // } - //} -} diff --git a/BBWYB.Client/Views/WebB/WebB_KPI.xaml b/BBWYB.Client/Views/WebB/WebB_KPI.xaml deleted file mode 100644 index 261dbfd..0000000 --- a/BBWYB.Client/Views/WebB/WebB_KPI.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/BBWYB.Client/Views/WebB/WebB_KPI.xaml.cs b/BBWYB.Client/Views/WebB/WebB_KPI.xaml.cs deleted file mode 100644 index da0813d..0000000 --- a/BBWYB.Client/Views/WebB/WebB_KPI.xaml.cs +++ /dev/null @@ -1,87 +0,0 @@ -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.Mvvm.Messaging.Messages; -using Microsoft.Extensions.DependencyInjection; -using System; -using System.Windows; -using System.Windows.Controls; - -namespace BBWYB.Client.Views.WebB -{ - /// - /// WebB_KPI.xaml 的交互逻辑 - /// - public partial class WebB_KPI : Page - { - private WebView2Manager w2m; - private bool isNavigated; - - private GlobalContext globalContext; - public WebB_KPI() - { - InitializeComponent(); - - this.Loaded += WebB_KPI_Loaded; ; - this.Unloaded += WebB_KPI_Unloaded; - - WeakReferenceMessenger.Default.Register(this, (o, x) => - { - this.Dispatcher.Invoke(() => - { - _ = w2m.wb2.ExecuteScriptAsync("window.location.reload();"); - }); - }); - } - - private void WebB_KPI_Unloaded(object sender, RoutedEventArgs e) - { - grid.Children.Remove(w2m.wb2); - w2m.Close(); - WeakReferenceMessenger.Default.UnregisterAll(this); - } - - private void WebB_KPI_Loaded(object sender, RoutedEventArgs e) - { - var sp = (App.Current as App).ServiceProvider; - using (var s = sp.CreateScope()) - { - w2m = s.ServiceProvider.GetRequiredService(); - globalContext = s.ServiceProvider.GetRequiredService(); - } - -#if DEBUG - var url = "http://localhost:8080/#/performance"; - var registerName = "webTestContext"; -#else - var url = "http://qtbbwy.qiyue666.com/#/performance"; - var registerName = "webContext"; -#endif - w2m.CoreWebView2InitializationCompleted = (e) => - { - w2m.wb2.CoreWebView2.AddHostObjectToScript(registerName, this.globalContext); - isNavigated = true; - w2m.wb2.CoreWebView2.Navigate(url); - }; - - - w2m.Init("bbwyb_web"); - w2m.wb2.SetValue(Grid.RowProperty, 1); - w2m.wb2.Margin = new Thickness(1, 0, 1, 0); - //grid.Children.Clear(); - grid.Children.Add(w2m.wb2); - - if (w2m.IsInitializationCompleted && !isNavigated) - { - w2m.wb2.CoreWebView2.Navigate(url); - //w2m.wb2.CoreWebView2.NavigateToString(content); - isNavigated = true; - } - } - } - - public class Message_WebBKPI_Refresh : ValueChangedMessage - { - public Message_WebBKPI_Refresh(object value) : base(value) - { - } - } -} diff --git a/WebTest/App.xaml.cs b/WebTest/App.xaml.cs index 0425e36..d75d7a9 100644 --- a/WebTest/App.xaml.cs +++ b/WebTest/App.xaml.cs @@ -25,7 +25,7 @@ namespace WebTest string userToken = string.Empty; //齐越山鸡 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY"; gl.UserToken = userToken; diff --git a/WebTest/MainWindow.xaml.cs b/WebTest/MainWindow.xaml.cs index 93a2694..5d72d9c 100644 --- a/WebTest/MainWindow.xaml.cs +++ b/WebTest/MainWindow.xaml.cs @@ -27,7 +27,7 @@ namespace WebTest private ShopService shopService; #if DEBUG -private string registerName = "webTestContext"; + private string registerName = "webTestContext"; #else private string registerName = "webContext"; #endif @@ -87,7 +87,7 @@ private string registerName = "webContext"; shopService = s.ServiceProvider.GetRequiredService(); } - Login(); + //Login(); w2m.CoreWebView2InitializationCompleted = (e) => { w2m.wb2.CoreWebView2.PermissionRequested += (sender, args) => @@ -103,7 +103,7 @@ private string registerName = "webContext"; w2m.wb2.Margin = new Thickness(1, 0, 1, 0); grid.Children.Add(w2m.wb2); - + //if (w2m.IsInitializationCompleted && !isNavigated) //{ // w2m.wb2.CoreWebView2.Navigate(url); @@ -183,11 +183,11 @@ private string registerName = "webContext"; MessageBox.Show("地址不能为空", "提示"); return; } - if (!txtUrl.Text.StartsWith("http")) - { - MessageBox.Show("地址需要携带协议头", "提示"); - return; - } + //if (!txtUrl.Text.StartsWith("http")) + //{ + // MessageBox.Show("地址需要携带协议头", "提示"); + // return; + //} w2m.wb2.CoreWebView2.Navigate(txtUrl.Text); } } diff --git a/WebTest/WebView2Manager.cs b/WebTest/WebView2Manager.cs index 5faa032..5c75417 100644 --- a/WebTest/WebView2Manager.cs +++ b/WebTest/WebView2Manager.cs @@ -26,6 +26,11 @@ namespace WebTest } } + private void CoreWebView2_WebResourceRequested(object? sender, CoreWebView2WebResourceRequestedEventArgs e) + { + Console.WriteLine($"{DateTime.Now} WebSroucesRequest {e.Request.Uri}"); + } + public Action OnWebMessageReceived; public Action OnNavigationCompleted; public Action CoreWebView2InitializationCompleted; @@ -43,6 +48,7 @@ namespace WebTest private void Wb2_CoreWebView2InitializationCompleted(object sender, CoreWebView2InitializationCompletedEventArgs e) { + wb2.CoreWebView2.WebResourceRequested += CoreWebView2_WebResourceRequested; CoreWebView2InitializationCompleted?.Invoke(e); IsInitializationCompleted = true; }