Skip to content
GitLab
Commit 1b099e91 authored by limh's avatar limh
Browse files

Merge branch 'sys_new' of http://ser.yinengyun.com:10082/tech/pi_sys into sys_new

parents 98b87744 2cac3c50
Hide whitespace changes
Inline Side-by-side
Showing
with 235 additions and 100 deletions
+235 -100
src/minigame/code_adapter/window.ts
+ 13
- 9
View file @ 1b099e91
......@@ -8,6 +8,10 @@ export { default as document } from './document';
import { addListener, removeListener, dispatchEvent as dispatchEvent1 } from 'pi_sys/native/base/event';
import * as Mixin from "./minx";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
const { platform } = wx.getSystemInfoSync()
export const addEventListener = addListener;
......@@ -15,25 +19,25 @@ export const removeEventListener = removeListener;
export const dispatchEvent = dispatchEvent1;
export const alert = (msg: any) => {
console.log(msg);
logger.debug(msg);
}
// console.time, console.timeEnd
// logger.time, logger.timeEnd
if (platform !== 'devtools') {
const wxPerf = wx.getPerformance ? wx.getPerformance() : Date;
const consoleTimers = {};
console.time = function (name) {
logger.time = function (name) {
consoleTimers[name] = wxPerf.now();
};
console.timeEnd = function (name) {
logger.timeEnd = function (name) {
const timeStart = consoleTimers[name];
if (!timeStart) {
return;
}
const timeElapsed = wxPerf.now() - timeStart;
console.log(name + ": " + timeElapsed / 1000 + "ms");
logger.debug(name + ": " + timeElapsed / 1000 + "ms");
delete consoleTimers[name];
};
}
......@@ -155,13 +159,13 @@ class EventTarget {
events[type].push(listener)
if (options.capture) {
// console.warn('EventTarget.addEventListener: options.capture is not implemented.')
// logger.warn('EventTarget.addEventListener: options.capture is not implemented.')
}
if (options.once) {
// console.warn('EventTarget.addEventListener: options.once is not implemented.')
// logger.warn('EventTarget.addEventListener: options.once is not implemented.')
}
if (options.passive) {
// console.warn('EventTarget.addEventListener: options.passive is not implemented.')
// logger.warn('EventTarget.addEventListener: options.passive is not implemented.')
}
}
......@@ -350,7 +354,7 @@ class XMLHttpRequest1 extends EventTarget {
if (relative) {
// 用户即使没监听error事件, 也给出相应的警告
console.warn(errMsg)
logger.warn(errMsg)
}
}
......
src/minigame/load/down_load.ts
+ 17
- 13
View file @ 1b099e91
......@@ -9,6 +9,10 @@ import { WX_DEPEND_MGR } from "../wx/wxdepend";
import { FileSys } from "../wx/filesys";
import { DownloadBase } from "pi_sys/load/down_load_base";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
/**
* 优先处理 配置类型文件
* 配置类型文件
......@@ -46,12 +50,12 @@ export class Download extends DownloadBase {
if (st !== SuffixType.RES && st !== SuffixType.OBJ) {
if (!WX_DEPEND_MGR.checkRequireMainSize(info.size)) {
this.tempCfgFiles.set(info.path, info);
console.log(`tempCfg - ${info.path}`);
logger.debug(`tempCfg - ${info.path}`);
}
else {
WX_DEPEND_MGR.requireMainSize(info.size)
this.mainCfgFiles.set(info.path, info);
console.log(`mainCfg - ${info.path}`);
logger.debug(`mainCfg - ${info.path}`);
}
}
});
......@@ -62,23 +66,23 @@ export class Download extends DownloadBase {
if (st === SuffixType.RES) {
if (!WX_DEPEND_MGR.checkRequireMainResSize(info.size)) {
this.tempResFiles.set(info.path, info);
console.log(`tempRes - ${info.path}`);
logger.debug(`tempRes - ${info.path}`);
}
else {
WX_DEPEND_MGR.requireMainResSize(info.size)
this.mainResFiles.set(info.path, info);
console.log(`mainRes - ${info.path}`);
logger.debug(`mainRes - ${info.path}`);
}
}
else if (st === SuffixType.OBJ) {
if (!WX_DEPEND_MGR.checkRequireMainResSize(info.size)) {
this.tempResFiles.set(info.path, info);
console.log(`tempRes - ${info.path}`);
logger.debug(`tempRes - ${info.path}`);
}
else {
WX_DEPEND_MGR.requireMainResSize(info.size)
this.mainObjFiles.set(info.path, info);
console.log(`mainObj - ${info.path}`);
logger.debug(`mainObj - ${info.path}`);
}
}
});
......@@ -100,7 +104,7 @@ export class Download extends DownloadBase {
// 先构建一个目录树，目录内再构建一个后缀表
for (let info of files.values()) {
// console.warn('main ' + info.path);
// logger.warn('main ' + info.path);
Depend.InitDir(info, map, true);
}
let fileDirTree = map.get(``);
......@@ -132,7 +136,7 @@ export class Download extends DownloadBase {
FileLoadParam.localStore.write(Sign.SIGN_KEY, FileLoadParam.localSign);
}
).catch((e) => {
console.warn(e);
logger.warn(e);
});
return 0;
......@@ -165,8 +169,8 @@ export class Download extends DownloadBase {
return 0;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
......@@ -194,8 +198,8 @@ export class Download extends DownloadBase {
return 0;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
......@@ -234,7 +238,7 @@ export class Download extends DownloadBase {
return 0;
}).catch(() => {
console.warn(`临时文件丢失 ${info.path}`);
logger.warn(`临时文件丢失 ${info.path}`);
return 0;
});
......
src/minigame/load/object_load.ts
+ 18
- 14
View file @ 1b099e91
......@@ -14,6 +14,10 @@ import type { TloadAudio, TloadFile, TloadFont, TloadImage } from 'pi_sys/load/i
import { PiImage } from 'pi_sys/render/image';
import { PiAudio } from 'pi_sys/media/audio';
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
// ============================== 导出
const Suffixs = {
......@@ -86,8 +90,8 @@ export const loadFont: TloadFont = (filePath: string, args: [IParamPiFont?]) =>
if (info) {
const writing = FileLoadParam.localStore.queryWritingFile(filePath);
console.warn('font ' + filePath);
console.warn(writing);
logger.warn('font ' + filePath);
logger.warn(writing);
if (writing) {
writing.then(() => {
const localPath = FileSys.fullLocalPath(FileSys.formatMainPath(filePath));
......@@ -188,11 +192,11 @@ function loadFileWithFileSys(file: IFileDependInfo): Promise<string> {
WX_DEPEND_MGR.changeTempPath(file, localPath);
WX_DEPEND_MGR.writeDepend();
// console.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
// logger.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
return localPath;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
}
......@@ -214,11 +218,11 @@ function loadFileWithFileSys(file: IFileDependInfo): Promise<string> {
WX_DEPEND_MGR.changeTempPath(file, localPath);
WX_DEPEND_MGR.writeDepend();
// console.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
// logger.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
return localPath;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
break;
......@@ -232,12 +236,12 @@ function loadFileWithFileSys(file: IFileDependInfo): Promise<string> {
WX_DEPEND_MGR.addMain(file);
WX_DEPEND_MGR.writeDepend();
// console.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
// logger.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
return localPath;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
break;
......@@ -256,12 +260,12 @@ function loadFileWithFileSys(file: IFileDependInfo): Promise<string> {
WX_DEPEND_MGR.addMain(file);
WX_DEPEND_MGR.writeDepend();
// console.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
// logger.warn(`FileSys.download success ${file.path} - ${file.size} - ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
return localPath;
}).catch((e) => {
console.warn(`FileSys.download fail`);
console.warn(e);
logger.warn(`FileSys.download fail`);
logger.warn(e);
return e;
});
break;
......
src/minigame/load/package_load.ts
+ 6
- 2
View file @ 1b099e91
import { FileLoad } from 'pi_sys/load/file_load';
import { Env } from 'pi_sys/util/env';
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export class PackageLoad extends FileLoad {
// 多个加载文件
public packages: Set<string> = new Set();
......@@ -68,11 +72,11 @@ const loadSubPkg = (
errText?: string,
i?: number
) => {
console.log("加载分包开始：", pkgName);
logger.debug("加载分包开始：", pkgName);
const task = wx.loadSubpackage({
name: pkgName,
success: () => {
console.log("加载分包成功：", pkgName);
logger.debug("加载分包成功：", pkgName);
load.loaded += 1000;
callback();
},
......
src/minigame/native/base/app_impl.ts
+ 11
- 8
View file @ 1b099e91
......@@ -4,6 +4,9 @@
import { FlagAppLife, ISdkInfo, TexitApp, TgetFlavorName, TgetPackageName, TgetSdkInfo, TgetVersionCode, TgetVersionName, ToffDestroy, ToffHide, ToffShow, TonDestroy, TonHide, TonShow, TregisterAppLifeListener, TtriggerGC, TunregisterAppLifeListener } from "pi_sys/native/base/app";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export const exitApp: TexitApp = () => { }
......@@ -38,7 +41,7 @@ let registerMode = 0; // 注册模式 0 初始 1 registerAppLifeListener 2 onX
let funcs: Set<Function>;
export const registerAppLifeListener: TregisterAppLifeListener = (callback: (flag: FlagAppLife) => void) => {
if (registerMode === 2) {
console.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
logger.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
return;
}
registerMode = 1;
......@@ -56,7 +59,7 @@ export const registerAppLifeListener: TregisterAppLifeListener = (callback: (fla
export const unregisterAppLifeListener: TunregisterAppLifeListener = (callback: (flag: FlagAppLife) => void) => {
if (registerMode === 2) {
console.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
logger.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
return;
}
if (!funcs) return;
......@@ -76,7 +79,7 @@ export const unregisterAppLifeListener: TunregisterAppLifeListener = (callback:
export const onShow: TonShow = (callback: () => void) => {
if (registerMode === 1) {
console.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
logger.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
return;
}
registerMode = 2;
......@@ -85,7 +88,7 @@ export const onShow: TonShow = (callback: () => void) => {
export const onHide: TonHide = (callback: () => void) => {
if (registerMode === 1) {
console.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
logger.warn(`registerAppLifeListener and (onShow & onHide & onDestroy) only use one of them!!!`);
return;
}
registerMode = 2;
......@@ -93,12 +96,12 @@ export const onHide: TonHide = (callback: () => void) => {
};
export const onDestroy: TonDestroy = (callback: () => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
};
export const offShow: ToffShow = (callback?: () => void) => {
if (registerMode === 1) {
console.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
logger.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
return;
}
wx.offShow(callback);
......@@ -106,12 +109,12 @@ export const offShow: ToffShow = (callback?: () => void) => {
export const offHide: ToffHide = (callback?: () => void) => {
if (registerMode === 1) {
console.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
logger.warn(`unregisterAppLifeListener and (offShow & offHide & offDestroy) only use one of them!!!`);
return;
}
wx.offHide(callback);
};
export const offDestroy: ToffDestroy = (callback?: () => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
};
src/minigame/native/device/battery_impl.ts
+ 7
- 4
View file @ 1b099e91
import { BatteryInfo, BatteryLevel, TgetInfo, ToffChargingChange, ToffLevelChange, TonChargingChange, TonLevelChange } from "pi_sys/native/device/battery";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export const getInfo: TgetInfo = (): Promise<BatteryInfo> => {
return new Promise((resolve, reject) => {
......@@ -13,17 +16,17 @@ export const getInfo: TgetInfo = (): Promise<BatteryInfo> => {
}
export const onLevelChange: TonLevelChange = (callback: (level: BatteryLevel) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
export const offLevelChange: ToffLevelChange = (callback?: (level: BatteryLevel) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
export const onChargingChange: TonChargingChange = (callback: (isCharging: boolean) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
export const offChargingChange: ToffChargingChange = (callback?: (isCharging: boolean) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
\ No newline at end of file
src/minigame/native/device/keyboard_impl.ts
+ 9
- 5
View file @ 1b099e91
......@@ -5,6 +5,10 @@
import { KeyboardConfig, Thide, ToffComplete, ToffConfirm, ToffInput, TonComplete, TonConfirm, TonInput, Tshow, Tupdate } from "pi_sys/native/device/keyboard"
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
// // // 通知键盘监听函数
// // const keyboardNotify = (notifier: Function, params: string) => {
// // if (notifier && notifier instanceof Function) {
......@@ -50,7 +54,7 @@ import { KeyboardConfig, Thide, ToffComplete, ToffConfirm, ToffInput, TonComplet
// };
// delete config.attribute;
// wx.showKeyboard(config);
// console.log(config);
// logger.debug(config);
// bindListener();
// }
// }
......@@ -58,24 +62,24 @@ import { KeyboardConfig, Thide, ToffComplete, ToffConfirm, ToffInput, TonComplet
// // 隐藏键盘
// export const hide = (p: any) => {
// wx.hideKeyboard(p);
// console.warn("hidden");
// logger.warn("hidden");
// };
// // 更新键盘
// export const update = (p) => {
// wx.updateKeyboard(p);
// console.warn("update");
// logger.warn("update");
// };
// export const onInput = (callback: ({value: string}) => void) => {
// inputListenerList.push(callback);
// console.warn("onInput");
// logger.warn("onInput");
// }
// export const onComplete = (callback: ({value: string}) => void) => {
// completeListenerList.push(callback);
// console.warn("onComplete");
// logger.warn("onComplete");
// }
// const inputListener = (r: {value: string}) => {
......
src/minigame/native/device/location_impl.ts
+ 8
- 4
View file @ 1b099e91
import { LocationInfo, TgetLocation, ToffChange, TonChange, Tstart, Tstop } from "pi_sys/native/device/location";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export const getLocation: TgetLocation = (type: string, altitude: string, isHighAccuracy: boolean, highAccuracyExpireTime: number): Promise<LocationInfo> => {
return new Promise((resolve, reject) => {
wx.getLocation({
......@@ -14,19 +18,19 @@ export const getLocation: TgetLocation = (type: string, altitude: string, isHigh
}
export const start: Tstart = () => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
return Promise.resolve();
};
export const stop: Tstop = () => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
return Promise.resolve();
};
export const onChange: TonChange = (callback: (data: LocationInfo) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
export const offChange: ToffChange = (callback: (data: LocationInfo) => void) => {
console.warn("微信小游戏不支持");
logger.warn("微信小游戏不支持");
}
\ No newline at end of file
src/minigame/render/font_impl.ts
+ 7
- 3
View file @ 1b099e91
import { IParamPiFont, IPiFont } from "pi_sys/render/font";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export class PiFont implements IPiFont {
/**
* 加载参数
......@@ -34,7 +38,7 @@ export class PiFont implements IPiFont {
if (!this.arg || !this.arg.family) {
const reason = "PiFont set src failed, arg.family not set yet";
console.warn(reason);
logger.warn(reason);
this.onerror && this.onerror(reason);
return;
}
......@@ -45,13 +49,13 @@ export class PiFont implements IPiFont {
if (family === null) {
// 根据 wx.loadFont 文档，返回null代表错误；
const reason = "wx.loadFont return null for font-family";
console.warn(reason);
logger.warn(reason);
this.onerror && this.onerror(reason);
} else if (family !== this.arg.family) {
// 字体文件的fontfamily 和 高层想用的 不一致，直接报错；
// 注：小游戏不支持FontFace，不支持多个font-family；
const reason = `wx.loadFont return ${family}, but app expectd ${this.arg.family}`;
console.warn(reason);
logger.warn(reason);
this.onerror && this.onerror(reason);
} else {
// 成功
......
src/minigame/store/store.ts
+ 11
- 7
View file @ 1b099e91
......@@ -8,6 +8,10 @@ import { WX_DEPEND_MGR } from "../wx/wxdepend";
import { Depend } from "pi_sys/util/depend";
import { IPiStoreBase } from "pi_sys/store/store_base";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
/**
* 一个 Store 对应 一个 WriteFileQueue
* WriteFileQueue 写入路径 依赖 Store.dbName tabName
......@@ -237,11 +241,11 @@ export class Store implements IPiStoreBase {
key: key,
data: JSON.stringify({ type, data }),
fail(e) {
console.log("setStorage fail");
logger.debug("setStorage fail");
reject(e);
},
success() {
console.log("setStorage success");
logger.debug("setStorage success");
resolve(null);
}
......@@ -401,9 +405,9 @@ export class Store implements IPiStoreBase {
} else {
wx.getStorageInfo({
success(res) {
// console.log(res.keys)
// console.log(res.currentSize)
// console.log(res.limitSize)
// logger.debug(res.keys)
// logger.debug(res.currentSize)
// logger.debug(res.limitSize)
const keys = res.keys;
const p: Promise<any>[] = [];
keys.forEach(key => {
......@@ -461,11 +465,11 @@ function readStorage(key: string) {
wx.getStorage({
key,
fail(e) {
console.log("getStorage fail", e, key);
logger.debug("getStorage fail", e, key);
reject(e);
},
success(r) {
console.log("getStorage success", r, key);
logger.debug("getStorage success", r, key);
try {
// 只要是项目传过来的，一定是 json字符串
......
src/minigame/wx/filesys.ts
+ 8
- 4
View file @ 1b099e91
......@@ -2,6 +2,10 @@ import { IFileDependInfo } from "pi_sys/util/depend_base";
import { Env } from "pi_sys/util/env";
import { WX_DEPEND_MGR } from "./wxdepend";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
var systemInfo = wx.getSystemInfoSync();
interface UserFileList {
dir: string[];
......@@ -188,7 +192,7 @@ export namespace FileSys {
fs.rmdirSync(dir, true);
}
} catch (err) {
console.warn("clearDirSync:", dir, err);
logger.warn("clearDirSync:", dir, err);
}
}
/**
......@@ -317,8 +321,8 @@ export namespace FileSys {
resolve(r);
},
fail: (err) => {
console.warn(`异步写文件失败 ${filePath}`);
console.warn(`已记录写文件大小 ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
logger.warn(`异步写文件失败 ${filePath}`);
logger.warn(`已记录写文件大小 ${WX_DEPEND_MGR.getUsedMainAllSize()}`);
reject(err);
}
});
......@@ -371,7 +375,7 @@ export namespace FileSys {
}
},
fail: (e) => {
console.warn(e);
logger.warn(e);
reject(e)
}
});
......
src/minigame/wx/webgl.ts
+ 9
- 6
View file @ 1b099e91
/**
* WEBGL 基本处理
*/
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export interface WebGLInstanceOpt {
canvas: HTMLCanvasElement;
}
......@@ -101,7 +104,7 @@ export class ShaderCfg {
gl.compileShader(this.vshader);
if (!gl.getShaderParameter(this.vshader, gl.COMPILE_STATUS)) {
console.error(`ERROR IN 'VERTEX_SHADER' SHADER: ${ gl.getShaderInfoLog(this.vshader) }`);
logger.error(`ERROR IN 'VERTEX_SHADER' SHADER: ${ gl.getShaderInfoLog(this.vshader) }`);
return this.vshader;
}
......@@ -122,7 +125,7 @@ export class ShaderCfg {
gl.compileShader(this.fshader);
if (!gl.getShaderParameter(this.fshader, gl.COMPILE_STATUS)) {
console.error(`ERROR IN 'FRAGMENT_SHADER' SHADER: ${ gl.getShaderInfoLog(this.fshader) }`);
logger.error(`ERROR IN 'FRAGMENT_SHADER' SHADER: ${ gl.getShaderInfoLog(this.fshader) }`);
return this.fshader;
}
......@@ -317,7 +320,7 @@ export class TextureInstance {
// };
// img.src = path;
} catch (e) {
console.error(e);
logger.error(e);
}
}
public static loaded = (img: HTMLImageElement, fname: string, engine: WebGLInstance) => {
......@@ -427,7 +430,7 @@ export class WebGLInstance {
}
}
} catch (error) {
console.warn(`There is not webgl compatible :( `);
logger.warn(`There is not webgl compatible :( `);
}
return gl;
......@@ -473,7 +476,7 @@ export class WebGLInstance {
}
public renderLoop(timestamp: number) {}
public destroy() {
console.log('Progress WebGL destroy.');
logger.debug('Progress WebGL destroy.');
this._isDestroy = true;
this.textureMap.forEach((tex) => {
this.delTexture(tex);
......
src/minigame/wx/write_file_queue.ts
+ 15
- 15
View file @ 1b099e91
......@@ -2,9 +2,9 @@ import { FileSys } from '../wx/filesys';
import { WX_DEPEND_MGR } from '../wx/wxdepend';
import { IFileDependInfo } from 'pi_sys/util/depend_base';
/**
*
*/
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export interface IFileWriteInfo {
data: ArrayBuffer | Uint8Array;
......@@ -55,7 +55,7 @@ export class WriteFileQueue {
}
this.writing = true;
console.log('store write start', this.queue.size);
logger.debug('store write start', this.queue.size);
this.writeNext();
}
......@@ -66,7 +66,7 @@ export class WriteFileQueue {
* @param data
*/
private write(fileInfo: IFileDependInfo, data: ArrayBuffer | Uint8Array) {
console.log('=========== Write File:', this.queue.size, fileInfo.path);
logger.debug('=========== Write File:', this.queue.size, fileInfo.path);
// 发起写入时立即修改主目录占用的空间记录 - 失败时去除 : 默认成功,这样实际失败了，但没有获得失败的响应的情况下,记录的剩余空间大小不会大于实际剩余空间大小
// localStorage.dbSize += data.byteLength;
......@@ -91,8 +91,8 @@ export class WriteFileQueue {
// TODO: 文件写入本地用户目录后
// this.store.db[""][wxpath] = this.signMap.get(wxpath);
// delete this.store.db[wxpath];
// console.warn('writesuccess ' + fileInfo.path);
// console.warn('-----------> ' + wxpath);
// logger.warn('writesuccess ' + fileInfo.path);
// logger.warn('-----------> ' + wxpath);
this.writeSuccCall(fileInfo.path);
})
// 虽然发起下载时可以写入，但最终结果还是失败了
......@@ -106,13 +106,13 @@ export class WriteFileQueue {
this.oneFileComplete();
console.error(`writeFile FAIL ${fileInfo.path} : ${data.byteLength}/${WX_DEPEND_MGR.getUsedMainAllSize()}`);
console.error(e);
logger.error(`writeFile FAIL ${fileInfo.path} : ${data.byteLength}/${WX_DEPEND_MGR.getUsedMainAllSize()}`);
logger.error(e);
});
}
public writeData(path: string, data: ArrayBuffer | Uint8Array) {
console.log('=========== Write Data:', path);
logger.debug('=========== Write Data:', path);
// 发起写入时立即修改主目录占用的空间记录 - 失败时去除 : 默认成功,这样实际失败了，但没有获得失败的响应的情况下,记录的剩余空间大小不会大于实际剩余空间大小
// localStorage.dbSize += data.byteLength;
......@@ -131,7 +131,7 @@ export class WriteFileQueue {
// depend 信息在成功/失败时修改
// this.store.files.add(wxpath);
// WX_DEPEND_MGR.addMain(fileInfo);
console.log('=========== Write Data Succ:', path);
logger.debug('=========== Write Data Succ:', path);
// TODO: 文件写入本地用户目录后
// this.store.db[""][wxpath] = this.signMap.get(wxpath);
......@@ -143,7 +143,7 @@ export class WriteFileQueue {
// this.signMap.delete(path);
// WX_DEPEND_MGR.deleteMain(fileInfo.path);
console.log('=========== Write Data Fail:', path);
logger.debug('=========== Write Data Fail:', path);
this.oneFileComplete(true);
// localStorage.dbSize -= data.byteLength;
// WX_DEPEND_MGR.updateMainSize(-data.byteLength);
......@@ -155,7 +155,7 @@ export class WriteFileQueue {
this.concurrent--;
clearTimeout(this.timer);
// console.warn(`write file ${this.concurrent} wait...`);
// logger.warn(`write file ${this.concurrent} wait...`);
this.timer = setTimeout(() => {
this.writeNext();
......@@ -169,7 +169,7 @@ export class WriteFileQueue {
this.timer = null;
this.writing = false;
WX_DEPEND_MGR.writeDepend();
console.log('write file queue is clean');
logger.debug('write file queue is clean');
}
private writeNext() {
......@@ -192,7 +192,7 @@ export class WriteFileQueue {
const { info: fileInfo, data } = writeInfo;
if (data.byteLength + WX_DEPEND_MGR.getUsedMainAllSize() > WX_DEPEND_MGR.getMaxMainAllSize()) {
console.warn(`本地空间不足`);
logger.warn(`本地空间不足`);
return this.allFilesComplete();
}
......
src/pi_sys/load/batch_load.ts
+ 6
- 3
View file @ 1b099e91
......@@ -11,7 +11,10 @@ import { loadFile, processValue } from "./batch_load_hook";
import { Depend } from "../util/depend";
import { IDirDependInfo, IFileDependInfo } from "../util/depend_base";
import { PackageLoad } from "./package_load";
import { canUseWasm } from "../util/mod";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
// 加载策略，用于batchload，做预处理到内存的策略
......@@ -111,7 +114,7 @@ export class BatchLoad extends FileLoad {
if (info)
this.loadFile(info, onlyDown, localload, download, codeload, objload, arr);
else {
console.warn("batchload, invalid file, ", s);
logger.warn("batchload, invalid file, ", s);
}
}
}
......@@ -147,7 +150,7 @@ export class BatchLoad extends FileLoad {
}
).catch(
(reason: any) => {
console.error("pi_sys, BatchLoad failed, reason = ", reason);
logger.error("pi_sys, BatchLoad failed, reason = ", reason);
this.onResult(null, reason);
}
);
......
src/pi_sys/load/batch_load_hook.ts
+ 5
- 1
View file @ 1b099e91
......@@ -8,6 +8,10 @@ import { LocalLoad } from "./local_load";
import { BatchLoad, LoadPolicy } from "./batch_load";
import { IFileDependInfo } from "../util/depend_base";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export const loadFile = (
batchLoad: BatchLoad,
file: IFileDependInfo,
......@@ -25,7 +29,7 @@ export const loadFile = (
let [suffix, st] = getLoadSuffixInfo(file.path);
if (!st) {
return console.warn(`batch load, invalid suffix, file: ${file.path}`);
return logger.warn(`batch load, invalid suffix, file: ${file.path}`);
}
switch (st) {
......
src/pi_sys/load/cfg_tools.ts
+ 5
- 1
View file @ 1b099e91
......@@ -2,6 +2,10 @@ import { SuffixType, FileLoadParam, getLoadSuffixInfo } from "./fileload_base";
import { BaseTools } from "../util/base_tools";
import { ResCacheMap } from "./res_cache"
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
/**
* 配置处理表
*/
......@@ -61,7 +65,7 @@ export let setCfgHandler = (suffix: string, handler: (file: string, data: Uint8A
export const handleBinMap = (map: void | Map<string, Uint8Array>) => {
if (!map) {
const reason = "pi_sys, handleBinMap, map = null";
console.error(reason);
logger.error(reason);
throw new Error(reason);
}
......
src/pi_sys/load/local_load.ts
+ 5
- 1
View file @ 1b099e91
......@@ -3,6 +3,10 @@ import * as Sign from "./sign";
import { Asset } from "../store/asset";
import { FileLoadParam } from "./fileload_base";
import { Logger } from "pi_sys/util/logger";
declare var module;
let logger = new Logger(module.name, "sys");
export class LocalLoad extends FileLoad {
/**
* @description 开始
......@@ -30,7 +34,7 @@ export class LocalLoad extends FileLoad {
this.onResult(map);
return map;
}).catch((reason) => {
console.error("pi_sys, LoadLoad failed, reason = ", reason);
logger.error("pi_sys, LoadLoad failed, reason = ", reason);
this.onResult(null, reason);
});
}
......
src/pi_sys/native/base/log.ts 0 → 100644
+ 31
- 0
View file @ 1b099e91
export * from "./log_impl";
export enum LogLevel {
Verbose = 0,
Debug = 1,
Info = 2,
Warn = 3,
Error = 4
}
export type TnotifySendLog = (indexOfLogFile: number, userName: string) => Promise<void>;
/**
* 设置日志落地的最低等级,包含该等级.
* @param level 默认 LogLevel.Debug
*/
export type TsetLocalLogLevel = (level: LogLevel) => Promise<void>;
/**
* 设置AndroidStudio控制台日志显示的最低等级,包含该等级.
* @param level 默认 LogLevel.Info
* @returns
*/
export type TsetConsoleLogLevel = (level: LogLevel) => Promise<void>;
/**
* 是否开启日志落地
* @param isOpen 默认：true
* @returns
*/
export type TsetLogLocal = (isOpen: boolean) => Promise<void>;
\ No newline at end of file
src/pi_sys/native/base/log_impl.ts 0 → 100644
+ 39
- 0
View file @ 1b099e91
import { LogLevel, TnotifySendLog, TsetConsoleLogLevel, TsetLocalLogLevel, TsetLogLocal } from "./log";
/**
* 读取单个落地日志文件的内容,并上传到服务器.
* @param indexOfLogFile 日志文件索引(0表示最新日志,1表示上一天日志文件..)
* @param userName 标识符(后台用来区分是那个用户的日志,建议填写用户名)
* @note 调用这个函数，服务器对应的 日志名：${userName}_20210707.log
* @note 底层异常主动上传，服务器对应的 日志名：DeviceID_${deviceId}_20210707.log
*/
export const notifySendLog: TnotifySendLog = (indexOfLogFile: number, userName: string) => {
return Promise.resolve();
}
/**
* 设置日志落地的最低等级,包含该等级.
* @param level 默认 LogLevel.Debug
*/
export const setLocalLogLevel: TsetLocalLogLevel = (level: LogLevel) => {
return Promise.resolve();
}
/**
* 设置AndroidStudio控制台日志显示的最低等级,包含该等级.
* @param level 默认 LogLevel.Info
* @returns
*/
export const setConsoleLogLevel: TsetConsoleLogLevel = (level: LogLevel) => {
return Promise.resolve();
}
/**
* 是否开启日志落地
* @param isOpen 默认：true
* @returns
*/
export const setLogLocal: TsetLogLocal = (isOpen: boolean) => {
return Promise.resolve();
}
\ No newline at end of file
src/pi_sys/native/index.ts
+ 5
- 0
View file @ 1b099e91
......@@ -29,6 +29,7 @@ import * as _Location from "./device/location";
import * as _QRCode from "./device/qrcode";
import * as _MemoryWarning from "./device/memorywarning";
import * as _VoIPChat from "./device/voipchat";
import * as _Log from "./base/log";
export namespace Native {
export const Vibrate = _Vibrate;
......@@ -50,6 +51,10 @@ export namespace Native {
* @note 目前 仅 Android-APK 有效
*/
export const AutoTest = _AutoTest;
/**
* @note 目前 仅 Android-APK 有效
*/
export const Log = _Log;
// export const Asset = _Asset;
// export const File = _File;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment