Skip to content

更新har包 #7

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 3 commits into from
Dec 2, 2023
Merged

更新har包 #7

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
15901b3
添加reload接口,动态刷新属性
Dec 2, 2023
5a9b8a0
跟新har包
Dec 2, 2023
31d173c
跟新har包
Dec 2, 2023
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
Binary file modified harmony/rn_webview.har
View file
Open in desktop
Binary file not shown.
7 changes: 3 additions & 4 deletions harmony/rn_webview/src/main/ets/RNCWebViewTurboModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { TurboModule, TurboModuleContext } from 'rnoh/ts';
import { CallbackState, ShouldRequestUrl } from './ShouldRequestUrl';
import Logger from './Logger'

export class RNCWebViewTurboModule extends TurboModule{
export class RNCWebViewTurboModule extends TurboModule {
constructor(protected ctx: TurboModuleContext) {
super(ctx);
Logger.debug('[RNOH]:RNCWebViewTurboModule constructor');
Expand All @@ -36,16 +36,15 @@ export class RNCWebViewTurboModule extends TurboModule{
Logger.debug('[RNOH]:RNCWebViewTurboModule call getConstants');
}

isFileUploadSupported(): Promise<void>{
isFileUploadSupported(): Promise<void> {
return new Promise<void>((resolve, reject) => {
Logger.debug('[RNOH]:RNCWebViewTurboModule call isFileUploadSupported');
resolve()
});
}

shouldStartLoadWithLockIdentifier(shouldStart: boolean, lockIdentifier: number) {
Logger.debug('[RNOH]: shouldStartLoadWithLockIdentifier shouldStart: ' + shouldStart);
Logger.debug('[RNOH]: shouldStartLoadWithLockIdentifier lockIdentifier: ' + lockIdentifier);
Logger.info("WebView",'shouldStartLoadWithLockIdentifier shouldStart: ' + shouldStart);
ShouldRequestUrl.setValue(lockIdentifier, shouldStart ? CallbackState.DO_NOT_OVERRIDE : CallbackState.SHOULD_OVERRIDE)
}
}
141 changes: 78 additions & 63 deletions harmony/rn_webview/src/main/ets/WebView.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export interface WebViewProps extends ViewBaseProps {
shouldStartLoadWithRequestEnabled: boolean
webviewDebuggingEnabled: boolean
}
export class RNCWebViewBridge{
export class RNCWebViewBridge {
postMessage!: (data: string) => void;
}

export class WebViewEventParams{
export class WebViewEventParams {
type: string
url?: string
loading?: boolean
Expand All @@ -89,6 +89,7 @@ export struct WebView {
@State descriptor: WebViewViewDescriptor = {} as WebViewViewDescriptor
@State source: WebViewNewSource = {uri: "", method: "", body: "", headers: "", html: "", baseUrl: ""}
html: string | undefined = ""
url: string | Resource = ""
private unregisterDescriptorChangesListener?: () => void = undefined
private cleanupCommandCallback?: () => void = undefined
controller: webview.WebviewController = new webview.WebviewController();
Expand All @@ -106,12 +107,14 @@ export struct WebView {
(newDescriptor) => {
this.descriptor = (newDescriptor as WebViewViewDescriptor)
Logger.debug(TAG, `[RNOH] newDescriptor props uri, ${JSON.stringify(this.descriptor.props.newSource.uri)}`);
this.cacheMode = this.descriptor.props.cacheEnabled ? this.transCacheMode(this.descriptor.props.cacheMode) : CacheMode.Online;
this.javaScriptEnable = this.descriptor.props.javaScriptEnabled;
this.source = this.descriptor.props.newSource
if (this.html != "" && this.html != this.source.html) {
Logger.debug(TAG,"[RNOH] html is update")
Logger.debug(TAG, "[RNOH] html is update")
this.html = this.source.html
try {
this.controller.loadData (
this.controller.loadData(
this.source.html,
"text/html",
"UTF-8",
Expand All @@ -121,6 +124,13 @@ export struct WebView {
} 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
this.controller.loadUrl(this.descriptor.props.newSource.uri)
} else {
Logger.debug(TAG, `[RNOH] newDescriptor props refresh`);
this.controller.refresh()
}
}
)
Expand All @@ -129,10 +139,11 @@ export struct WebView {
this.cacheMode = this.descriptor.props.cacheEnabled ? this.transCacheMode(this.descriptor.props.cacheMode) : CacheMode.Online;
this.source = this.descriptor.props.newSource
this.html = this.source.html
this.url = this.source.uri;
this.registerCommandCallback()
}

private registerPostMessage(){
private registerPostMessage() {
if (this.messagingEnabled == this.descriptor.props.messagingEnabled) {
return;
}
Expand Down Expand Up @@ -173,7 +184,7 @@ export struct WebView {
return result;
}

aboutToDisappear(){
aboutToDisappear() {
this.cleanupCommandCallback?.()
this.unregisterDescriptorChangesListener?.()
Logger.debug(TAG, `[RNOH] aboutToDisappear`)
Expand Down Expand Up @@ -219,87 +230,91 @@ export struct WebView {
case "postMessage":
Logger.debug(TAG,`[RNOH] postMessage,${JSON.stringify(args)}`)
break
case "reload":
Logger.debug(TAG,`[RNOH] reload,${JSON.stringify(args)}`)
this.controller.refresh();
break
default:
break
}
});
}

onLoadingFinish(){
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag,WEB_VIEW,{
type:"onLoadingFinish",
url:this.controller.getUrl(),
loading:this.progress != 100,
title:this.controller.getTitle(),
canGoBack:this.controller.accessBackward(),
canGoForward:this.controller.accessForward(),
lockIdentifier:0,
navigationType:"other",
mainDocumentURL:""})
onLoadingFinish() {
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag, WEB_VIEW, {
type: "onLoadingFinish",
url: this.controller.getUrl(),
loading: this.progress != 100,
title: this.controller.getTitle(),
canGoBack: this.controller.accessBackward(),
canGoForward: this.controller.accessForward(),
lockIdentifier: 0,
navigationType: "other",
mainDocumentURL: ""})
}

onLoadingError(code:number,description:string){
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag,WEB_VIEW,{
type:"onLoadingError",
url:this.controller.getUrl(),
loading:false,
title:this.controller.getTitle(),
canGoBack:this.controller.accessBackward(),
canGoForward:this.controller.accessForward(),
lockIdentifier:0,
domain:"",
code:code,
description:description})
onLoadingError(code: number, description: string) {
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag, WEB_VIEW, {
type: "onLoadingError",
url: this.controller.getUrl(),
loading: false,
title: this.controller.getTitle(),
canGoBack: this.controller.accessBackward(),
canGoForward: this.controller.accessForward(),
lockIdentifier: 0,
domain: "",
code: code,
description: description})
}

onShouldStartLoadWithRequest(){
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag,WEB_VIEW,{
type:"onShouldStartLoadWithRequest",
url:this.controller.getUrl(),
loading:this.progress != 100,
title:this.controller.getTitle(),
canGoBack:this.controller.accessBackward(),
canGoForward:this.controller.accessForward(),
lockIdentifier:0,
navigationType:"other",
mainDocumentURL:"",
isTopFrame:false})
onShouldStartLoadWithRequest() {
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag, WEB_VIEW, {
type: "onShouldStartLoadWithRequest",
url: this.controller.getUrl(),
loading: this.progress != 100,
title: this.controller.getTitle(),
canGoBack: this.controller.accessBackward(),
canGoForward: this.controller.accessForward(),
lockIdentifier: 0,
navigationType: "other",
mainDocumentURL: "",
isTopFrame: false})
}

onShouldStartLoadCallFunction(lockIdentifier:number,data:WebResourceRequest){
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag,WEB_VIEW,{
type:"onShouldStartLoadWithRequest",
url:data.getRequestUrl(),
loading:this.progress != 100,
title:this.controller.getTitle(),
canGoBack:this.controller.accessBackward(),
canGoForward:this.controller.accessForward(),
lockIdentifier:lockIdentifier,
navigationType:"other",
mainDocumentURL:"",
isTopFrame:data.isMainFrame()})
onShouldStartLoadCallFunction(lockIdentifier: number, data: WebResourceRequest) {
this.ctx.rnInstance.emitComponentEvent(this.descriptor.tag, WEB_VIEW, {
type: "onShouldStartLoadWithRequest",
url: data.getRequestUrl(),
loading: this.progress != 100,
title: this.controller.getTitle(),
canGoBack: this.controller.accessBackward(),
canGoForward: this.controller.accessForward(),
lockIdentifier: lockIdentifier,
navigationType: "other",
mainDocumentURL: "",
isTopFrame: data.isMainFrame()})
}

runInjectedJavaScript(){
runInjectedJavaScript() {
let injectedJS = this.descriptor.props.injectedJavaScript
if (this.javaScriptEnable && injectedJS != "") {
try {
this.controller.runJavaScript("(function() {\n" + injectedJS + ";\n})();")
.then((result) => {
Logger.debug(TAG,'[RNOH] result:' + result);
Logger.debug(TAG, '[RNOH] result: ' + result);
})
.catch((error:string | Error) => {
Logger.error(TAG,"[RNOH] error:" + error);
.catch((error: string | Error) => {
Logger.error(TAG, "[RNOH] error: " + error);
})
} catch (error) {
Logger.error(TAG,`[RNOH]Errorcode:${error.code},Message:${error.message}`);
Logger.error(TAG, `[RNOH]Errorcode: ${error.code}, Message: ${error.message}`);
}
}
}

build(){
RNViewBase({ ctx:this.ctx,tag:this.tag }){
Web({ src:this.source.uri,controller:this.controller })
build() {
RNViewBase({ ctx: this.ctx, tag: this.tag }) {
Web({ src: this.source.uri, controller: this.controller })
.width('100%').height('100%').constraintSize({minHeight:1})
.backgroundColor(Color.Transparent)
.javaScriptAccess(this.javaScriptEnable)
Expand All @@ -313,11 +328,11 @@ export struct WebView {
.onProgressChange((event) => {
if (event) {
this.progress = event.newProgress
Logger.debug(TAG,"[RNOH] event progress:" + event.newProgress)
Logger.debug(TAG, "[RNOH] event progress: " + event.newProgress)
}
})
.onPageEnd(() => {
Logger.debug(TAG,"[RNOH] onPageEnd")
Logger.debug(TAG, "[RNOH] onPageEnd")
this.runInjectedJavaScript()
this.onLoadingFinish()
})
Expand Down