shanji 2 years ago
parent
commit
c558124d2a
  1. 2
      BBWYB.Client/GlobalContext.cs
  2. 2
      BBWYB.Client/Views/WebB/WebB.xaml.cs
  3. 6
      BBWYB.Client/WebView2Manager.cs
  4. 6
      U/WebView2Manager.cs

2
BBWYB.Client/GlobalContext.cs

@ -20,7 +20,7 @@ namespace BBWYB.Client
{ {
public GlobalContext() public GlobalContext()
{ {
BBWYBApiVersion = "10024"; BBWYBApiVersion = "10025";
} }
private User user; private User user;

2
BBWYB.Client/Views/WebB/WebB.xaml.cs

@ -80,7 +80,7 @@ namespace BBWYB.Client.Views.WebB
}; };
w2m.Init(); w2m.Init("bbwyb_web");
w2m.wb2.SetValue(Grid.RowProperty, 1); w2m.wb2.SetValue(Grid.RowProperty, 1);
w2m.wb2.Margin = new Thickness(1, 0, 1, 0); w2m.wb2.Margin = new Thickness(1, 0, 1, 0);
//grid.Children.Clear(); //grid.Children.Clear();

6
BBWYB.Client/WebView2Manager.cs

@ -13,12 +13,12 @@ namespace BBWYB.Client
//{ //{
// Init(); // Init();
//} //}
public void Init() public void Init(string folderName = "WebView2UserData")
{ {
if (wb2 == null) if (wb2 == null)
{ {
wb2 = new WebView2(); wb2 = new WebView2();
var wb2Setting = CoreWebView2Environment.CreateAsync(userDataFolder: io.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "WebView2UserData")).Result; var wb2Setting = CoreWebView2Environment.CreateAsync(userDataFolder: io.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), folderName)).Result;
wb2.EnsureCoreWebView2Async(wb2Setting); wb2.EnsureCoreWebView2Async(wb2Setting);
wb2.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted; wb2.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted;
wb2.NavigationCompleted += Wb2_NavigationCompleted; wb2.NavigationCompleted += Wb2_NavigationCompleted;
@ -29,7 +29,7 @@ namespace BBWYB.Client
public Action<CoreWebView2WebMessageReceivedEventArgs> OnWebMessageReceived; public Action<CoreWebView2WebMessageReceivedEventArgs> OnWebMessageReceived;
public Action<CoreWebView2NavigationCompletedEventArgs> OnNavigationCompleted; public Action<CoreWebView2NavigationCompletedEventArgs> OnNavigationCompleted;
public Action<CoreWebView2InitializationCompletedEventArgs> CoreWebView2InitializationCompleted; public Action<CoreWebView2InitializationCompletedEventArgs> CoreWebView2InitializationCompleted;
public bool IsInitializationCompleted { get ; private set; } public bool IsInitializationCompleted { get; private set; }
private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)
{ {

6
U/WebView2Manager.cs

@ -13,12 +13,12 @@ namespace U
//{ //{
// Init(); // Init();
//} //}
public void Init() public void Init(string folderName = "WebView2UserData")
{ {
if (wb2 == null) if (wb2 == null)
{ {
wb2 = new WebView2(); wb2 = new WebView2();
var wb2Setting = CoreWebView2Environment.CreateAsync(userDataFolder: io.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UPC_WebView2UserData")).Result; var wb2Setting = CoreWebView2Environment.CreateAsync(userDataFolder: io.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), folderName)).Result;
wb2.EnsureCoreWebView2Async(wb2Setting); wb2.EnsureCoreWebView2Async(wb2Setting);
wb2.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted; wb2.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted;
wb2.NavigationCompleted += Wb2_NavigationCompleted; wb2.NavigationCompleted += Wb2_NavigationCompleted;
@ -29,7 +29,7 @@ namespace U
public Action<CoreWebView2WebMessageReceivedEventArgs> OnWebMessageReceived; public Action<CoreWebView2WebMessageReceivedEventArgs> OnWebMessageReceived;
public Action<CoreWebView2NavigationCompletedEventArgs> OnNavigationCompleted; public Action<CoreWebView2NavigationCompletedEventArgs> OnNavigationCompleted;
public Action<CoreWebView2InitializationCompletedEventArgs> CoreWebView2InitializationCompleted; public Action<CoreWebView2InitializationCompletedEventArgs> CoreWebView2InitializationCompleted;
public bool IsInitializationCompleted { get ; private set; } public bool IsInitializationCompleted { get; private set; }
private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)
{ {

Loading…
Cancel
Save