Commit 7f22a4bd authored by limingzhe's avatar limingzhe

fix: 标题 语法bug

parent e5f1c4f8
...@@ -23,7 +23,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -23,7 +23,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
isCopy: true, isCopy: true,
select: [ select: [
// {label: '评测', value: 'ai'}, {label: '评测', value: 'ai'},
{label: '日期', value: 'date'}, {label: '日期', value: 'date'},
{label: '时间', value: 'time'}, {label: '时间', value: 'time'},
......
...@@ -873,16 +873,24 @@ export class RichText extends Label { ...@@ -873,16 +873,24 @@ export class RichText extends Label {
} }
getSubTextRectGroup(text, targetIndex = 0) { getSubTextRectGroup(text, targetIndex = 0) {
console.log('!!!wordBgData: ', this.wordBgData);
const rectGroup = []; const rectGroup = [];
const subTextArr = text.split(' '); const subTextArr = text.split(' ');
let baseIndex = targetIndex; let baseIndex = targetIndex;
console.log('subTextArr: ', subTextArr); console.log('subTextArr: ', subTextArr);
for (let i=0; i<subTextArr.length; i++) { for (let i=0; i<subTextArr.length; i++) {
const subtText = subTextArr[i]; const subText = subTextArr[i];
const subData = this.getSubTextRect(subtText, baseIndex) if (!subText) {
continue;
}
const subData = this.getSubTextRect(subText, baseIndex)
if (subData) { if (subData) {
console.log('baseIndex1 : ', baseIndex);
rectGroup.push(subData); rectGroup.push(subData);
baseIndex = Number( subData.index ); baseIndex = Number( subData.index ) + subData.text.length;
console.log('baseIndex2 : ', baseIndex);
} }
} }
...@@ -911,15 +919,16 @@ export class RichText extends Label { ...@@ -911,15 +919,16 @@ export class RichText extends Label {
tmpLabel.fontWeight = this.fontWeight; tmpLabel.fontWeight = this.fontWeight;
tmpLabel.width = this.width; tmpLabel.width = this.width;
tmpLabel.height = this.height; tmpLabel.height = this.height;
console.log('subText: ', subText); // console.log('subText: ', subText);
console.log('this.text: ', this.text); // console.log('this.text: ', this.text);
// console.log('targetIndex: ', targetIndex);
// const indexArr = searchSubStr(this.text, subText); // const indexArr = searchSubStr(this.text, subText);
// console.log('indexArr: ', indexArr); // console.log('indexArr: ', indexArr);
// const index = indexArr[targetIndex]; // const index = indexArr[targetIndex];
const index = this.text.indexOf(subText, targetIndex); const index = this.text.indexOf(subText, targetIndex);
console.log('index: ', index); // console.log('index: ', index);
if (index == -1) { if (index == -1) {
return; return;
} }
...@@ -931,7 +940,7 @@ export class RichText extends Label { ...@@ -931,7 +940,7 @@ export class RichText extends Label {
const data = this.wordBgData[index.toString()]; const data = this.wordBgData[index.toString()];
// console.log('!!!wordBgData: ', this.wordBgData); // console.log('!!!wordBgData: ', this.wordBgData);
// console.log('!!!data: ', data); console.log('!!!data: ', data);
return data; return data;
......
import { data } from "./words"; import { data } from "./words";
export function checkAnswer(type, string, word) { export function checkAnswer(type, string, word) {
console.log('word: ', word);
switch (type) { switch (type) {
case 'device': case 'device':
case 'side': case 'side':
......
...@@ -277,7 +277,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -277,7 +277,7 @@ export class PlayComponent implements OnInit, OnDestroy {
initDefaultData() { initDefaultData() {
const data = {"sentenceArr":[{"text":"111 _ 2222 3333 4444.!","answer":"1111","answerType":"occupation","isChangeLine":true},{"text":"555 666 _ 777 8888 99999!","answer":"2222","answerType":"date","isChangeLine":true},{"text":"111 _ 2222","answer":"3"},{"text":"444 _ 44444","answer":"4"},{"text":"555 _ 5555555","answer":"5"}],"templateArr":[],"title":"aaa aaa","tipArr":[[{"text":"44"},{"text":"1"}],[{"text":"222"},{"text":"555","isShowIcon":true},{"text":"666","isShowIcon":true},{"text":"777","isShowIcon":true}]],"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/b876b9b2748414253c662d32177b4178.png","rect":{"x":78.8,"y":0,"width":1033.41,"height":456}},"hotZoneItemArr":[{"id":"1632387004410","index":0,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"name","posX":390.5,"posY":192,"rect":{"x":226.2,"y":166,"width":171,"height":52}},{"id":"1632387054795","index":1,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"time","posX":593.4958429447247,"posY":"192","rect":{"x":429.2,"y":166,"width":171,"height":52}},{"id":"1632387061874","index":2,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"city","posX":801.4958429447247,"posY":"192","rect":{"x":637.2,"y":166,"width":171,"height":52}},{"id":"1632387063064","index":3,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"work","posX":1004.4958429447247,"posY":"192","rect":{"x":840.2,"y":166,"width":171,"height":52}},{"id":"1632387122910","index":4,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"name","posX":389.4958429447247,"posY":265.99921052956194,"rect":{"x":225.2,"y":240,"width":171,"height":52}},{"id":"1632387127274","index":5,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"time","posX":594.4950082442094,"posY":264.99921052956194,"rect":{"x":430.2,"y":239,"width":171,"height":52}},{"id":"1632387134147","index":6,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"city","posX":800.4941529845682,"posY":265.99921052956194,"rect":{"x":636.19,"y":240,"width":171,"height":52}},{"id":"1632387139551","index":7,"itemType":"rect","fontScale":0.93046875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.93046875,"dragDot":{"x":595.5,"y":228},"gIdx":"0","selectType":"work","posX":1005.4933182840531,"posY":266.99921052956194,"rect":{"x":841.19,"y":241,"width":171,"height":52}}],"bg_url":"http://staging-teach.cdn.ireadabc.com/ea1a5b5a1de77baf71c49ccf3a2f690f.jpg"}; const data = {"sentenceArr":[{"text":"111 2 2222 3333 4444.! 444.! 444.! 444.! 222 3333 4444.! 444.! 444.! 44 _ .","answer":"1111","answerType":"occupation","isChangeLine":true},{"text":"555 666 _ 777 8888 99999!","answer":"2222","answerType":"date","isChangeLine":true},{"text":"111 _ 2222","answer":"3"},{"text":"444 _ 44444","answer":"4"},{"text":"555 _ 5555555","answer":"5"},{"text":"666 _ dsa dsa dsa","answer":"a"},{"text":"666 _ dsa dsa dsa","answer":"b"},{"text":"666 _ dsa dsa dsa","answer":"c"}],"templateArr":[],"title":"aaa aaa","tipArr":[[{"text":"44"},{"text":"1"}],[{"text":"222"},{"text":"555","isShowIcon":true},{"text":"666","isShowIcon":true},{"text":"777","isShowIcon":true}]],"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/b876b9b2748414253c662d32177b4178.png","rect":{"x":67.42,"y":0,"width":929.16,"height":410}},"hotZoneItemArr":[{"id":"1632387004410","index":0,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"word","labelText":"Hi","posX":390.5,"posY":192,"rect":{"x":203.38,"y":149.25,"width":153.75,"height":46.75}},{"id":"1632387054795","index":1,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"time","posX":593.4958429447247,"posY":"192","rect":{"x":385.9,"y":149.25,"width":153.75,"height":46.75}},{"id":"1632387061874","index":2,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"city","posX":801.4958429447247,"posY":"192","rect":{"x":572.92,"y":149.25,"width":153.75,"height":46.75}},{"id":"1632387063064","index":3,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"work","posX":1004.4958429447247,"posY":"192","rect":{"x":755.44,"y":149.25,"width":153.75,"height":46.75}},{"id":"1632387122910","index":4,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"name","posX":389.4958429447247,"posY":265.99921052956194,"rect":{"x":202.48,"y":215.79,"width":153.75,"height":46.75}},{"id":"1632387127274","index":5,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"time","posX":594.4950082442094,"posY":264.99921052956194,"rect":{"x":386.8,"y":214.89,"width":153.75,"height":46.75}},{"id":"1632387134147","index":6,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"city","posX":800.4941529845682,"posY":265.99921052956194,"rect":{"x":572.01,"y":215.79,"width":153.75,"height":46.75}},{"id":"1632387139551","index":7,"itemType":"rect","fontScale":0.83125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":0.83125,"dragDot":{"x":532,"y":203.6876574307305},"gIdx":"0","selectType":"work","posX":1005.4933182840531,"posY":266.99921052956194,"rect":{"x":756.33,"y":216.69,"width":153.75,"height":46.75}}],"bg_url":"http://staging-teach.cdn.ireadabc.com/ea1a5b5a1de77baf71c49ccf3a2f690f.jpg"}
this.data = { contentObj: data }; this.data = { contentObj: data };
...@@ -1074,10 +1074,14 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -1074,10 +1074,14 @@ export class PlayComponent implements OnInit, OnDestroy {
this.addResultLabelCircle(richText, result); this.addResultLabelCircle(richText, result);
const tmpH = this.getInfoLabelLayer(infoBg, result); const tmpH = this.getInfoLabelLayer(infoBg, result);
baseY += tmpH; if (tmpH < 60) {
infoBg.visible = false;
infoBg.height = tmpH; } else {
resultSv.refreshContentSize(); baseY += tmpH;
infoBg.height = tmpH;
resultSv.refreshContentSize();
}
} else if (!this.hotZoneArr[i].isRight) { } else if (!this.hotZoneArr[i].isRight) {
...@@ -1256,6 +1260,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -1256,6 +1260,9 @@ export class PlayComponent implements OnInit, OnDestroy {
// const rectFirst = rectGroup[0]; // const rectFirst = rectGroup[0];
if (!rectGroup || rectGroup.length == 0) {
continue;
}
const lastRect = rectGroup[rectGroup.length - 1]; const lastRect = rectGroup[rectGroup.length - 1];
const key = lastRect.index + lastRect.text.length; const key = lastRect.index + lastRect.text.length;
...@@ -1769,7 +1776,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -1769,7 +1776,7 @@ export class PlayComponent implements OnInit, OnDestroy {
title.fontName = 'Aileron-Bold'; title.fontName = 'Aileron-Bold';
title.textAlign = 'left'; title.textAlign = 'left';
// title.setMaxSize(this.canvasWidth * 0.9); // title.setMaxSize(this.canvasWidth * 0.9);
title.x = 50 * this.mapScale; title.x = this.canvasWidth / 10;
title.y = 100 * this.mapScale; title.y = 100 * this.mapScale;
title.fontColor = '#3e9b31'; title.fontColor = '#3e9b31';
title.text = this.data.contentObj.title || ""; title.text = this.data.contentObj.title || "";
...@@ -2388,7 +2395,12 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -2388,7 +2395,12 @@ export class PlayComponent implements OnInit, OnDestroy {
result.isAi = true; result.isAi = true;
} else { } else {
result = checkAnswer(data.selectType, answer, this.hotZoneArr[i].labelText || null);
result = await this.paperForCheck(data, answer, this.hotZoneArr[i].data.labelText)
// result = checkAnswer(data.selectType, answer, this.hotZoneArr[i].labelText || null);
} }
...@@ -2412,6 +2424,29 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -2412,6 +2424,29 @@ export class PlayComponent implements OnInit, OnDestroy {
} }
async paperForCheck(data, answer, labelText = null) {
return new Promise((resolve, reject) => {
window['courseware'].greadPapersForCheck({type:data.selectType, blankWord: answer, word: labelText}, res => {
// res 需要toJSON
console.log('res: ', res);
if (res) {
resolve(JSON.parse(res))
} else {
reject();
}
});
})
}
async serverTest(text) { async serverTest(text) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -2427,7 +2462,13 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -2427,7 +2462,13 @@ export class PlayComponent implements OnInit, OnDestroy {
if (text) { if (text) {
this.iconData = {}; this.iconData = {};
console.log(' greadPapersForText start')
c.greadPapersForText(text, (res) => { c.greadPapersForText(text, (res) => {
console.log(' greadPapersForText end')
const resData = JSON.parse(res); const resData = JSON.parse(res);
const sentsFeedback = resData.detail?.essayFeedback?.sentsFeedback const sentsFeedback = resData.detail?.essayFeedback?.sentsFeedback
let startIndex = 0; let startIndex = 0;
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<script type="text/javascript" src="https://staging-teach.cdn.ireadabc.com/h5template/h5-static-lib/js/air_online_open.js"></script> <script type="text/javascript" src="https://staging-teach.cdn.ireadabc.com/h5template/h5-static-lib/js/air_online_open.js"></script>
<!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script> <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<script> <script>
// init vConsole // init vConsole
var vConsole = new VConsole(); var vConsole = new VConsole();
console.log('Hello world'); console.log('Hello world');
</script> --> </script>
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
......
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