Commit 9e96a22c authored by liujiangnan's avatar liujiangnan

feat: IOS兼容

parent f93fbb61
...@@ -17,6 +17,9 @@ export function initAir(_this) { ...@@ -17,6 +17,9 @@ export function initAir(_this) {
osmoHandwritingCallback: function (res) { osmoHandwritingCallback: function (res) {
_this.log(`***成功调用osmoHandwritingCallback***参数==${res}`); _this.log(`***成功调用osmoHandwritingCallback***参数==${res}`);
}, },
osmoHandwritingMlkitCallback: function (res) {
_this.log(`***成功调用osmoHandwritingMlkitCallback***参数==${res}`);
},
osmoFingerReadCallback: function (res) { osmoFingerReadCallback: function (res) {
_this.log(`***成功调用osmoFingerReadCallback***参数==${res}`); _this.log(`***成功调用osmoFingerReadCallback***参数==${res}`);
}, },
...@@ -30,12 +33,16 @@ export function initAir(_this) { ...@@ -30,12 +33,16 @@ export function initAir(_this) {
window.air = new Proxy(realAir, { window.air = new Proxy(realAir, {
set: function (target, key, value, receiver) { set: function (target, key, value, receiver) {
let newValue = value; let newValue = value;
if (key == "osmoCallback" || key == "osmoHandwritingCallback" || key == "osmoFingerReadCallback") { if (key == "osmoCallback" || key == "osmoHandwritingCallback" || key == "osmoHandwritingMlkitCallback" || key == "osmoFingerReadCallback") {
newValue = function (res) { newValue = function (res) {
_this.log(`||==成功调用${key}==||参数==${JSON.stringify(res)}`); _this.log(`||==成功调用${key}==||参数==${JSON.stringify(res)}`);
if(typeof(res) == 'string') {
value(res);
} else {
value(JSON.stringify(res)); value(JSON.stringify(res));
} }
} }
}
return Reflect.set(target, key, newValue, receiver); return Reflect.set(target, key, newValue, receiver);
}, },
get: function (target, key, receiver) { get: function (target, key, receiver) {
...@@ -133,8 +140,9 @@ export function initAir(_this) { ...@@ -133,8 +140,9 @@ export function initAir(_this) {
} }
// 结束录音 // 结束录音
window.air.testCallBack = (res) => { window.air.testCallBack = (res) => {
_this.log(`===成功调用testCallBack=== res == ${JSON.stringify(res)}`); res = typeof(res) == 'string' ? res : JSON.stringify(res);
callback && callback(JSON.stringify(res)); _this.log(`===成功调用testCallBack=== res == ${res}`);
callback && callback(res);
window.air.testCallBack = null; window.air.testCallBack = null;
}; };
window.courseware.callOcMethod("stopTest", {}); window.courseware.callOcMethod("stopTest", {});
...@@ -183,6 +191,16 @@ export function initAir(_this) { ...@@ -183,6 +191,16 @@ export function initAir(_this) {
_this.log(`===成功调用closeOsmoHandwriting===`); _this.log(`===成功调用closeOsmoHandwriting===`);
window.courseware.callOcMethod("closeOsmoHandwriting", {}); window.courseware.callOcMethod("closeOsmoHandwriting", {});
}, },
openOsmoHandwritingMlkit(params = {}) {
window.courseware.hasCalledOpenOsmoHandwritingMlkit = true;
_this.log(`===成功调用openOsmoHandwritingMlkit===${JSON.stringify(params)}`);
window.courseware.callOcMethod("openOsmoHandwritingMlkit", params);
},
closeOsmoHandwritingMlkit() {
window.courseware.hasCalledOpenOsmoHandwritingMlkit = false;
_this.log(`===成功调用closeOsmoHandwritingMlkit===`);
window.courseware.callOcMethod("closeOsmoHandwritingMlkit", {});
},
openOsmoFingerRead(params = {}) { openOsmoFingerRead(params = {}) {
window.courseware.hasCalledOpenOsmoFingerRead = true; window.courseware.hasCalledOpenOsmoFingerRead = true;
_this.log(`===成功调用openOsmoFingerRead===${JSON.stringify(params)}`); _this.log(`===成功调用openOsmoFingerRead===${JSON.stringify(params)}`);
...@@ -205,7 +223,7 @@ export function initAir(_this) { ...@@ -205,7 +223,7 @@ export function initAir(_this) {
} else { } else {
console.error('非源生环境'); console.error('非源生环境');
if(method == 'getEngineInfo'){ if(method == 'getEngineInfo'){
window.air.getEngineInfoCallback({isDev: 1, engine_code: 'debug-test-0001'}); window.air.getEngineInfoCallback({isDev: 1});
} }
} }
}, },
...@@ -225,6 +243,9 @@ export function initAir(_this) { ...@@ -225,6 +243,9 @@ export function initAir(_this) {
if (window.courseware.hasCalledOpenOsmoHandwriting) { if (window.courseware.hasCalledOpenOsmoHandwriting) {
window.courseware.closeOsmoHandwriting(); window.courseware.closeOsmoHandwriting();
} }
if (window.courseware.hasCalledOpenOsmoHandwritingMlkit) {
window.courseware.closeOsmoHandwritingMlkit();
}
if (window.courseware.hasCalledOpenOsmoFingerRead) { if (window.courseware.hasCalledOpenOsmoFingerRead) {
window.courseware.closeOsmoFingerRead(); window.courseware.closeOsmoFingerRead();
} }
......
...@@ -97,7 +97,7 @@ cc.Class({ ...@@ -97,7 +97,7 @@ cc.Class({
window.courseware.getEngineInfo(res => { window.courseware.getEngineInfo(res => {
const { isDev, uuid } = JSON.parse(res); const { isDev, uuid } = JSON.parse(res);
console.log('-----------------'); console.log('-----------------');
console.log(`isDev===${isDev} uuid===${uuid}`); console.log(`isDev===${isDev} uuid===${uuid} res===${res}`);
console.log('-----------------'); console.log('-----------------');
if (isDev) { if (isDev) {
// 这里后面给个测试环境地址 // 这里后面给个测试环境地址
......
Markdown is supported
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