Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加LoaingFinished事件 #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
Binary file modified .vs/WpfMiniBlink/v16/.suo
Binary file not shown.
Binary file added .vs/slnx.sqlite
Binary file not shown.
23 changes: 21 additions & 2 deletions WpfCoreMiniBlink/MBApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,27 @@ public static void wkeOnDocumentReady2(IntPtr webView, wkeDocumentReady2Callback
}
}

//[DllImport(DLL_x86, EntryPoint = "wkeOnLoadingFinish", CallingConvention = CallingConvention.Cdecl)]
//public static extern void wkeOnLoadingFinish(IntPtr webView, wkeLoadingFinishCallback callback, IntPtr param);
[DllImport(DLL_x86, EntryPoint = "wkeOnLoadingFinish", CallingConvention = CallingConvention.Cdecl)]
public static extern void wkeOnLoadingFinish_x86(IntPtr webView, wkeLoadingFinishCallback callback, IntPtr param);
[DllImport(DLL_x64, EntryPoint = "wkeOnLoadingFinish", CallingConvention = CallingConvention.Cdecl)]
public static extern void wkeOnLoadingFinish_x64(IntPtr webView, wkeLoadingFinishCallback callback, IntPtr param);
/// <summary>
/// 页面所有元素加载完成会调用。
/// </summary>
/// <param name="webView"></param>
/// <param name="callback"></param>
/// <param name="param"></param>
public static void wkeOnLoadingFinish(IntPtr webView, wkeLoadingFinishCallback callback, IntPtr param)
{
if (is64())
{
wkeOnLoadingFinish_x64(webView, callback, param);
}
else
{
wkeOnLoadingFinish_x86(webView, callback, param);
}
}

[DllImport(DLL_x86, EntryPoint = "wkeOnDownload", CallingConvention = CallingConvention.Cdecl)]
private static extern void wkeOnDownload_x86(IntPtr webView, wkeDownloadCallback callback, IntPtr param);
Expand Down
13 changes: 13 additions & 0 deletions WpfCoreMiniBlink/MBEvents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ internal DocumentReadyEventArgs()
}
}

public class LoadingFinishEventArgs : MiniblinkEventArgs
{
public string Url { get; set; }
public string FailedReason { get; set; }

public wkeLoadingResult LoadingResult { get; set; }

internal LoadingFinishEventArgs()
{

}
}

public class ConsoleMessageEventArgs : MiniblinkEventArgs
{
public wkeConsoleLevel Level { get; internal set; }
Expand Down
27 changes: 27 additions & 0 deletions WpfCoreMiniBlink/MiniblinkBrowser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,33 @@ protected virtual void OnDocumentReady(IntPtr mb, IntPtr param, IntPtr frameId)
});
}

private wkeLoadingFinishCallback _wkeLoadingFinish;
private EventHandler<LoadingFinishEventArgs> _loadingFinish;
/// <summary>
/// 页面加载完成事件。
/// </summary>
public event EventHandler<LoadingFinishEventArgs> LoadingFinish
{
add
{
if (_wkeLoadingFinish == null)
{
MBApi.wkeOnLoadingFinish(MiniblinkHandle, _wkeLoadingFinish = new wkeLoadingFinishCallback(OnLoadingFinish), IntPtr.Zero);
}
_loadingFinish += value;
}
remove
{
_loadingFinish -= value;
}
}

protected virtual void OnLoadingFinish(IntPtr webView, IntPtr param, IntPtr url, wkeLoadingResult result,
IntPtr failedReason)
{
_loadingFinish?.Invoke(this, new LoadingFinishEventArgs() { FailedReason = failedReason.WKEToUTF8String(), LoadingResult = result, Url = url.WKEToUTF8String() });
}

private wkeConsoleCallback _wkeConsoleMessage;
private EventHandler<ConsoleMessageEventArgs> _consoleMessage;

Expand Down