Commit da6369ab authored by 范雪寒's avatar 范雪寒

feat: 扫码

parent c9af7628
......@@ -295,25 +295,25 @@
"__id__": 20
},
{
"__id__": 137
"__id__": 144
},
{
"__id__": 172
"__id__": 179
},
{
"__id__": 176
"__id__": 183
},
{
"__id__": 178
"__id__": 185
}
],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 196
},
{
"__id__": 190
"__id__": 197
}
],
"_prefab": null,
......@@ -1010,6 +1010,9 @@
},
{
"__id__": 132
},
{
"__id__": 137
}
],
"_active": true,
......@@ -6782,32 +6785,20 @@
},
{
"__type__": "cc.Node",
"_name": "ConsoleNode",
"_name": "BtnScanCode",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 20
},
"_children": [
{
"__id__": 138
},
{
"__id__": 144
},
{
"__id__": 147
},
{
"__id__": 155
},
{
"__id__": 163
}
],
"_active": true,
"_components": [
{
"__id__": 171
"__id__": 143
}
],
"_prefab": null,
......@@ -6821,20 +6812,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 220
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-360,
494.887,
-122.565,
0,
0,
0,
......@@ -6856,12 +6847,12 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "91+HZOZlJKdr+t1XzkQEKe"
"_id": "64TmBUTPlIMpME29kDg+Fn"
},
{
"__type__": "cc.Node",
"_name": "content",
"_objFlags": 0,
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 137
},
......@@ -6870,13 +6861,13 @@
"__id__": 139
}
],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 141
},
{
"__id__": 143
"__id__": 142
}
],
"_prefab": null,
......@@ -6890,8 +6881,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 18.9
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6903,7 +6894,7 @@
"ctor": "Float64Array",
"array": [
0,
15.75,
0,
0,
0,
0,
......@@ -6925,12 +6916,12 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "24BhaxEGlK97fUByzahNNA"
"_id": "01Vdz7ah1ILbWou1YgYTg+"
},
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 138
},
......@@ -6939,35 +6930,32 @@
"_components": [
{
"__id__": 140
},
{
"__id__": 141
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 36.7,
"height": 18.9
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-627.765,
0,
0,
0,
0,
......@@ -6990,7 +6978,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a8JlHXNoVMIYa8iO8V9pJv"
"_id": "34QWPp+Y5CP45uEH2/iPNb"
},
{
"__type__": "cc.Label",
......@@ -7007,11 +6995,11 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Label",
"_N$string": "Label",
"_fontSize": 15,
"_lineHeight": 15,
"_enableWrapText": true,
"_string": "扫码",
"_N$string": "扫码",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
......@@ -7021,167 +7009,16 @@
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "7aWnUU64NC5YnWWToB9L2S"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "78IPqSab1KQrGbP3jz8URO"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 18.9
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "a7sD/OZvVFbrIQDw6dexDk"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 40,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 300,
"_originalHeight": 0,
"_id": "2diCJWUqhAcJPg/A28mr9e"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 137
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 145
},
{
"__id__": 146
}
],
"_prefab": null,
"_opacity": 138,
"_color": {
"__type__": "cc.Color",
"r": 81,
"g": 81,
"b": 81,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 220
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
110,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ffABS7P3JHaJhlWQrt97IH"
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": "49T93N5QZHyY1wL1aiMyVz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 138
},
"_enabled": true,
"_materials": [
......@@ -7192,9 +7029,9 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 0,
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
......@@ -7206,17 +7043,17 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "44K+0XVM1P2ZtGuv6JPFkh"
"_id": "17u2R1Z21Le4CnLZ+upta6"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 138
},
"_enabled": true,
"alignMode": 1,
"alignMode": 0,
"_target": null,
"_alignFlags": 45,
"_left": 0,
......@@ -7232,34 +7069,571 @@
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "e2EcEf+r5E36h6bzHvF/X6"
"_originalHeight": 40,
"_id": "acF6IlrD5JG6SfslcO6EhU"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 2,
"transition": 2,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 120,
"g": 120,
"b": 120,
"a": 200
},
"_N$normalSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"_N$hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$disabledSprite": {
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 138
},
"_id": "0eZv6h/9VDnJV+eK8tiFMk"
},
{
"__type__": "cc.Node",
"_name": "ConsoleNode",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [
{
"__id__": 145
},
{
"__id__": 151
},
{
"__id__": 154
},
{
"__id__": 162
},
{
"__id__": 170
}
],
"_active": true,
"_components": [
{
"__id__": 178
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 220
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-360,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "91+HZOZlJKdr+t1XzkQEKe"
},
{
"__type__": "cc.Node",
"_name": "content",
"_objFlags": 0,
"_parent": {
"__id__": 144
},
"_children": [
{
"__id__": 146
}
],
"_active": false,
"_components": [
{
"__id__": 149
},
{
"__id__": 150
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 18.9
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
15.75,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "24BhaxEGlK97fUByzahNNA"
},
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 145
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
},
{
"__id__": 148
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 36.7,
"height": 18.9
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-627.765,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a8JlHXNoVMIYa8iO8V9pJv"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Label",
"_N$string": "Label",
"_fontSize": 15,
"_lineHeight": 15,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "7aWnUU64NC5YnWWToB9L2S"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "78IPqSab1KQrGbP3jz8URO"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 18.9
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "a7sD/OZvVFbrIQDw6dexDk"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 40,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 300,
"_originalHeight": 0,
"_id": "2diCJWUqhAcJPg/A28mr9e"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 144
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 152
},
{
"__id__": 153
}
],
"_prefab": null,
"_opacity": 138,
"_color": {
"__type__": "cc.Color",
"r": 81,
"g": 81,
"b": 81,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 220
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
110,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ffABS7P3JHaJhlWQrt97IH"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "44K+0XVM1P2ZtGuv6JPFkh"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "e2EcEf+r5E36h6bzHvF/X6"
},
{
"__type__": "cc.Node",
"_name": "Console",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 144
},
"_children": [
{
"__id__": 148
"__id__": 155
}
],
"_active": false,
"_components": [
{
"__id__": 151
"__id__": 158
},
{
"__id__": 152
"__id__": 159
},
{
"__id__": 153
"__id__": 160
},
{
"__id__": 154
"__id__": 161
}
],
"_prefab": null,
......@@ -7315,16 +7689,16 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
"__id__": 147
"__id__": 154
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 156
},
{
"__id__": 150
"__id__": 157
}
],
"_prefab": null,
......@@ -7380,7 +7754,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 155
},
"_enabled": true,
"_layoutSize": {
......@@ -7412,7 +7786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 155
},
"_enabled": true,
"alignMode": 1,
......@@ -7439,7 +7813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 154
},
"_enabled": true,
"alignMode": 2,
......@@ -7466,7 +7840,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7486,7 +7860,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 154
},
"_enabled": true,
"horizontal": false,
......@@ -7498,10 +7872,10 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
"__id__": 148
"__id__": 155
},
"content": {
"__id__": 148
"__id__": 155
},
"_id": "43wBGhGBpFP7OYyNM+j0Ho"
},
......@@ -7510,7 +7884,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 154
},
"_enabled": true,
"_layoutSize": {
......@@ -7542,20 +7916,20 @@
"_name": "BtnClose",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 144
},
"_children": [
{
"__id__": 156
"__id__": 163
}
],
"_active": false,
"_components": [
{
"__id__": 161
"__id__": 168
},
{
"__id__": 162
"__id__": 169
}
],
"_prefab": null,
......@@ -7611,20 +7985,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 155
"__id__": 162
},
"_children": [
{
"__id__": 157
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 166
},
{
"__id__": 160
"__id__": 167
}
],
"_prefab": null,
......@@ -7680,13 +8054,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 156
"__id__": 163
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 165
}
],
"_prefab": null,
......@@ -7742,7 +8116,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -7775,7 +8149,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -7807,7 +8181,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 163
},
"_enabled": true,
"alignMode": 0,
......@@ -7834,7 +8208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 162
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7907,7 +8281,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 156
"__id__": 163
},
"_id": "54SC9WcmBAZ6cTznyI0o+3"
},
......@@ -7916,7 +8290,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 162
},
"_enabled": true,
"alignMode": 1,
......@@ -7943,20 +8317,20 @@
"_name": "BtnOpen",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 144
},
"_children": [
{
"__id__": 164
"__id__": 171
}
],
"_active": false,
"_components": [
{
"__id__": 169
"__id__": 176
},
{
"__id__": 170
"__id__": 177
}
],
"_prefab": null,
......@@ -8012,20 +8386,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 163
"__id__": 170
},
"_children": [
{
"__id__": 165
"__id__": 172
}
],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 174
},
{
"__id__": 168
"__id__": 175
}
],
"_prefab": null,
......@@ -8081,13 +8455,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 164
"__id__": 171
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 173
}
],
"_prefab": null,
......@@ -8143,7 +8517,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8176,7 +8550,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8208,7 +8582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 171
},
"_enabled": true,
"alignMode": 0,
......@@ -8235,7 +8609,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 170
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8308,7 +8682,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 164
"__id__": 171
},
"_id": "81HoUuRyJOppi+n4Av/u0p"
},
......@@ -8317,7 +8691,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 170
},
"_enabled": true,
"alignMode": 1,
......@@ -8344,7 +8718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 144
},
"_enabled": true,
"alignMode": 1,
......@@ -8377,13 +8751,13 @@
"_active": false,
"_components": [
{
"__id__": 173
"__id__": 180
},
{
"__id__": 174
"__id__": 181
},
{
"__id__": 175
"__id__": 182
}
],
"_prefab": null,
......@@ -8439,7 +8813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 179
},
"_enabled": true,
"alignMode": 2,
......@@ -8466,7 +8840,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 179
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8534,7 +8908,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8572,7 +8946,7 @@
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 184
}
],
"_prefab": null,
......@@ -8628,7 +9002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 183
},
"_enabled": true,
"_layoutSize": {
......@@ -8664,10 +9038,10 @@
},
"_children": [
{
"__id__": 179
"__id__": 186
},
{
"__id__": 182
"__id__": 189
}
],
"_active": false,
......@@ -8725,16 +9099,16 @@
"_name": "loading",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 187
},
{
"__id__": 181
"__id__": 188
}
],
"_prefab": null,
......@@ -8790,7 +9164,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -8822,7 +9196,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 186
},
"_enabled": true,
"_defaultClip": {
......@@ -8841,24 +9215,24 @@
"_name": "progress",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 185
},
"_children": [
{
"__id__": 183
"__id__": 190
}
],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 193
},
{
"__id__": 187
"__id__": 194
}
],
"_prefab": {
"__id__": 188
"__id__": 195
},
"_opacity": 255,
"_color": {
......@@ -8912,17 +9286,17 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 189
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 191
}
],
"_prefab": {
"__id__": 185
"__id__": 192
},
"_opacity": 255,
"_color": {
......@@ -8976,7 +9350,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 190
},
"_enabled": true,
"_materials": [
......@@ -9006,7 +9380,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 182
"__id__": 189
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......@@ -9019,7 +9393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -9051,7 +9425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 189
},
"_enabled": true,
"_id": "3eMT/DXoJNGZT/8Z3nuTUH"
......@@ -9059,7 +9433,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 182
"__id__": 189
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......
const testMockData = {"eof":1,"file":"/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3","audioUrl":"https://staging-teach.cdn.ireadabc.com/db48d49e122ba65aa7c5ee56963418a6.mp3","result":{"duration":"2.470","fluency":100,"integrity":100,"kernel_version":"3.6.7","overall":99,"pronunciation":99,"resource_version":"2.3.6","rhythm":0,"speed":78},"tokenId":"621c32543327932cfc000002"};
const recordMockData = {"text":"what can i do for you","audioUrl":"https://staging-teach.cdn.ireadabc.com/368ad56174f85e2ff1f39f12bac5c693.mp3"};
const testMockData = { "eof": 1, "file": "/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3", "audioUrl": "https://staging-teach.cdn.ireadabc.com/db48d49e122ba65aa7c5ee56963418a6.mp3", "result": { "duration": "2.470", "fluency": 100, "integrity": 100, "kernel_version": "3.6.7", "overall": 99, "pronunciation": 99, "resource_version": "2.3.6", "rhythm": 0, "speed": 78 }, "tokenId": "621c32543327932cfc000002" };
const recordMockData = { "text": "what can i do for you", "audioUrl": "https://staging-teach.cdn.ireadabc.com/368ad56174f85e2ff1f39f12bac5c693.mp3" };
export function initAir(_this) {
const realAir = {
......@@ -25,6 +25,7 @@ export function initAir(_this) {
osmoFingerReadCallback: function (res) {
_this.log(`***成功调用osmoFingerReadCallback***参数==${res}`);
},
startScanCodeCallback: null,
getEngineInfoCallback: null,
recognitionCameraCallBack: null,
testCallBack: null,
......@@ -38,7 +39,7 @@ export function initAir(_this) {
if (key == "osmoCallback" || key == "osmoHandwritingCallback" || key == "osmoHandwritingMlkitCallback" || key == "osmoFingerReadCallback") {
newValue = function (res) {
_this.log(`||==成功调用${key}==||参数==${JSON.stringify(res)}`);
if(typeof(res) == 'string') {
if (typeof (res) == 'string') {
value(res);
} else {
value(JSON.stringify(res));
......@@ -119,7 +120,7 @@ export function initAir(_this) {
}
// 结束录音
window.air.recordCallBack = (res) => {
res = typeof(res) == 'string' ? res : JSON.stringify(res);
res = typeof (res) == 'string' ? res : JSON.stringify(res);
_this.log(`===成功调用recordCallBack=== res == ${res}`);
callback && callback(res);
window.air.recordCallBack = null;
......@@ -142,7 +143,7 @@ export function initAir(_this) {
}
// 结束录音
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}`);
callback && callback(res);
window.air.testCallBack = null;
......@@ -167,7 +168,7 @@ export function initAir(_this) {
_this.log(`===成功调用getEngineInfo===`);
// 调用原生获取机器信息
window.air.getEngineInfoCallback = (res) => {
if(typeof(res) == 'string') {
if (typeof (res) == 'string') {
window.air.engineInfo = res;
callback && callback(res);
} else {
......@@ -178,6 +179,15 @@ export function initAir(_this) {
};
window.courseware.callOcMethod("getEngineInfo", {});
},
startScanCode(callback) {
_this.log(`===成功调用startScanCode===`);
// 调用原生开始扫码
window.air.startScanCodeCallback = (res) => {
callback && callback(res);
window.air.startScanCodeCallback = null;
};
window.courseware.callOcMethod("startScanCode", {});
},
openOsmo(params = {}) {
window.courseware.hasCalledOpenOsmo = true;
_this.log(`===成功调用openOsmo===${JSON.stringify(params)}`);
......@@ -229,15 +239,15 @@ export function initAir(_this) {
console.log('汪汪汪')
} else {
console.error(`非源生环境,网页版不支持${method}方法,将返回此方法的Mock数据以便于网页版调试使用`);
if(method == 'getEngineInfo'){
window.air.getEngineInfoCallback({isDev: 1, uuid: 'debug-xxxxxx-xxxxxx'});
if (method == 'getEngineInfo') {
window.air.getEngineInfoCallback({ isDev: 1, uuid: 'debug-xxxxxx-xxxxxx' });
} else if (method == 'startTest') {
} else if (method == 'stopTest') {
window.air.testCallBack(testMockData);
} else if (method == 'startRecord') {
} else if (method == 'stopRecord') {
window.air.recordCallBack(recordMockData);
} else{
} else {
console.error(`${method}方法还没有Mock数据,请联系技术支持人员添加`);
}
}
......
......@@ -541,6 +541,12 @@ cc.Class({
});
});
cc.find('middleLayer/ui/BtnScanCode').on('click', () => {
window.courseware.startScanCode((res) => {
this.showLog(res);
});
});
cc.find('middleLayer/ui/BtnOpenTest').on('click', () => {
window.courseware.startTest('apple');
});
......
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