Commit 4153c79a authored by limingzhe's avatar limingzhe

fix: debug

parent daa46f8c
...@@ -118,6 +118,7 @@ cc.Class({ ...@@ -118,6 +118,7 @@ cc.Class({
getDefaultData() { getDefaultData() {
return this.item = {"lineType":"1","circleSize":"1","book_id":"Oxford_Phonics_World_2_SB","part_name":"b","page_id":"61","begin_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","idle_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","finish_right_audio_url":"http://teach.cdn.ireadabc.com/27796e9478ecbd16def01c101219e4ab.mp3","bgItem":{"url":"http://teach.cdn.ireadabc.com/e07c195669e39ca6f5a875d00e58ef20.png","rect":{"x":404.31,"y":0,"width":1239.38,"height":773}},"hotZoneItemArr":[{"id":"1671778549011","index":0,"audio_url":"http://teach.cdn.ireadabc.com/26510d45640b11d138331628cfc71dcc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":554.2612834748717,"posY":92.92719655498931,"rect":{"x":224.33,"y":70.97,"width":67.58,"height":67.58}},{"id":"1671778583127","index":1,"audio_url":"http://teach.cdn.ireadabc.com/34636c515d7023cbbc347a517654663b.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":789.0490991381612,"posY":88.13858385504628,"rect":{"x":484.93,"y":69.76,"width":67.58,"height":67.58}},{"id":"1671778593765","index":2,"audio_url":"http://teach.cdn.ireadabc.com/7523d4983601b0a74755008e4a5febbc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":525.3073923233785,"posY":228.81880031464007,"rect":{"x":191.69,"y":224.15,"width":67.58,"height":67.58}},{"id":"1671778615530","index":3,"audio_url":"http://teach.cdn.ireadabc.com/cea333dfcb0c18c0cc4e35751119ea64.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":781.8457783766746,"posY":209.4557108872742,"rect":{"x":476.46,"y":212.27,"width":67.58,"height":67.58}},{"id":"1671779002072","index":4,"audio_url":"http://teach.cdn.ireadabc.com/fdf8d8d5cca418d52f298f79700bd225.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1055.674213386591,"posY":98.71523863626054,"rect":{"x":798.15,"y":82.18,"width":67.58,"height":67.58}},{"id":"1671779009059","index":5,"audio_url":"http://teach.cdn.ireadabc.com/c2b8483c85965da3e3980ac9759ec6f4.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1335.6613657792589,"posY":72.90647555413736,"rect":{"x":1127.07,"y":51.85,"width":67.58,"height":67.58}},{"id":"1671779017504","index":6,"audio_url":"http://teach.cdn.ireadabc.com/98afbd7250e3f037fb7adadb7b8c213e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1142.7864432279687,"posY":216.83012529497506,"rect":{"x":887.76,"y":210.64,"width":67.58,"height":67.58}},{"id":"1671779026505","index":7,"audio_url":"http://teach.cdn.ireadabc.com/3e2715eb5bbcfba8ca813f67bec481ae.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.7401645177392,"posY":199.33525279764234,"rect":{"x":1128.34,"y":200.38,"width":67.58,"height":67.58}},{"id":"1671779039022","index":8,"audio_url":"http://teach.cdn.ireadabc.com/2fba5e807a840d87b54586c243726a53.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":546.9907118868001,"posY":391.9357433284048,"rect":{"x":200.57,"y":426.64,"width":67.58,"height":67.58}},{"id":"1671779047561","index":9,"audio_url":"http://teach.cdn.ireadabc.com/c3941177c064888862ac8a1f2b5e2709.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":782.4012094982535,"posY":381.3899080533002,"rect":{"x":477.12,"y":414.26,"width":67.58,"height":67.58}},{"id":"1671779060840","index":10,"audio_url":"http://teach.cdn.ireadabc.com/e6e5bbfc6b96729b0761d40c20eae73c.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":570.657793219656,"posY":481.52460604600606,"rect":{"x":228.36,"y":531.89,"width":67.58,"height":67.58}},{"id":"1671779080028","index":11,"audio_url":"http://teach.cdn.ireadabc.com/983c6c1ec372468ebc600b7286c51ede.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":806.0490991381612,"posY":481.7262267784764,"rect":{"x":504.9,"y":532.12,"width":67.58,"height":67.58}},{"id":"1671779091305","index":12,"audio_url":"http://teach.cdn.ireadabc.com/0a688e54039c205bab71fda1e52974ab.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1084.1999449078507,"posY":387.20826698189745,"rect":{"x":831.67,"y":421.08,"width":67.58,"height":67.58}},{"id":"1671779101424","index":13,"audio_url":"http://teach.cdn.ireadabc.com/510a04200fe676c5ee6aab5dd282263e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1349.744104358336,"posY":372.3691404241131,"rect":{"x":1143.61,"y":403.66,"width":67.58,"height":67.58}},{"id":"1671779110189","index":14,"audio_url":"http://teach.cdn.ireadabc.com/c5be6c28be02fb44f14dbcfcf62b1e2d.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1094.5858188016366,"posY":499.01997409160447,"rect":{"x":843.86,"y":552.45,"width":67.58,"height":67.58}},{"id":"1671779118443","index":15,"audio_url":"http://teach.cdn.ireadabc.com/0be900e987648d05997b152adf085932.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.6825894388942,"posY":488.18163550193947,"rect":{"x":1128.27,"y":539.71,"width":67.58,"height":67.58}},{"id":"1671788288460","index":16,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":613.3115008002104,"posY":253.79568342550056,"rect":{"x":78.85,"y":202.06,"width":466.83,"height":192.18}},{"id":"1671788644709","index":17,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1039.4768265903967,"posY":194.51277595741436,"rect":{"x":670.15,"y":72.84,"width":285.53,"height":311.35}},{"id":"1671788745139","index":18,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":634.5098995456824,"posY":487.99440047104815,"rect":{"x":100.47,"y":423.35,"width":473.41,"height":299.86}},{"id":"1671788774838","index":19,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1275.4972622819128,"posY":483.4193216260726,"rect":{"x":961.54,"y":404.12,"width":257.29,"height":327.57}}],"typeArr":[{"gIdx":"2","name":"画圈"}],"bgItem2":{"url":"http://teach.cdn.ireadabc.com/c2ccd8cfa4c048c6b8140bdf5b9f5ac6.jpg","rect":{"x":166.06,"y":0,"width":1327.87,"height":1718}},"hotZoneItemArr2":[{"id":"1671777992400","index":0,"itemType":"rect","fontScale":1.296875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.296875,"dragDot":{"x":830,"y":849.9200000000001},"gIdx":"7","posX":598.9806594612546,"posY":443.9990662325129,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":151.96,"y":337.47,"width":494.72,"height":176.4}},{"id":"1671778043374","index":1,"itemType":"rect","fontScale":1.296875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.296875,"dragDot":{"x":830,"y":849.9200000000001},"gIdx":"7","posX":1057.9844007884078,"posY":371.99910473838867,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":701.35,"y":185.99,"width":276.14,"height":341.3}},{"id":"1671778081719","index":2,"itemType":"rect","fontScale":1.296875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.296875,"dragDot":{"x":830,"y":849.9200000000001},"gIdx":"7","posX":591.9710252911406,"posY":707.998308148084,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"multRect":[{"rect":{"x":206.27,"y":656,"width":136.67,"height":141.54},"color":"#ff0000"},{"rect":{"x":457.27,"y":526,"width":112.67,"height":137.54},"color":"#ff0000"}],"rect":{"x":133.72,"y":522.5,"width":517.76,"height":312.54}},{"id":"1671789068725","index":3,"itemType":"rect","fontScale":1.296875,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.296875,"dragDot":{"x":830,"y":849.9200000000001},"gIdx":"7","posX":1307.9587871611786,"posY":698.9983129613184,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":961.12,"y":511.95,"width":235.91,"height":316.37}}],"itemCombineGroup":[],"isDebug":false,"helpTime":"0"}
return this.item = {"lineType":"1","circleSize":"1","book_id":"Oxford_Phonics_World_2_SB","part_name":"b","page_id":"61","begin_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","idle_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","finish_right_audio_url":"http://teach.cdn.ireadabc.com/27796e9478ecbd16def01c101219e4ab.mp3","bgItem":{"url":"http://teach.cdn.ireadabc.com/e07c195669e39ca6f5a875d00e58ef20.png","rect":{"x":404.31,"y":0,"width":1239.38,"height":773}},"hotZoneItemArr":[{"id":"1671778549011","index":0,"audio_url":"http://teach.cdn.ireadabc.com/26510d45640b11d138331628cfc71dcc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":554.2612834748717,"posY":92.92719655498931,"rect":{"x":224.33,"y":70.97,"width":67.58,"height":67.58}},{"id":"1671778583127","index":1,"audio_url":"http://teach.cdn.ireadabc.com/34636c515d7023cbbc347a517654663b.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":789.0490991381612,"posY":88.13858385504628,"rect":{"x":484.93,"y":69.76,"width":67.58,"height":67.58}},{"id":"1671778593765","index":2,"audio_url":"http://teach.cdn.ireadabc.com/7523d4983601b0a74755008e4a5febbc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":525.3073923233785,"posY":228.81880031464007,"rect":{"x":191.69,"y":224.15,"width":67.58,"height":67.58}},{"id":"1671778615530","index":3,"audio_url":"http://teach.cdn.ireadabc.com/cea333dfcb0c18c0cc4e35751119ea64.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":781.8457783766746,"posY":209.4557108872742,"rect":{"x":476.46,"y":212.27,"width":67.58,"height":67.58}},{"id":"1671779002072","index":4,"audio_url":"http://teach.cdn.ireadabc.com/fdf8d8d5cca418d52f298f79700bd225.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1055.674213386591,"posY":98.71523863626054,"rect":{"x":798.15,"y":82.18,"width":67.58,"height":67.58}},{"id":"1671779009059","index":5,"audio_url":"http://teach.cdn.ireadabc.com/c2b8483c85965da3e3980ac9759ec6f4.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1335.6613657792589,"posY":72.90647555413736,"rect":{"x":1127.07,"y":51.85,"width":67.58,"height":67.58}},{"id":"1671779017504","index":6,"audio_url":"http://teach.cdn.ireadabc.com/98afbd7250e3f037fb7adadb7b8c213e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1142.7864432279687,"posY":216.83012529497506,"rect":{"x":887.76,"y":210.64,"width":67.58,"height":67.58}},{"id":"1671779026505","index":7,"audio_url":"http://teach.cdn.ireadabc.com/3e2715eb5bbcfba8ca813f67bec481ae.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.7401645177392,"posY":199.33525279764234,"rect":{"x":1128.34,"y":200.38,"width":67.58,"height":67.58}},{"id":"1671779039022","index":8,"audio_url":"http://teach.cdn.ireadabc.com/2fba5e807a840d87b54586c243726a53.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":546.9907118868001,"posY":391.9357433284048,"rect":{"x":200.57,"y":426.64,"width":67.58,"height":67.58}},{"id":"1671779047561","index":9,"audio_url":"http://teach.cdn.ireadabc.com/c3941177c064888862ac8a1f2b5e2709.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":782.4012094982535,"posY":381.3899080533002,"rect":{"x":477.12,"y":414.26,"width":67.58,"height":67.58}},{"id":"1671779060840","index":10,"audio_url":"http://teach.cdn.ireadabc.com/e6e5bbfc6b96729b0761d40c20eae73c.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":570.657793219656,"posY":481.52460604600606,"rect":{"x":228.36,"y":531.89,"width":67.58,"height":67.58}},{"id":"1671779080028","index":11,"audio_url":"http://teach.cdn.ireadabc.com/983c6c1ec372468ebc600b7286c51ede.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":806.0490991381612,"posY":481.7262267784764,"rect":{"x":504.9,"y":532.12,"width":67.58,"height":67.58}},{"id":"1671779091305","index":12,"audio_url":"http://teach.cdn.ireadabc.com/0a688e54039c205bab71fda1e52974ab.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1084.1999449078507,"posY":387.20826698189745,"rect":{"x":831.67,"y":421.08,"width":67.58,"height":67.58}},{"id":"1671779101424","index":13,"audio_url":"http://teach.cdn.ireadabc.com/510a04200fe676c5ee6aab5dd282263e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1349.744104358336,"posY":372.3691404241131,"rect":{"x":1143.61,"y":403.66,"width":67.58,"height":67.58}},{"id":"1671779110189","index":14,"audio_url":"http://teach.cdn.ireadabc.com/c5be6c28be02fb44f14dbcfcf62b1e2d.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1094.5858188016366,"posY":499.01997409160447,"rect":{"x":843.86,"y":552.45,"width":67.58,"height":67.58}},{"id":"1671779118443","index":15,"audio_url":"http://teach.cdn.ireadabc.com/0be900e987648d05997b152adf085932.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.6825894388942,"posY":488.18163550193947,"rect":{"x":1128.27,"y":539.71,"width":67.58,"height":67.58}},{"id":"1671788288460","index":16,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":613.3115008002104,"posY":253.79568342550056,"rect":{"x":78.85,"y":202.06,"width":466.83,"height":192.18}},{"id":"1671788644709","index":17,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1039.4768265903967,"posY":194.51277595741436,"rect":{"x":670.15,"y":72.84,"width":285.53,"height":311.35}},{"id":"1671788745139","index":18,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":634.5098995456824,"posY":487.99440047104815,"rect":{"x":100.47,"y":423.35,"width":473.41,"height":299.86}},{"id":"1671788774838","index":19,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1275.4972622819128,"posY":483.4193216260726,"rect":{"x":961.54,"y":404.12,"width":257.29,"height":327.57}}],"typeArr":[{"gIdx":"2","name":"画圈"}],"bgItem2":{"url":"http://teach.cdn.ireadabc.com/c2ccd8cfa4c048c6b8140bdf5b9f5ac6.jpg","rect":{"x":210.12,"y":0,"width":1627.76,"height":2106}},"hotZoneItemArr2":[{"id":"1671777992400","index":0,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":598.9806594612546,"posY":443.9990662325129,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":186.27,"y":413.68,"width":606.45,"height":216.24}},{"id":"1671778043374","index":1,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":1057.9844007884078,"posY":371.99910473838867,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":859.67,"y":227.99,"width":338.5,"height":418.38}},{"id":"1671778081719","index":2,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":591.9710252911406,"posY":707.998308148084,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"multRect":[{"color":"#ff0000","width":100,"height":100,"x":-1,"y":-1},{"color":"#ff0000","width":100,"height":100,"x":-1,"y":-1}],"rect":{"x":163.91,"y":640.5,"width":634.69,"height":383.12}},{"id":"1671789068725","index":3,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":1307.9587871611786,"posY":698.9983129613184,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":1178.1,"y":627.57,"width":289.19,"height":387.82}}],"itemCombineGroup":[],"isDebug":false,"helpTime":"0"} return this.item = {"lineType":"1","circleSize":"1","book_id":"Oxford_Phonics_World_2_SB","part_name":"b","page_id":"61","begin_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","idle_audio_url":"http://teach.cdn.ireadabc.com/16d6967dba29498089154e832163391c.mp3","finish_right_audio_url":"http://teach.cdn.ireadabc.com/27796e9478ecbd16def01c101219e4ab.mp3","bgItem":{"url":"http://teach.cdn.ireadabc.com/e07c195669e39ca6f5a875d00e58ef20.png","rect":{"x":404.31,"y":0,"width":1239.38,"height":773}},"hotZoneItemArr":[{"id":"1671778549011","index":0,"audio_url":"http://teach.cdn.ireadabc.com/26510d45640b11d138331628cfc71dcc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":554.2612834748717,"posY":92.92719655498931,"rect":{"x":224.33,"y":70.97,"width":67.58,"height":67.58}},{"id":"1671778583127","index":1,"audio_url":"http://teach.cdn.ireadabc.com/34636c515d7023cbbc347a517654663b.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":789.0490991381612,"posY":88.13858385504628,"rect":{"x":484.93,"y":69.76,"width":67.58,"height":67.58}},{"id":"1671778593765","index":2,"audio_url":"http://teach.cdn.ireadabc.com/7523d4983601b0a74755008e4a5febbc.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":525.3073923233785,"posY":228.81880031464007,"rect":{"x":191.69,"y":224.15,"width":67.58,"height":67.58}},{"id":"1671778615530","index":3,"audio_url":"http://teach.cdn.ireadabc.com/cea333dfcb0c18c0cc4e35751119ea64.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":781.8457783766746,"posY":209.4557108872742,"rect":{"x":476.46,"y":212.27,"width":67.58,"height":67.58}},{"id":"1671779002072","index":4,"audio_url":"http://teach.cdn.ireadabc.com/fdf8d8d5cca418d52f298f79700bd225.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1055.674213386591,"posY":98.71523863626054,"rect":{"x":798.15,"y":82.18,"width":67.58,"height":67.58}},{"id":"1671779009059","index":5,"audio_url":"http://teach.cdn.ireadabc.com/c2b8483c85965da3e3980ac9759ec6f4.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1335.6613657792589,"posY":72.90647555413736,"rect":{"x":1127.07,"y":51.85,"width":67.58,"height":67.58}},{"id":"1671779017504","index":6,"audio_url":"http://teach.cdn.ireadabc.com/98afbd7250e3f037fb7adadb7b8c213e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1142.7864432279687,"posY":216.83012529497506,"rect":{"x":887.76,"y":210.64,"width":67.58,"height":67.58}},{"id":"1671779026505","index":7,"audio_url":"http://teach.cdn.ireadabc.com/3e2715eb5bbcfba8ca813f67bec481ae.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.7401645177392,"posY":199.33525279764234,"rect":{"x":1128.34,"y":200.38,"width":67.58,"height":67.58}},{"id":"1671779039022","index":8,"audio_url":"http://teach.cdn.ireadabc.com/2fba5e807a840d87b54586c243726a53.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":546.9907118868001,"posY":391.9357433284048,"rect":{"x":200.57,"y":426.64,"width":67.58,"height":67.58}},{"id":"1671779047561","index":9,"audio_url":"http://teach.cdn.ireadabc.com/c3941177c064888862ac8a1f2b5e2709.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":782.4012094982535,"posY":381.3899080533002,"rect":{"x":477.12,"y":414.26,"width":67.58,"height":67.58}},{"id":"1671779060840","index":10,"audio_url":"http://teach.cdn.ireadabc.com/e6e5bbfc6b96729b0761d40c20eae73c.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":570.657793219656,"posY":481.52460604600606,"rect":{"x":228.36,"y":531.89,"width":67.58,"height":67.58}},{"id":"1671779080028","index":11,"audio_url":"http://teach.cdn.ireadabc.com/983c6c1ec372468ebc600b7286c51ede.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":806.0490991381612,"posY":481.7262267784764,"rect":{"x":504.9,"y":532.12,"width":67.58,"height":67.58}},{"id":"1671779091305","index":12,"audio_url":"http://teach.cdn.ireadabc.com/0a688e54039c205bab71fda1e52974ab.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1084.1999449078507,"posY":387.20826698189745,"rect":{"x":831.67,"y":421.08,"width":67.58,"height":67.58}},{"id":"1671779101424","index":13,"audio_url":"http://teach.cdn.ireadabc.com/510a04200fe676c5ee6aab5dd282263e.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1349.744104358336,"posY":372.3691404241131,"rect":{"x":1143.61,"y":403.66,"width":67.58,"height":67.58}},{"id":"1671779110189","index":14,"audio_url":"http://teach.cdn.ireadabc.com/c5be6c28be02fb44f14dbcfcf62b1e2d.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1094.5858188016366,"posY":499.01997409160447,"rect":{"x":843.86,"y":552.45,"width":67.58,"height":67.58}},{"id":"1671779118443","index":15,"audio_url":"http://teach.cdn.ireadabc.com/0be900e987648d05997b152adf085932.mp3","itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":385.024},"gIdx":"3","posX":1336.6825894388942,"posY":488.18163550193947,"rect":{"x":1128.27,"y":539.71,"width":67.58,"height":67.58}},{"id":"1671788288460","index":16,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":613.3115008002104,"posY":253.79568342550056,"rect":{"x":78.85,"y":202.06,"width":466.83,"height":192.18}},{"id":"1671788644709","index":17,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1039.4768265903967,"posY":194.51277595741436,"rect":{"x":670.15,"y":72.84,"width":285.53,"height":311.35}},{"id":"1671788745139","index":18,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":634.5098995456824,"posY":487.99440047104815,"rect":{"x":100.47,"y":423.35,"width":473.41,"height":299.86}},{"id":"1671788774838","index":19,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"skeJsonData":{"url":"http://teach.cdn.ireadabc.com/29b438b66c46206a683982c2dec2c1c6.json","name":"draw_circle_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/2e0851230cec969f8a805563c9cbb177.json","name":"draw_circle_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/9531e99ab1f656893c74ee5868632f6a.png","name":"draw_circle_tex.png"},"dragDot":{"x":1024,"y":385.024},"gIdx":"2","posX":1275.4972622819128,"posY":483.4193216260726,"rect":{"x":961.54,"y":404.12,"width":257.29,"height":327.57}}],"typeArr":[{"gIdx":"2","name":"画圈"}],"bgItem2":{"url":"http://teach.cdn.ireadabc.com/c2ccd8cfa4c048c6b8140bdf5b9f5ac6.jpg","rect":{"x":210.12,"y":0,"width":1627.76,"height":2106}},"hotZoneItemArr2":[{"id":"1671777992400","index":0,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":598.9806594612546,"posY":443.9990662325129,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":186.27,"y":413.68,"width":606.45,"height":216.24}},{"id":"1671778043374","index":1,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":1057.9844007884078,"posY":371.99910473838867,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":859.67,"y":227.99,"width":338.5,"height":418.38}},{"id":"1671778081719","index":2,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":591.9710252911406,"posY":707.998308148084,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"multRect":[{"color":"#ff0000","width":100,"height":100,"x":-1,"y":-1},{"color":"#ff0000","width":100,"height":100,"x":-1,"y":-1}],"rect":{"x":163.91,"y":640.5,"width":634.69,"height":383.12}},{"id":"1671789068725","index":3,"itemType":"rect","fontScale":1.6,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.6,"dragDot":{"x":1024,"y":1048.576},"gIdx":"7","posX":1307.9587871611786,"posY":698.9983129613184,"checkbox":{"title":"答案","list":[{"label":"正确","key":"isRight"}]},"rect":{"x":1178.1,"y":627.57,"width":289.19,"height":387.82}}],"itemCombineGroup":[],"isDebug":false,"helpTime":"0"}
...@@ -4608,6 +4609,7 @@ cc.Class({ ...@@ -4608,6 +4609,7 @@ cc.Class({
this.setOneDebugLinkRect(item); this.setOneDebugLinkRect(item);
break; break;
// case "1": // case "1":
// this.setOneDebugWriteRect(item); // this.setOneDebugWriteRect(item);
// break; // break;
...@@ -4622,6 +4624,53 @@ cc.Class({ ...@@ -4622,6 +4624,53 @@ cc.Class({
console.log("this.linkRectGroup: ", this.linkRectGroup); console.log("this.linkRectGroup: ", this.linkRectGroup);
}, },
setOneMultRect(data) {
const rate = (this.debugLayer.scale * this.debugLayer.width) / this.data.bgItem2.rect.width;
const rectNode = new cc.Node();
rectNode.name = 'rect' + data.index;
this.debugLayer.addChild(rectNode);
let ctx = rectNode.addComponent(cc.Graphics);
ctx.lineWidth = 4;
const color = new cc.Color();
cc.Color.fromHEX(color, data.color );
ctx.strokeColor = color// cc.Color.RED;
ctx.fillColor = color.setA(100);//cc.Color.WHITE.setA(100);
const scale = rate / this.debugLayer.scaleY;
rectNode.width = data.rect.width * scale;
rectNode.height = data.rect.height * scale;
rectNode.x = data.rect.x * scale;
rectNode.y = - data.rect.height * scale - data.rect.y * scale;
rectNode.anchorX = 0;
rectNode.anchorY = 0;
if (this.data.isDebug) {
ctx.rect(0, 0, rectNode.width, rectNode.height);
}
ctx.stroke();
ctx.fill();
rectNode['data'] = data;
// rectNode.opacity = 100;
rectNode['ccRect'] = rectNode.getBoundingBoxToWorld()
// rectNode.isRightPoint = data.checkbox.list[0].value == true;
// this.linkRectGroup.push(rectNode);
},
setOneDebugLinkRect(data) { setOneDebugLinkRect(data) {
const rate = (this.debugLayer.scale * this.debugLayer.width) / this.data.bgItem2.rect.width; const rate = (this.debugLayer.scale * this.debugLayer.width) / this.data.bgItem2.rect.width;
...@@ -4776,10 +4825,21 @@ cc.Class({ ...@@ -4776,10 +4825,21 @@ cc.Class({
const oneData = this.circleRectArr[i]; const oneData = this.circleRectArr[i];
const rect = this.setDebugRectDot(oneData, bg); const rect = this.setDebugRectDot(oneData, bg);
this.circleRectCheckArr.push(rect); this.circleRectCheckArr.push(rect);
if (oneData.multRect) {
this.setMultRect(oneData);
}
console.log('oneData: ', oneData); console.log('oneData: ', oneData);
} }
}, },
setMultRect(data) {
const multRect = data.multRect;
for(let i=0; i<multRect.length; i++) {
this.setOneMultRect(multRect[i]);
}
console.log("multRect: " , multRect);
},
setDebugRectDot(data, bg) { setDebugRectDot(data, bg) {
const bgData = bg.data; const bgData = bg.data;
......
...@@ -95,6 +95,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -95,6 +95,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
canvasLeft; canvasLeft;
canvasTop; canvasTop;
renderArr; renderArr;
renderTopArr;
imgArr = []; imgArr = [];
oldPos; oldPos;
radioValue; radioValue;
...@@ -130,7 +131,6 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -130,7 +131,6 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
'posY', 'posY',
'mathLabel', 'mathLabel',
'checkbox', 'checkbox',
'multRect',
'dropDownItem' 'dropDownItem'
] ]
...@@ -512,34 +512,82 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -512,34 +512,82 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
} }
} }
setItemMultRectByData(item, multRectArr) { cleanMultRect(multRectArr) {
for (let i=0; i<multRectArr.length; i++) {
removeItemFromArr(this.renderTopArr, multRectArr[i]);
}
}
setItemMultRectByData(item, multRectDataArr) {
if (item.multRectArr) {
this.cleanMultRect(item.multRectArr);
}
let curBgRect;
if (this.bg) {
curBgRect = this.bg.getBoundingBox();
} else {
curBgRect = {x: 0, y: 0, width: this.canvasWidth, height: this.canvasHeight};
}
let oldBgRect = this.bgItem.rect;
if (!oldBgRect) {
oldBgRect = curBgRect;
}
const rate = curBgRect.width / oldBgRect.width;
const arr = []; const arr = [];
for (let i=0; i<multRectArr.length; i++) { for (let i=0; i<multRectDataArr.length; i++) {
const multRectData = multRectDataArr[i];
const multRectData = multRectArr[i]; const multRectItem = new HotZoneMultRect(this.ctx);
multRectItem.showLineDash();
multRectItem.anchorX = 0.5;
multRectItem.anchorY = 0.5;
multRectItem.rectEdgeColor = multRectData.color;
multRectItem.showLabel("M-" + (i+1));
multRectItem.item = item;
const multRect = new HotZoneMultRect(this.ctx); multRectItem.visible = true;
multRect.showLineDash();
multRect.setSize(multRectData.width, multRectData.height);
multRect.anchorX = 0.5;
multRect.anchorY = 0.5;
multRect.rectEdgeColor = multRectData.color;
multRect.showLabel("M-" + (i+1));
multRect.item = item;
multRect.visible = true; if (!multRectData.rect) {
//无数据小矩形
if (multRectData.x == -1 && multRectData.y == -1) { multRectItem.setSize(multRectData.width, multRectData.height);
multRect.x = item.x + multRect.width * i * 0.3; multRectItem.x = item.x + multRectItem.width * i * 0.3;
multRect.y = item.y + multRect.width * i * 0.3; multRectItem.y = item.y + multRectItem.width * i * 0.3;
} else { } else {
multRect.x = multRectData.x; //有数据小矩形
multRect.y = multRectData.y;
console.log('multRectData.rect: ', multRectData.rect);
const saveRect = multRectData.rect;
saveRect.x *= rate;
saveRect.y *= rate;
saveRect.width *= rate;
saveRect.height *= rate;
saveRect.x += curBgRect.x;
saveRect.y += curBgRect.y;
multRectItem.setSize(saveRect.width, saveRect.height);
multRectItem.scaleX = saveRect.width / multRectItem.width;
multRectItem.scaleY = saveRect.height / multRectItem.height;
multRectItem.x = saveRect.x + saveRect.width / 2;
multRectItem.y = saveRect.y + saveRect.height / 2;
} }
this.renderArr.push(multRect); this.renderTopArr.push(multRectItem);
arr.push(multRect); arr.push(multRectItem);
} }
item.multRectArr = arr; item.multRectArr = arr;
...@@ -923,6 +971,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -923,6 +971,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
this.canvasHeight = this.wrap.nativeElement.clientHeight; this.canvasHeight = this.wrap.nativeElement.clientHeight;
this.mapScale = this.canvasWidth / this.canvasBaseW; this.mapScale = this.canvasWidth / this.canvasBaseW;
this.renderArr = []; this.renderArr = [];
this.renderTopArr = [];
this.bg = null; this.bg = null;
this.imgArr = []; this.imgArr = [];
...@@ -1175,12 +1224,16 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -1175,12 +1224,16 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
// } // }
// } // }
for (let i = 0; i < this.renderArr.length; i++) { for (let i = 0; i < this.renderArr.length; i++) {
this.renderArr[i].update(this); this.renderArr[i].update(this);
} }
this.updateArr(this.hotZoneArr); this.updateArr(this.hotZoneArr);
this.updateArr(this.renderTopArr);
this.updatePos(); this.updatePos();
...@@ -1369,6 +1422,21 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -1369,6 +1422,21 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
} }
}) })
if (hotZoneArr[i].multRectArr) {
const tempArr = [];
hotZoneArr[i].multRectArr.forEach(element => {
const rectData = element.getBoundingBox();
rectData.x = Math.round((rectData.x - bgItem['rect'].x) * 100) / 100;
rectData.y = Math.round((rectData.y - bgItem['rect'].y) * 100) / 100;
rectData.width = Math.round((rectData.width) * 100) / 100;
rectData.height = Math.round((rectData.height) * 100) / 100;
const oneData = {rect: rectData, color: element.rectEdgeColor}
tempArr.push(oneData);
});
hotZoneItem['multRect'] = tempArr;
}
hotZoneItem['actionData_' + hotZoneItem.gIdx] = hotZoneArr[i]['actionData_' + hotZoneArr[i].gIdx] hotZoneItem['actionData_' + hotZoneItem.gIdx] = hotZoneArr[i]['actionData_' + hotZoneArr[i].gIdx]
...@@ -1928,6 +1996,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges { ...@@ -1928,6 +1996,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
onMultRectSave(e, item) { onMultRectSave(e, item) {
console.log(' in onMultRectSave: ', e); console.log(' in onMultRectSave: ', e);
item.multRect = e; item.multRect = e;
this.setItemMultRectByData(item, item.multRect); this.setItemMultRectByData(item, item.multRect);
} }
......
...@@ -38,7 +38,7 @@ export class MultRectComponent implements OnDestroy, OnChanges { ...@@ -38,7 +38,7 @@ export class MultRectComponent implements OnDestroy, OnChanges {
{name: 'red', color: '#ff0000'}, {name: 'red', color: '#ff0000'},
{name: 'green', color: '#00ff00'}, {name: 'green', color: '#00ff00'},
{name: 'blue', color: '#0000ff'}, {name: 'blue', color: '#0000ff'},
{name: 'yellow', color: '#ffff00'}, {name: 'black', color: '#000000'},
] ]
constructor(private appRef: ApplicationRef, private nzMessageService: NzMessageService) { constructor(private appRef: ApplicationRef, private nzMessageService: NzMessageService) {
......
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