tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android: compat webviewexecutor to support arraybuffer

Browse Source
This commit is contained in:
pengfei.zhou
2021-12-31 16:55:38 +08:00
committed by osborn
parent c67803b717
commit 8c57e5e500
19 changed files with 381 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doric-js/bundle/doric-lib.es5.js
View File

@@ -2314,12 +2314,10 @@ var Image = /** @class */ (function (_super) {
};
Image.prototype.toModel = function () {
var ret = _super.prototype.toModel.call(this);
if (Environment.platform === 'iOS') {
if (Reflect.has(ret.props, "imagePixels")) {
var imagePixels = Reflect.get(ret.props, "imagePixels");
var pixels_1 = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(function () { return pixels_1; });
}
if (Reflect.has(ret.props, "imagePixels")) {
var imagePixels = Reflect.get(ret.props, "imagePixels");
var pixels_1 = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(function () { return pixels_1; });
}
return ret;
};

10
doric-js/bundle/doric-lib.js
View File

@@ -1728,12 +1728,10 @@ class Image extends View {
}
toModel() {
const ret = super.toModel();
if (Environment.platform === 'iOS') {
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
return ret;
}

10
doric-js/bundle/doric-vm.js
View File

@@ -3256,12 +3256,10 @@ class Image extends View {
}
toModel() {
const ret = super.toModel();
if (Environment.platform === 'iOS') {
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
return ret;
}

93
doric-js/bundle/doric-web.js
View File

@@ -1,42 +1,53 @@
'use strict';
"use strict";
function _binaryValue(v) {
switch (typeof v) {
case "number":
return {
type: "number",
value: v
};
case "string":
return {
type: "string",
value: v
};
case "boolean":
return {
type: "boolean",
value: v
};
case "object":
if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
};
}
else {
return {
type: "object",
value: JSON.stringify(v)
};
}
default:
return {
type: "null",
value: undefined
};
function _arrayBufferToBase64(arrayBuffer) {
let base64 = '';
const encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
const bytes = new Uint8Array(arrayBuffer);
const byteLength = bytes.byteLength;
const byteRemainder = byteLength % 3;
const mainLength = byteLength - byteRemainder;
let a, b, c, d;
let chunk;
// Main loop deals with bytes in chunks of 3
for (var i = 0; i < mainLength; i = i + 3) {
// Combine the three bytes into a single integer
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
// Use bitmasks to extract 6-bit segments from the triplet
a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18
b = (chunk & 258048) >> 12; // 258048 = (2^6 - 1) << 12
c = (chunk & 4032) >> 6; // 4032 = (2^6 - 1) << 6
d = chunk & 63; // 63 = 2^6 - 1
// Convert the raw binary segments to the appropriate ASCII encoding
base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d];
}
// Deal with the remaining bytes and padding
if (byteRemainder == 1) {
chunk = bytes[mainLength];
a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2
// Set the 4 least significant bits to zero
b = (chunk & 3) << 4; // 3 = 2^2 - 1
base64 += encodings[a] + encodings[b] + '==';
}
else if (byteRemainder == 2) {
chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1];
a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10
b = (chunk & 1008) >> 4; // 1008 = (2^6 - 1) << 4
// Set the 2 least significant bits to zero
c = (chunk & 15) << 2; // 15 = 2^4 - 1
base64 += encodings[a] + encodings[b] + encodings[c] + '=';
}
return base64;
}
function _base64ToArrayBuffer(v) {
const binary_string = window.atob(v);
const len = binary_string.length;
const bytes = new Uint8Array(len);
for (let i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
}
function _wrappedValue(v) {
switch (typeof v) {
@@ -56,7 +67,13 @@ function _wrappedValue(v) {
value: v
};
case "object":
if (v instanceof Array) {
if (v instanceof ArrayBuffer) {
return {
type: "arrayBuffer",
value: _arrayBufferToBase64(v)
};
}
else if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
@@ -89,6 +106,10 @@ function _rawValue(v) {
return JSON.parse(v.value);
}
return v.value;
case "arrayBuffer":
const data = NativeClient.fetchArrayBuffer(v.value);
return _base64ToArrayBuffer(data);
;
default:
return undefined;
}

105
doric-js/index.web.ts
View File

@@ -2,51 +2,74 @@ declare module NativeClient {
function log(message: string): void
function returnNative(ret: string): void
function callNative(name: string, args: string): string
function fetchArrayBuffer(id: string): string
}
type RawValue = number | string | boolean | object | undefined
type RawValue = number | string | boolean | object | undefined | ArrayBuffer
type WrappedValue = {
type: "number" | "string" | "boolean" | "object" | "array" | "null",
type: "number" | "string" | "boolean" | "object" | "array" | "null" | "arrayBuffer",
value: RawValue,
}
function _binaryValue(v: RawValue) {
switch (typeof v) {
case "number":
return {
type: "number",
value: v
};
case "string":
return {
type: "string",
value: v
};
case "boolean":
return {
type: "boolean",
value: v
};
case "object":
if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
};
} else {
return {
type: "object",
value: JSON.stringify(v)
};
}
default:
return {
type: "null",
value: undefined
};
function _arrayBufferToBase64(arrayBuffer: ArrayBuffer) {
let base64 = ''
const encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
const bytes = new Uint8Array(arrayBuffer)
const byteLength = bytes.byteLength
const byteRemainder = byteLength % 3
const mainLength = byteLength - byteRemainder
let a, b, c, d
let chunk
// Main loop deals with bytes in chunks of 3
for (var i = 0; i < mainLength; i = i + 3) {
// Combine the three bytes into a single integer
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2]
// Use bitmasks to extract 6-bit segments from the triplet
a = (chunk & 16515072) >> 18 // 16515072 = (2^6 - 1) << 18
b = (chunk & 258048) >> 12 // 258048 = (2^6 - 1) << 12
c = (chunk & 4032) >> 6 // 4032 = (2^6 - 1) << 6
d = chunk & 63 // 63 = 2^6 - 1
// Convert the raw binary segments to the appropriate ASCII encoding
base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d]
}
// Deal with the remaining bytes and padding
if (byteRemainder == 1) {
chunk = bytes[mainLength]
a = (chunk & 252) >> 2 // 252 = (2^6 - 1) << 2
// Set the 4 least significant bits to zero
b = (chunk & 3) << 4 // 3 = 2^2 - 1
base64 += encodings[a] + encodings[b] + '=='
} else if (byteRemainder == 2) {
chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1]
a = (chunk & 64512) >> 10 // 64512 = (2^6 - 1) << 10
b = (chunk & 1008) >> 4 // 1008 = (2^6 - 1) << 4
// Set the 2 least significant bits to zero
c = (chunk & 15) << 2 // 15 = 2^4 - 1
base64 += encodings[a] + encodings[b] + encodings[c] + '='
}
return base64
}
function _base64ToArrayBuffer(v: string) {
const binary_string = window.atob(v);
const len = binary_string.length;
const bytes = new Uint8Array(len);
for (let i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
}
function _wrappedValue(v: RawValue): WrappedValue {
switch (typeof v) {
case "number":
@@ -65,7 +88,12 @@ function _wrappedValue(v: RawValue): WrappedValue {
value: v
};
case "object":
if (v instanceof Array) {
if (v instanceof ArrayBuffer) {
return {
type: "arrayBuffer",
value: _arrayBufferToBase64(v)
};
} else if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
@@ -98,6 +126,9 @@ function _rawValue(v: WrappedValue): RawValue {
return JSON.parse(v.value)
}
return v.value;
case "arrayBuffer":
const data = NativeClient.fetchArrayBuffer(v.value as string);
return _base64ToArrayBuffer(data);;
default:
return undefined;
}

20
doric-js/lib/index.web.d.ts vendored
View File

@@ -2,25 +2,15 @@ declare module NativeClient {
function log(message: string): void;
function returnNative(ret: string): void;
function callNative(name: string, args: string): string;
function fetchArrayBuffer(id: string): string;
}
declare type RawValue = number | string | boolean | object | undefined;
declare type RawValue = number | string | boolean | object | undefined | ArrayBuffer;
declare type WrappedValue = {
type: "number" | "string" | "boolean" | "object" | "array" | "null";
type: "number" | "string" | "boolean" | "object" | "array" | "null" | "arrayBuffer";
value: RawValue;
};
declare function _binaryValue(v: RawValue): {
type: string;
value: number;
} | {
type: string;
value: string;
} | {
type: string;
value: boolean;
} | {
type: string;
value: undefined;
};
declare function _arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
declare function _base64ToArrayBuffer(v: string): ArrayBufferLike;
declare function _wrappedValue(v: RawValue): WrappedValue;
declare function _rawValue(v: WrappedValue): RawValue;
declare function __injectGlobalObject(name: string, args: string): void;

93
doric-js/lib/index.web.js
View File

@@ -1,40 +1,51 @@
"use strict";
function _binaryValue(v) {
switch (typeof v) {
case "number":
return {
type: "number",
value: v
};
case "string":
return {
type: "string",
value: v
};
case "boolean":
return {
type: "boolean",
value: v
};
case "object":
if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
};
}
else {
return {
type: "object",
value: JSON.stringify(v)
};
}
default:
return {
type: "null",
value: undefined
};
function _arrayBufferToBase64(arrayBuffer) {
let base64 = '';
const encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
const bytes = new Uint8Array(arrayBuffer);
const byteLength = bytes.byteLength;
const byteRemainder = byteLength % 3;
const mainLength = byteLength - byteRemainder;
let a, b, c, d;
let chunk;
// Main loop deals with bytes in chunks of 3
for (var i = 0; i < mainLength; i = i + 3) {
// Combine the three bytes into a single integer
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
// Use bitmasks to extract 6-bit segments from the triplet
a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18
b = (chunk & 258048) >> 12; // 258048 = (2^6 - 1) << 12
c = (chunk & 4032) >> 6; // 4032 = (2^6 - 1) << 6
d = chunk & 63; // 63 = 2^6 - 1
// Convert the raw binary segments to the appropriate ASCII encoding
base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d];
}
// Deal with the remaining bytes and padding
if (byteRemainder == 1) {
chunk = bytes[mainLength];
a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2
// Set the 4 least significant bits to zero
b = (chunk & 3) << 4; // 3 = 2^2 - 1
base64 += encodings[a] + encodings[b] + '==';
}
else if (byteRemainder == 2) {
chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1];
a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10
b = (chunk & 1008) >> 4; // 1008 = (2^6 - 1) << 4
// Set the 2 least significant bits to zero
c = (chunk & 15) << 2; // 15 = 2^4 - 1
base64 += encodings[a] + encodings[b] + encodings[c] + '=';
}
return base64;
}
function _base64ToArrayBuffer(v) {
const binary_string = window.atob(v);
const len = binary_string.length;
const bytes = new Uint8Array(len);
for (let i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
}
function _wrappedValue(v) {
switch (typeof v) {
@@ -54,7 +65,13 @@ function _wrappedValue(v) {
value: v
};
case "object":
if (v instanceof Array) {
if (v instanceof ArrayBuffer) {
return {
type: "arrayBuffer",
value: _arrayBufferToBase64(v)
};
}
else if (v instanceof Array) {
return {
type: "array",
value: JSON.stringify(v)
@@ -87,6 +104,10 @@ function _rawValue(v) {
return JSON.parse(v.value);
}
return v.value;
case "arrayBuffer":
const data = NativeClient.fetchArrayBuffer(v.value);
return _base64ToArrayBuffer(data);
;
default:
return undefined;
}

10
doric-js/lib/src/widget/image.js
View File

@@ -50,12 +50,10 @@ export class Image extends View {
}
toModel() {
const ret = super.toModel();
if (Environment.platform === 'iOS') {
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels");
const pixels = imagePixels.pixels;
imagePixels.pixels = this.callback2Id(() => pixels);
}
return ret;
}

12
doric-js/src/widget/image.ts
View File

@@ -150,14 +150,12 @@ export class Image extends View {
return this.nativeChannel(context, "getImagePixels")()
}
toModel() {
toModel(): NativeViewModel {
const ret = super.toModel()
if (Environment.platform === 'iOS') {
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels")
const pixels = imagePixels.pixels
imagePixels.pixels = this.callback2Id(() => pixels)
}
if (Reflect.has(ret.props, "imagePixels")) {
const imagePixels = Reflect.get(ret.props, "imagePixels")
const pixels = imagePixels.pixels
imagePixels.pixels = this.callback2Id(() => pixels)
}
return ret
}