diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index d3a13bb..2176586 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -20,7 +20,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10024"; + BBWYBApiVersion = "10025"; } private User user; diff --git a/BBWYB.Client/Views/WebB/WebB.xaml.cs b/BBWYB.Client/Views/WebB/WebB.xaml.cs index de04809..9c39e7f 100644 --- a/BBWYB.Client/Views/WebB/WebB.xaml.cs +++ b/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.Margin = new Thickness(1, 0, 1, 0); //grid.Children.Clear(); diff --git a/BBWYB.Client/WebView2Manager.cs b/BBWYB.Client/WebView2Manager.cs index c978669..324d982 100644 --- a/BBWYB.Client/WebView2Manager.cs +++ b/BBWYB.Client/WebView2Manager.cs @@ -13,12 +13,12 @@ namespace BBWYB.Client //{ // Init(); //} - public void Init() + public void Init(string folderName = "WebView2UserData") { if (wb2 == null) { 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.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted; wb2.NavigationCompleted += Wb2_NavigationCompleted; @@ -29,7 +29,7 @@ namespace BBWYB.Client public Action OnWebMessageReceived; public Action OnNavigationCompleted; public Action CoreWebView2InitializationCompleted; - public bool IsInitializationCompleted { get ; private set; } + public bool IsInitializationCompleted { get; private set; } private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) { diff --git a/U/WebView2Manager.cs b/U/WebView2Manager.cs index 91ab8b7..f48d2eb 100644 --- a/U/WebView2Manager.cs +++ b/U/WebView2Manager.cs @@ -13,12 +13,12 @@ namespace U //{ // Init(); //} - public void Init() + public void Init(string folderName = "WebView2UserData") { if (wb2 == null) { 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.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted; wb2.NavigationCompleted += Wb2_NavigationCompleted; @@ -29,7 +29,7 @@ namespace U public Action OnWebMessageReceived; public Action OnNavigationCompleted; public Action CoreWebView2InitializationCompleted; - public bool IsInitializationCompleted { get ; private set; } + public bool IsInitializationCompleted { get; private set; } private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) {