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

修改版本号 #86

Merged
merged 4 commits into from
Jun 13, 2024
Merged

修改版本号 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b5b54b
fix:修复headers 无效问题
Jun 13, 2024
ef840aa
fix:修改headers失效问题
Jun 13, 2024
d561eda
fix:修改headers失效问题
Jun 13, 2024
4515146
修改版本号
Jun 13, 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
Binary file modified harmony/rn_webview.har
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion harmony/rn_webview/oh-package.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "@react-native-oh-tpl/react-native-webview",
"description": "main cpai architecture",
"main": "index.ets",
"version": "13.10.2-0.0.5",
"version": "13.10.2-0.0.6",
"dependencies": {
"@rnoh/react-native-openharmony": "file:../react_native_openharmony"
}
Expand Down
109 changes: 22 additions & 87 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 @@ -26,8 +26,6 @@ import { Descriptor, RNComponentContext, ViewBaseProps } from '@rnoh/react-nativ
import webview from '@ohos.web.webview';
import { RNC } from '@rnoh/react-native-openharmony/generated';
import Logger from './Logger';
import { CallbackState, ShouldRequestUrl } from './ShouldRequestUrl';

export class WebViewNewSourceHeader {
name?: string
value?: string
Expand Down Expand Up @@ -67,6 +65,7 @@ export interface WebViewProps extends ViewBaseProps {
incognito: boolean
userAgent: string
shouldStartLoadWithRequestEnabled: boolean
originWhitelist:Array<string>
}


Expand All @@ -89,11 +88,6 @@ export class WebViewEventParams {
}
}

export enum ShouldStartLoadWithRequestEnabledStatus {
START = 0,
END = 1,
}

export enum CACHE_MODE {
'LOAD_DEFAULT' = 'LOAD_DEFAULT',
'LOAD_CACHE_ELSE_NETWORK' = 'LOAD_CACHE_ELSE_NETWORK',
Expand Down Expand Up @@ -123,7 +117,6 @@ export class ResultType {
}

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

@Component
export struct RNCWebView {
public static readonly NAME = RNC.RNCWebView.NAME
Expand All @@ -149,10 +142,9 @@ export struct RNCWebView {
messagingEnabled: boolean = false;
hasRegisterJavaScriptProxy: boolean = false;
controllerAttached: boolean = false;
// nestedScrollFlag: boolean = false;
renderMode: RenderMode = RenderMode.SYNC_RENDER;
scrollEnabled = true;
@State onLoadInterceptStatus: number = ShouldStartLoadWithRequestEnabledStatus.START
headers: Array<webview.WebHeader> = []
private unregisterDescriptorChangesListener?: () => void = undefined
private cleanupCommandCallback?: () => void = undefined
private eventEmitter: RNC.RNCWebView.EventEmitter | undefined = undefined
Expand Down Expand Up @@ -226,9 +218,13 @@ export struct RNCWebView {
if (this.hasIncognito()) {
this.cacheMode = CacheMode.Online;
}
setTimeout(() => {
console.log('descriptorWrapper===>' + JSON.stringify(this.descriptorWrapper.props))
}, 0)
if (this.source.headers) {
this.source.headers.forEach(item => {
if (item.name && item.value) {
this.headers.push({ headerKey: item.name, headerValue: item.value })
}
})
}
}

hasIncognito(): boolean {
Expand Down Expand Up @@ -515,9 +511,8 @@ export struct RNCWebView {
}

build() {
//RNViewBase({ ctx: this.ctx, tag: this.tag }) {
Stack() {
Web({ src: this.source.uri, controller: this.controller, renderMode: this.renderMode })
Web({ src: "", controller: this.controller, renderMode: this.renderMode })
.width("100%")
.height("100%")
.constraintSize({ minHeight: 1 })
Expand All @@ -532,15 +527,6 @@ export struct RNCWebView {
.domStorageAccess(this.descriptorWrapper.props.domStorageEnabled)
.zoomAccess(this.descriptorWrapper.props.scalesPageToFit)// nestedScrollFlag 为true 表示可以在嵌套滚动中，web自己能滚动
.overScrollMode(this.overScrollMode)// .layoutMode(this.nestedScrollFlag ? WebLayoutMode.NONE : WebLayoutMode.FIT_CONTENT)
// .userAgent(this.descriptorWrapper.props.userAgent ? this.descriptorWrapper.props.userAgent :
// '')// .nestedScroll(this.nestedScrollFlag ? {
// scrollForward: NestedScrollMode.SELF_ONLY,
// scrollBackward: NestedScrollMode.SELF_ONLY
// } : { scrollForward: NestedScrollMode.PARENT_FIRST, scrollBackward: NestedScrollMode.PARENT_FIRST })
// .overScrollMode(OverScrollMode.NEVER)
// .onSizeChange((event)=>{
// Logger.debug(TAG, "[RNOH] event width: " + event.width + "[RNOH] event height: " + event.height)
// })
.onProgressChange((event) => {
if (event) {
this.progress = event.newProgress / 100
Expand Down Expand Up @@ -580,57 +566,6 @@ export struct RNCWebView {
this.onHttpError(code, errorInfo)
}
})
// .onLoadIntercept((event) => {
// if (event) {
// if (this.onLoadInterceptStatus === ShouldStartLoadWithRequestEnabledStatus.START) {
// this.sendEvent('onLoadIntercept', JSON.stringify({
// url: event.data.getRequestUrl(),
// loading: this.progress != 100,
// title: this.controller.getTitle(),
// canGoBack: this.controller.accessBackward(),
// canGoForward: this.controller.accessForward(),
// lockIdentifier: 11,
// navigationType: "other",
// mainDocumentURL: "",
// isTopFrame: event.data.isMainFrame(),
// status: this.onLoadInterceptStatus
// }))
// this.onLoadInterceptStatus = ShouldStartLoadWithRequestEnabledStatus.END
// setTimeout(() => {
// if (this.descriptorWrapper.props.shouldStartLoadWithRequestEnabled) {
// this.controller.refresh()
// }
// })
// }
// }
// if (this.source.html != undefined && this.source.html != '') {
// Logger.debug(TAG, "[RNOH]: load html not intercept")
// return false;
// }
// if (event.data.getRequestUrl() == this.source.uri || this.requestUrl != "") {
// Logger.debug(TAG, "[RNOH] first load not intercept")
// this.requestUrl = ""
// return false
// }
// this.requestUrl = event.data.getRequestUrl()
// let lockIdentifier = ShouldRequestUrl.getNewData();
// this.lockIdentifier = lockIdentifier
// Logger.debug(TAG, "[RNOH]:lockIdentifier:" + lockIdentifier)
// ShouldRequestUrl.setCallBack(lockIdentifier, () => {
// let data: CallbackState = ShouldRequestUrl.getValue(this.lockIdentifier);
// let should: boolean = data == CallbackState.SHOULD_OVERRIDE
// Logger.debug(TAG, "[RNOH] should:" + should)
// ShouldRequestUrl.removeData(this.lockIdentifier)
// this.lockIdentifier = ""
// if (!should) {
// this.controller.loadUrl(this.requestUrl)
// } else {
// this.requestUrl = ""
// }
// })
// this.onShouldStartLoadCallFunction(Number(this.lockIdentifier), event.data)
// return true
// })
.onControllerAttached(() => {
this.controllerAttached = true;
Logger.debug(TAG, "[RNOH] onControllerAttached")
Expand All @@ -648,17 +583,10 @@ export struct RNCWebView {
} catch (error) {
Logger.error(TAG, "error:" + error)
}
} else if (uri != undefined && uri != "") {
let header = this.source.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);
}
}else if (uri != undefined && uri != "") {
this.controller.loadUrl(uri, this.headers);
} else {
this.controller.loadUrl(uri, this.headers);
}
if (!this.hasRegisterJavaScriptProxy) {
this.registerPostMessage()
Expand Down Expand Up @@ -689,6 +617,13 @@ export struct RNCWebView {
this.transCacheMode(this.descriptorWrapper.props.cacheMode as CACHE_MODE) : CacheMode.Online;
this.javaScriptEnable = this.descriptorWrapper.props.javaScriptEnabled;
this.source = this.descriptorWrapper.props.newSource
if (this.source.headers) {
this.source.headers.forEach(item => {
if (item.name && item.value) {
this.headers.push({ headerKey: item.name, headerValue: item.value })
}
})
}
if (this.html != "" && this.html != this.source.html) {
Logger.debug(TAG, "[RNOH] html is update")
this.html = this.source.html
Expand All @@ -709,7 +644,7 @@ export struct RNCWebView {
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)
this.controller.loadUrl(this.descriptorWrapper.props.newSource.uri,this.headers)
}
}
if (this.controllerAttached) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Thibault Malbranche <malbranche.thibault@gmail.com>"
],
"license": "MIT",
"version": "13.10.2-0.0.5",
"version": "13.10.2-0.0.6",
"homepage": "https://github.com/react-native-webview/react-native-webview#readme",
"scripts": {
"android": "react-native run-android",
Expand Down