Skip to content

fix: 修复scheme未拦截导致错误加载的情况 #254

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 21, 2024
Merged

fix: 修复scheme未拦截导致错误加载的情况 #254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be36de
fix: 修复scheme未拦截导致错误加载的情况
425765923 Nov 21, 2024
31cca35
fix: 修复scheme未拦截导致错误加载的情况
425765923 Nov 21, 2024
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
16 changes: 15 additions & 1 deletion harmony/rn_webview/src/main/ets/RNCWebView.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import { RNComponentContext } from '@rnoh/react-native-openharmony';
import webview from '@ohos.web.webview';
import { url as OSUrl } from '@kit.ArkTS';
import { url as OSUrl, url } from '@kit.ArkTS';
import { RNC, TM } from '@rnoh/react-native-openharmony/generated';
import Logger from './Logger';
import { BaseOperate } from './WebViewBaseOperate';
Expand Down Expand Up @@ -360,6 +360,20 @@ export struct RNCWebView {
onLoadIntercept(event: OnLoadInterceptEvent): boolean {
Logger.debug(TAG, `onLoadIntercept request url:${event.data.getRequestUrl()} ,shouldInterceptLoad:${this.shouldInterceptLoad}`)
if (!this.shouldInterceptLoad) {
try {
// 避免链接多一个/字符导致判断错误
if (url.URL.parseURL(event.data.getRequestUrl()).toString() != url.URL.parseURL(this.url.toString()).toString()) {
this.webViewBaseOperate?.setLockIdentifier(BaseOperate.generateLockIdentifier())
this.webViewBaseOperate?.emitShouldStartLoadWithRequest(event)
// 非网络链接拦截加载
if ( !["https:","http:"].includes(new url.URL(event.data.getRequestUrl()).protocol)) {
return true
}
}
} catch (e) {
Logger.debug(TAG, "onLoadIntercept error:" + e)
}

return false
}

Expand Down