Android support internal class

This commit is contained in:
pengfei.zhou
2020-09-04 18:22:45 +08:00
committed by osborn
parent a211ac8acb
commit 4df7df1327
16 changed files with 343 additions and 48 deletions

View File

@@ -14,16 +14,21 @@
* limitations under the License.
*/
import { BridgeContext } from "../runtime/global"
import { ClassType } from "../pattern/mvvm"
import { Panel } from "../ui/panel"
export function navigator(context: BridgeContext) {
const moduleName = "navigator"
return {
push: (source: string, config?: {
push: (source: string | ClassType<Panel>, config?: {
alias?: string,
animated?: boolean,
extra?: object,
singlePage?: boolean,
}) => {
if (typeof source === 'function') {
source = `_internal_://export?class=${encodeURIComponent(source.name)}&context=${context.id}`
}
if (config && config.extra) {
(config as any).extra = JSON.stringify(config.extra)
}

View File

@@ -117,6 +117,7 @@ export class Context {
entity: any
id: string
callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
classes: Map<string, ClassType<object>> = new Map
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
@@ -233,29 +234,50 @@ export function jsCallEntityMethod(contextId: string, methodName: string, args?:
loge(`Cannot find method for context id:${contextId},method name is:${methodName}`)
}
}
type ClassType<T> = new (...args: any) => T
export function jsObtainEntry(contextId: string) {
const context = jsObtainContext(contextId)
const exportFunc = (constructor: ClassType<object>) => {
context?.classes?.set(constructor.name, constructor)
const ret = class extends constructor {
context = context
}
if (context) {
context.register(new ret)
}
context?.register(new ret)
return ret
}
return (args: ClassType<object> | ClassType<object>[]) => {
if (args instanceof Array) {
return exportFunc
return function () {
if (arguments.length === 1) {
const args = arguments[0]
if (args instanceof Array) {
args.forEach(clz => {
context?.classes?.set(clz.name, clz)
})
return exportFunc
} else {
return exportFunc(args)
}
} else if (arguments.length === 2) {
const srcContextId = arguments[0] as string
const className = arguments[1] as string
const srcContext = gContexts.get(srcContextId)
if (srcContext) {
const clz = srcContext.classes.get(className)
if (clz) {
return exportFunc(clz)
} else {
throw new Error(`Cannot find class:${className} in context:${srcContextId}`)
}
} else {
throw new Error(`Cannot find context for ${srcContextId}`)
}
} else {
return exportFunc(args)
throw new Error(`Entry arguments error:${arguments}`)
}
}
}
const global = Function('return this')()
let __timerId__ = 0

View File

@@ -30,6 +30,17 @@ import "reflect-metadata"
* doric.jsObtainEntry(id),
* doric.__require__,
* ])
* // Direct load class
* Reflect.apply(
* function(doric,context,Entry,require){
* //Script content
* Entry('lastContextId','className')
* },doric.jsObtainContext(id),[
* undefined,
* doric.jsObtainContext(id),
* doric.jsObtainEntry(id),
* doric.__require__,
* ])
* // load module in global scope
* Reflect.apply(doric.jsRegisterModule,this,[
* moduleName,
@@ -117,6 +128,7 @@ export class Context {
entity: any
id: string
callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
classes: Map<string, ClassType<object>> = new Map
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
@@ -260,24 +272,46 @@ export function jsCallEntityMethod(contextId: string, methodName: string, args?:
loge(`Cannot find method for context id:${contextId},method name is:${methodName}`)
}
}
type ClassType<T> = new (...args: any) => T
export function jsObtainEntry(contextId: string) {
const context = jsObtainContext(contextId)
const exportFunc = (constructor: ClassType<object>) => {
context?.classes?.set(constructor.name, constructor)
const ret = class extends constructor {
context = context
}
if (context) {
context.register(new ret)
}
context?.register(new ret)
return ret
}
return (args: ClassType<object> | ClassType<object>[]) => {
if (args instanceof Array) {
return exportFunc
return function () {
if (arguments.length === 1) {
const args = arguments[0]
if (args instanceof Array) {
args.forEach(clz => {
context?.classes?.set(clz.name, clz)
})
return exportFunc
} else {
return exportFunc(args)
}
} else if (arguments.length === 2) {
const srcContextId = arguments[0] as string
const className = arguments[1] as string
const srcContext = gContexts.get(srcContextId)
if (srcContext) {
const clz = srcContext.classes.get(className)
if (clz) {
return exportFunc(clz)
} else {
throw new Error(`Cannot find class:${className} in context:${srcContextId}`)
}
} else {
throw new Error(`Cannot find context for ${srcContextId}`)
}
} else {
return exportFunc(args)
throw new Error(`Entry arguments error:${arguments}`)
}
}
}