Skip to content
This repository was archived by the owner on Nov 27, 2025. It is now read-only.

Dev 修改header和监听处理 #34

Merged
merged 3 commits into from
May 19, 2024
Merged

Dev 修改header和监听处理 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58b4c41
feat: 修复scrollEnabled初始值问题
May 19, 2024
7196605
feat: 修改header和监听处理
May 19, 2024
42cdc65
Merge branch 'dev' of github.com:react-native-oh-library/react-native…
May 19, 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
96 changes: 75 additions & 21 deletions 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 @@ -85,6 +85,33 @@ export class WebViewEventParams {
}
}

export enum CACHE_MODE {
'LOAD_DEFAULT' = 'LOAD_DEFAULT',
'LOAD_CACHE_ELSE_NETWORK' = 'LOAD_CACHE_ELSE_NETWORK' ,
'LOAD_NO_CACHE' = 'LOAD_NO_CACHE' ,
'LOAD_CACHE_ONLY' = 'LOAD_CACHE_ONLY',
}

export class ResultType {
url: string
loading: boolean
title: string
canGoBack: boolean
canGoForward: boolean
lockIdentifier: number
data: string

constructor(url: string, loading: boolean, title: string, canGoBack: boolean, canGoForward: boolean, lockIdentifier: number, data: string) {
this.url = url
this.loading = loading
this.title = title
this.canGoBack = canGoBack
this.canGoForward = canGoForward
this.lockIdentifier = lockIdentifier
this.data = data
}
}

export type WebViewViewDescriptor = Descriptor<"RNCWebView", WebViewProps>

@Component
Expand Down Expand Up @@ -122,6 +149,36 @@ export struct RNCWebView {

private onDescriptorWrapperChange(descriptorWrapper: RNC.RNCWebView.DescriptorWrapper) {
this.descriptorWrapper = descriptorWrapper

Logger.debug(TAG, `[RNOH] newDescriptor props uri, ${JSON.stringify(this.descriptorWrapper.props.newSource.uri)}`);
this.cacheMode =
this.descriptorWrapper.props.cacheEnabled ? this.transCacheMode(this.descriptorWrapper.props.cacheMode as CACHE_MODE) : CacheMode.Online;
this.javaScriptEnable = this.descriptorWrapper.props.javaScriptEnabled;
this.source = this.descriptorWrapper.props.newSource
this.scrollEnabled = this.descriptorWrapper.props.scrollEnabled;
if (this.html != "" && this.html != this.source.html) {
Logger.debug(TAG, "[RNOH] html is update")
this.html = this.source.html
if (this.controllerAttached) {
try {
this.controller.loadData(
this.source.html,
"text/html",
"UTF-8",
this.source.baseUrl,
" "
);
} catch (error) {
Logger.error(TAG, "error: " + error)
}
}
} else if (this.source.uri != "" && this.url != this.source.uri) {
Logger.debug(TAG, `[RNOH] newDescriptor props update uri: ` + this.source.uri);
this.url = this.source.uri as string;
if (this.controllerAttached) {
this.controller.loadUrl(this.descriptorWrapper.props.newSource.uri)
}
}
}

aboutToAppear() {
Expand Down Expand Up @@ -164,12 +221,11 @@ export struct RNCWebView {
// }
// }
// })

// webview.WebviewController.setWebDebuggingAccess(this.descriptor.props.webviewDebuggingEnabled)
this.scrollEnabled = this.descriptorWrapper.props.scrollEnabled;
this.javaScriptEnable = this.descriptorWrapper.props.javaScriptEnabled;
// this.cacheMode =
// this.descriptorWrapper.props.cacheEnabled ? this.transCacheMode(this.descriptorWrapper.props.cacheMode) : CacheMode.Online;
this.cacheMode =
this.descriptorWrapper.props.cacheEnabled ? this.transCacheMode(this.descriptorWrapper.props.cacheMode as CACHE_MODE) : CacheMode.Online;
this.source = this.descriptorWrapper.props.newSource
this.html = this.source.html
this.url = this.source.uri as string;
Expand All @@ -193,8 +249,7 @@ export struct RNCWebView {
let result: WebViewEventParams = this.createWebViewEvent("onMessage")
result.data = data
result.lockIdentifier = 0
// todo
// this.eventEmitter!.emit("message", result);
this.eventEmitter!.emit("message", result as ResultType);
}
}
};
Expand Down Expand Up @@ -236,19 +291,19 @@ export struct RNCWebView {
}
}

transCacheMode(cacheMode: number): CacheMode {
transCacheMode(cacheMode: CACHE_MODE): CacheMode {
let mode = CacheMode.Default
switch (cacheMode) {
case 0:
case CACHE_MODE.LOAD_DEFAULT:
mode = CacheMode.Default
break;
case 1:
case CACHE_MODE.LOAD_CACHE_ELSE_NETWORK:
mode = CacheMode.None
break;
case 2:
case CACHE_MODE.LOAD_NO_CACHE:
mode = CacheMode.Online
break;
case 3:
case CACHE_MODE.LOAD_CACHE_ONLY:
mode = CacheMode.Only
break;
default:
Expand Down Expand Up @@ -354,7 +409,7 @@ export struct RNCWebView {
Logger.error(TAG, "error: " + error)
}
}
break
break
default:
break
}
Expand Down Expand Up @@ -550,16 +605,15 @@ export struct RNCWebView {
}
} else if (uri != undefined && uri != "") {
let header = this.source.headers;
// if (header != undefined && header != "") {
// let headers: Array<webview.WebHeader> = [];
// JSON.parse(header, (key: string, value: string) => {
// if (key && value) {
// headers.push({ headerKey: key, headerValue: value })
// }
// return undefined;
// })
// this.controller.loadUrl(uri, headers);
// }
if (header != undefined) {
let headers: Array<webview.WebHeader> = [];
header.forEach(item => {
if (item.name && item.value) {
headers.push({ headerKey: item.name, headerValue: item.value })
}
})
this.controller.loadUrl(uri, headers);
}
}
if (!this.hasRegisterJavaScriptProxy) {
this.registerPostMessage()
Expand Down
1 change: 1 addition & 0 deletions src/WebView.harmony.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ const WebViewComponent = forwardRef<{}, IOSWebViewProps>(
<NativeWebView
key="webViewKey"
{...otherProps}
scrollEnabled={otherProps.scrollEnabled ?? true}
fraudulentWebsiteWarningEnabled={fraudulentWebsiteWarningEnabled}
javaScriptEnabled={javaScriptEnabled}
cacheEnabled={cacheEnabled}
Expand Down