Commit a9341fa8 authored by limingzhe's avatar limingzhe

fix: debug

parent 99bbdb88
...@@ -13,6 +13,12 @@ export function initAir(_this) { ...@@ -13,6 +13,12 @@ export function initAir(_this) {
_this.log("***成功调用onCourseInScreen***"); _this.log("***成功调用onCourseInScreen***");
}); });
}, },
recordRealtimeCallBack: function (res) {
_this.log(`***成功调用recordRealtimeCallBack***参数==${res}`);
},
recordWordSpellCallBack: function (res) {
_this.log(`***成功调用recordWordSpellCallBack***参数==${res}`);
},
osmoCallback: function (res) { osmoCallback: function (res) {
_this.log(`***成功调用osmoCallback***参数==${res}`); _this.log(`***成功调用osmoCallback***参数==${res}`);
}, },
...@@ -31,11 +37,14 @@ export function initAir(_this) { ...@@ -31,11 +37,14 @@ export function initAir(_this) {
startScanCodeCallback: null, startScanCodeCallback: null,
needUpdateCallback: null, needUpdateCallback: null,
getEngineInfoCallback: null, getEngineInfoCallback: null,
logFileUploadCallback: null,
takePictureCallBack: null, takePictureCallBack: null,
configurationPortraitCallback: null, configurationPortraitCallback: null,
configurationLandscapeCallback: null, configurationLandscapeCallback: null,
startBuyToAppStoreCallBack: null,
recognitionCameraCallBack: null, recognitionCameraCallBack: null,
testCallBack: null, testCallBack: null,
testConvertCallBack: null,
recordCallBack: null, recordCallBack: null,
onCourseInScreen: null, onCourseInScreen: null,
}; };
...@@ -43,7 +52,7 @@ export function initAir(_this) { ...@@ -43,7 +52,7 @@ 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 == "osmoHandwritingMlkitCallback" || key == "osmoFingerReadCallback") { if (key == "recordWordSpellCallBack" || key == "recordRealtimeCallBack" || 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') { if(typeof(res) == 'string') {
...@@ -152,16 +161,98 @@ export function initAir(_this) { ...@@ -152,16 +161,98 @@ export function initAir(_this) {
window.air.testCallBack = (res) => { window.air.testCallBack = (res) => {
res = typeof(res) == 'string' ? res : JSON.stringify(res); res = typeof(res) == 'string' ? res : JSON.stringify(res);
_this.log(`===成功调用testCallBack=== res == ${res}`); _this.log(`===成功调用testCallBack=== res == ${res}`);
// 录音异常兼容处理
const resObj = JSON.parse(res);
if (resObj.errCode) {
resObj.result = {overall:0};
resObj.audioUrl = "";
res = JSON.stringify(resObj);
_this.showTips(`评测服务信号弱,可能会造成评分不准确,请稍后再来录音评测吧~`);
}
callback && callback(res); callback && callback(res);
window.air.testCallBack = null; window.air.testCallBack = null;
}; };
window.courseware.callOcMethod("stopTest", {}); window.courseware.callOcMethod("stopTest", {});
}, },
startTestConvert(testText, option) {
window.courseware.hasCalledStartTestConvert = true;
_this.log(`===成功调用startTestConvert=== testText == ${testText}`);
window.courseware.callOcMethod("startTestConvert", { ...option, "params": testText });
},
stopTestConvert(testCallback, convertCallback) {
window.courseware.hasCalledStartTestConvert = false;
_this.log(`===成功调用stopTestConvert===`);
if (!testCallback) {
// 不传回调函数就表示取消评测
_this.log(`===成功取消录音评测===`);
window.courseware.callOcMethod("stopTestConvert", { isBreak: 1 });
return;
}
// 结束录音
window.air.testCallBack = (res) => {
res = typeof(res) == 'string' ? res : JSON.stringify(res);
_this.log(`===成功调用testCallBack=== res == ${res}`);
// 录音异常兼容处理
const resObj = JSON.parse(res);
if (resObj.errCode) {
resObj.result = {overall:0};
resObj.audioUrl = "";
res = JSON.stringify(resObj);
_this.showTips(`评测服务信号弱,可能会造成评分不准确,请稍后再来录音评测吧~`);
}
testCallback && testCallback(res);
window.air.testCallBack = null;
};
// 结束变声
window.air.testConvertCallBack = (res) => {
res = typeof(res) == 'string' ? res : JSON.stringify(res);
_this.log(`===成功调用testConvertCallBack=== res == ${res}`);
// 录音异常兼容处理
const resObj = JSON.parse(res);
if (resObj.errCode) {
resObj.convertUrl = "";
res = JSON.stringify(resObj);
_this.showTips(`变声失败,请稍后再来尝试吧~`);
}
convertCallback && convertCallback(res);
window.air.testConvertCallBack = null;
};
window.courseware.callOcMethod("stopTestConvert", {});
},
startRealtimeRecord(params = {}) {
window.courseware.hasCalledRealtimeRecord = true;
_this.log(`===成功调用startRealtimeRecord===${JSON.stringify(params)}`);
window.courseware.callOcMethod("startRealtimeRecord", params);
},
stopRealtimeRecord(params = {}) {
window.courseware.hasCalledRealtimeRecord = false;
_this.log(`===成功调用stopRealtimeRecord===`);
window.courseware.callOcMethod("stopRealtimeRecord", params);
},
startWordSpell(params = {}) {
window.courseware.hasWordSpelling = true;
_this.log(`===成功调用startWordSpell===${JSON.stringify(params)}`);
window.courseware.callOcMethod("startWordSpell", params);
},
stopWordSpell(params = {}) {
window.courseware.hasWordSpelling = false;
_this.log(`===成功调用stopWordSpell===`);
window.courseware.callOcMethod("stopWordSpell", params);
},
// 拍照 // 拍照
takePicture(callback) { takePicture(callback) {
_this.log(`===成功调用takePicture===`); _this.log(`===成功调用takePicture===`);
window.air.takePictureCallBack = (res) => { window.air.takePictureCallBack = (res) => {
if(typeof(res) == 'string') {
callback && callback(res);
} else {
callback && callback(JSON.stringify(res)); callback && callback(JSON.stringify(res));
}
window.air.takePictureCallBack = null; window.air.takePictureCallBack = null;
}; };
window.courseware.callOcMethod("takePicture", {}); window.courseware.callOcMethod("takePicture", {});
...@@ -196,6 +287,23 @@ export function initAir(_this) { ...@@ -196,6 +287,23 @@ export function initAir(_this) {
}; };
window.courseware.callOcMethod("getEngineInfo", {}); window.courseware.callOcMethod("getEngineInfo", {});
}, },
logUpload(callback) {
_this.log(`===成功调用logUpload===`);
// 调用原生获取机器信息
window.air.logFileUploadCallback = (res) => {
if(typeof(res) == 'string') {
callback && callback(res);
} else {
callback && callback(JSON.stringify(res));
}
window.air.logFileUploadCallback = null;
};
window.courseware.callOcMethod("logUpload", {});
},
behaviorToCollectWithParam(event, type="") {
// 埋点所需接口 levelPayForSuccess userRegistrationEvent
window.courseware.callOcMethod("behaviorToCollectWithParam", {event, type});
},
exitApp() { exitApp() {
_this.log(`===成功调用exitApp===`); _this.log(`===成功调用exitApp===`);
window.courseware.callOcMethod("exitApp", {}); window.courseware.callOcMethod("exitApp", {});
...@@ -266,6 +374,17 @@ export function initAir(_this) { ...@@ -266,6 +374,17 @@ export function initAir(_this) {
_this.log(`===成功调用closeOsmoFingerRead===`); _this.log(`===成功调用closeOsmoFingerRead===`);
window.courseware.callOcMethod("closeOsmoFingerRead", {}); window.courseware.callOcMethod("closeOsmoFingerRead", {});
}, },
modifyVideoSpeed(params = {}, callback) {
_this.log(`===成功调用modifyVideoSpeed===`);
window.air.modifyVideoSpeedCallback = (res) => {
_this.log(`===modifyVideoSpeedCallback=== res == ${res}`);
callback && callback(res);
window.air.modifyVideoSpeedCallback = null;
};
window.courseware.callOcMethod("modifyVideoSpeed", params);
},
onConfigurationPortrait(params = {}, callback) { onConfigurationPortrait(params = {}, callback) {
_this.log(`===成功调用onConfigurationPortrait||竖屏===`); _this.log(`===成功调用onConfigurationPortrait||竖屏===`);
window.air.configurationPortraitCallback = (res) => { window.air.configurationPortraitCallback = (res) => {
...@@ -282,11 +401,19 @@ export function initAir(_this) { ...@@ -282,11 +401,19 @@ export function initAir(_this) {
}; };
window.courseware.callOcMethod("onConfigurationLandscape", params); window.courseware.callOcMethod("onConfigurationLandscape", params);
}, },
startBuyToAppStore(params = {}, callback) {
// 苹果支付
_this.log(`===成功调用startBuyToAppStore===`);
window.air.startBuyToAppStoreCallBack = (res) => {
callback && callback(res);
};
window.courseware.callOcMethod("startBuyToAppStore", params);
},
callOcMethod(method, param) { callOcMethod(method, param) {
const paramStr = JSON.stringify(param); const paramStr = JSON.stringify(param);
_this.log(`===成功调用原生方法${method}===参数==${paramStr}`); _this.log(`===成功调用原生方法${method}===参数==${paramStr}`);
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) { if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
return jsb.reflection.callStaticMethod('CocosMng', `${method}:`, paramStr); return jsb.reflection.callStaticMethod('RootViewController', `${method}:`, paramStr);
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) { } else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
return jsb.reflection.callStaticMethod('com/iplayabc/cocos/AppActivity', method, '(Ljava/lang/String;)Ljava/lang/String;', paramStr); return jsb.reflection.callStaticMethod('com/iplayabc/cocos/AppActivity', method, '(Ljava/lang/String;)Ljava/lang/String;', paramStr);
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_WINDOWS) { } else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_WINDOWS) {
...@@ -294,13 +421,17 @@ export function initAir(_this) { ...@@ -294,13 +421,17 @@ export function initAir(_this) {
} else { } else {
console.error(`非源生环境,网页版不支持${method}方法,将返回此方法的Mock数据以便于网页版调试使用`); console.error(`非源生环境,网页版不支持${method}方法,将返回此方法的Mock数据以便于网页版调试使用`);
if(method == 'getEngineInfo'){ if(method == 'getEngineInfo'){
window.air.getEngineInfoCallback({isDev: 1, uuid: 'debug-xxxxxx-xxxxxx'}); window.air.getEngineInfoCallback({isDev: 1, uuid: 'debug-xxxxxx-xxxxxx', version: '1.0.2'});
} else if(method == 'logUpload'){
window.air.logFileUploadCallback({"fileUrl":"abcedfgh","error":""});
} else if (method == 'startTest') { } else if (method == 'startTest') {
} else if (method == 'stopTest') { } else if (method == 'stopTest') {
window.air.testCallBack(testMockData); window.air.testCallBack(testMockData);
} else if (method == 'startRecord') { } else if (method == 'startRecord') {
} else if (method == 'stopRecord') { } else if (method == 'stopRecord') {
window.air.recordCallBack(recordMockData); window.air.recordCallBack(recordMockData);
} else if (method == 'startBuyToAppStore') {
window.air.startBuyToAppStoreCallBack({productid: 1, puid: 22, receiptData: "HelloWorld", error: ""});
} else{ } else{
console.error(`${method}方法还没有Mock数据,请联系技术支持人员添加`); console.error(`${method}方法还没有Mock数据,请联系技术支持人员添加`);
} }
...@@ -313,6 +444,15 @@ export function initAir(_this) { ...@@ -313,6 +444,15 @@ export function initAir(_this) {
if (window.courseware.hasCalledStartTest) { if (window.courseware.hasCalledStartTest) {
window.courseware.stopTest(); window.courseware.stopTest();
} }
if (window.courseware.hasCalledStartTestConvert) {
window.courseware.stopTestConvert();
}
if (window.courseware.hasCalledRealtimeRecord) {
window.courseware.stopRealtimeRecord();
}
if (window.courseware.hasWordSpelling) {
window.courseware.stopWordSpell();
}
if (window.courseware.hasCalledOpenRecognitionCamera) { if (window.courseware.hasCalledOpenRecognitionCamera) {
window.courseware.closeRecognitionCamera(); window.courseware.closeRecognitionCamera();
} }
......
...@@ -20,6 +20,9 @@ export default class NewClass extends middleLayerBase { ...@@ -20,6 +20,9 @@ export default class NewClass extends middleLayerBase {
initAir(this); initAir(this);
this.reWriteAir(); this.reWriteAir();
this.role = 'student'; this.role = 'student';
(<any>window).courseware.getEngineInfo();
} }
async start() { async start() {
......
...@@ -137,6 +137,7 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -137,6 +137,7 @@ export abstract class middleLayerBase extends cc.Component {
console.log(' in loadOnlineBundleNew') console.log(' in loadOnlineBundleNew')
this.callNetworkApiGetNew(`api/template/v2/${bundleName}`, {}, (datastr) => { this.callNetworkApiGetNew(`api/template/v2/${bundleName}`, {}, (datastr) => {
// this.callNetworkApiGet(`api/template/v2/${bundleName}`, {}, (datastr) => { // this.callNetworkApiGet(`api/template/v2/${bundleName}`, {}, (datastr) => {
console.log("callNetworkApiGetNew callback ..");
const data = JSON.parse(datastr).data; const data = JSON.parse(datastr).data;
let sceneName, version, bondleUrl = ""; let sceneName, version, bondleUrl = "";
...@@ -566,6 +567,8 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -566,6 +567,8 @@ export abstract class middleLayerBase extends cc.Component {
queryStr = ''; queryStr = '';
} }
const url = `${engineInfo["apiBase"]}${uri}${queryStr}`; const url = `${engineInfo["apiBase"]}${uri}${queryStr}`;
console.log("callNetworkApiGetNew url = " + url);
// 如果请求失败 最多尝试5次重连 // 如果请求失败 最多尝试5次重连
for(let i=0; i<5; i++) { for(let i=0; i<5; i++) {
const result = await this.newXMLHttpRequest(url, token) const result = await this.newXMLHttpRequest(url, token)
...@@ -582,6 +585,8 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -582,6 +585,8 @@ export abstract class middleLayerBase extends cc.Component {
ENGINE_INFO; ENGINE_INFO;
getEngineInfo() { getEngineInfo() {
console.log(' in getEngineInfo')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.ENGINE_INFO) { if (this.ENGINE_INFO) {
resolve(this.ENGINE_INFO); resolve(this.ENGINE_INFO);
...@@ -598,6 +603,8 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -598,6 +603,8 @@ export abstract class middleLayerBase extends cc.Component {
return; return;
} }
const engineInfo = JSON.parse((<any>window).air.engineInfo); const engineInfo = JSON.parse((<any>window).air.engineInfo);
console.log(" engineInfo :" + JSON.stringify(engineInfo));
if (engineInfo.isDev == 1) { if (engineInfo.isDev == 1) {
engineInfo.domain = "http://staging-teach.cdn.ireadabc.com/"; engineInfo.domain = "http://staging-teach.cdn.ireadabc.com/";
engineInfo.apiBase = 'http://staging-jianj.iteachabc.com'; engineInfo.apiBase = 'http://staging-jianj.iteachabc.com';
......
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