智能相关 S3和C2修改

This commit is contained in:
Irene-Maxine
2025-11-01 17:09:11 +08:00
parent 3572a8e0b2
commit 969793d779
8 changed files with 96 additions and 21 deletions

View File

@@ -24,8 +24,6 @@ export const init_xunfei_vi = {
}
};
export const init_xunfei_Spark_Ultra = {
init: function () {
this.setColour(AI_CLOUD_VOICE_HUE);
@@ -64,6 +62,31 @@ export const init_xunfei_Spark_Ultra = {
}
};
export const init_xunfei_Chinese_Model = {
init: function () {
this.setColour(AI_CLOUD_VOICE_HUE);
this.appendValueInput('VAR')
.appendField(Blockly.Msg.MIXLY_MICROPYTHON_SOCKET_MAKE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.MIXLY_AS + Blockly.Msg.MIXLY_XUFEI+Blockly.Msg.MIXLY_CHINESE_RECOGNIZION+Blockly.Msg.MIXLY_LARGE_LANGUAGE_MODEL );
this.appendValueInput('APPID')
.setCheck(String)
.appendField('APPID');
this.appendValueInput('APISecret')
.setCheck(String)
.appendField('APISecret');
this.appendValueInput('APIKey')
.setCheck(String)
.appendField('APIKey');
this.appendValueInput('HW')
.setCheck(String)
.appendField(Blockly.Msg.MIXLY_HOT_WORD + 'ID');
this.setInputsInline(true);
this.setPreviousStatement(true);
this.setNextStatement(true);
}
};
export const xunfei_vi_run = {
init: function () {
this.setColour(AI_CLOUD_VOICE_HUE);

View File

@@ -370,11 +370,21 @@ export const GET_PICTURE_DATA_EXACT = {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET_PICTURE_DATA)
// .appendField(new Blockly.FieldDropdown([
// ["RGB565" + Blockly.Msg.MIXLY_SD_DATA,"0"],
// ["JPG" + Blockly.Msg.MIXLY_SD_DATA,"1"],
// [Blockly.Msg.MIXLY_JPG_base64_CODE + Blockly.Msg.MIXLY_SD_DATA ,"2"]
// ]),"kind")
this.setOutput(true);
this.setInputsInline(true);
}
};
export const GET_PICTURE_WIDTH_HEIGHT_DEVICE = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GET)
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_SMARTCAMERA+Blockly.Msg.MIXLY_MICROBIT_IMAGE+Blockly.Msg.MIXLY_WIDTH,"get_pixel_width"],
[Blockly.Msg.MIXLY_SMARTCAMERA+Blockly.Msg.MIXLY_MICROBIT_IMAGE+Blockly.Msg.MIXLY_HEIGHT,"get_pixel_height"],
[Blockly.Msg.MIXLY_SMARTCAMERA+Blockly.Msg.MIXLY_MODEL_NUMBER,"get_sensor_name"]
]),"kind")
this.setOutput(true);
this.setInputsInline(true);
}

View File

@@ -21,6 +21,17 @@ export const init_xunfei_Spark_Ultra = function (_, generator) {
return code;
}
export const init_xunfei_Chinese_Model = function (_, generator) {
generator.definitions_['import_mini_xunfei'] = "import mini_xunfei";
var v = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var id = generator.valueToCode(this, 'APPID', generator.ORDER_ATOMIC);
var s = generator.valueToCode(this, 'APISecret', generator.ORDER_ATOMIC);
var key = generator.valueToCode(this, 'APIKey', generator.ORDER_ATOMIC);
var hw = this.getFieldValue('HW');
var code = v + ' = mini_xunfei.IAT_WebSocket('+id+','+key +','+s+',res_id="'+hw+'")\n';
return code;
}
export const xunfei_vi_run = function (_, generator) {
var v = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var t = generator.valueToCode(this, 'time', generator.ORDER_ATOMIC);

View File

@@ -173,6 +173,12 @@ export const GET_PICTURE_DATA_EXACT = function (_, generator) {
return [code, generator.ORDER_ATOMIC];
}
export const GET_PICTURE_WIDTH_HEIGHT_DEVICE = function (_, generator) {
var kind = this.getFieldValue('kind');
var code = 'camera.'+kind+'()';
return [code, generator.ORDER_ATOMIC];
}
export const CONVERT_IMAGE_TO_JPG = function (_, generator) {
generator.definitions_['camera_import_Image'] = 'from camera import Image';
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
@@ -520,14 +526,14 @@ export const GET_FACE_DETECTION_NAME = function (_, generator) {
// return [code, generator.ORDER_ATOMIC];
// }
// export const GET_NO_FACE_RECOGNITION_INFO = function (_, generator) {
// generator.definitions_['import_esp_dl'] = 'import esp_dl';
// var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
// var num = generator.valueToCode(this, 'NO', generator.ORDER_ATOMIC);
// var kind = this.getFieldValue('kind');
// var code = "esp_dl.analyze("+sub+', "person",'+ num +')["'+kind+'"]';
// return [code, generator.ORDER_ATOMIC];
// }
export const GET_NO_FACE_RECOGNITION_INFO = function (_, generator) {
generator.definitions_['import_esp_dl'] = 'import esp_dl';
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var num = generator.valueToCode(this, 'NO', generator.ORDER_ATOMIC);
var kind = this.getFieldValue('kind');
var code = "esp_dl.analyze("+sub+', "person",'+ num +')["'+kind+'"]';
return [code, generator.ORDER_ATOMIC];
}
// export const PEOPLE_FACE_ENROLL = function (_, generator) {
// var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);

View File

@@ -160,9 +160,6 @@ export const IOT_EMQX_INIT_AND_CONNECT_BY_SHARE_CODE = function (_, generator) {
// var port = '1883';
var share_code = generator.valueToCode(this, 'KEY', generator.ORDER_ATOMIC);
generator.definitions_['import_mixiot'] = "import mixiot";
generator.definitions_['import_machine'] = "import machine";
generator.definitions_['import_urequests'] = "import urequests";
generator.definitions_['import_ubinascii_hexlify'] = "from ubinascii import hexlify";
generator.definitions_['import_mixpy_analyse_sharekey'] = "from mixpy import analyse_sharekey";
// var mac_address = 'str(binascii.hexlify(wifi.radio.mac_address))[2:14]'
// var socket_pool = 'socketpool.SocketPool(wifi.radio)'
@@ -189,8 +186,6 @@ export const iot_mixly_key = function (_, generator) {
export const IOT_EMQX_INIT_AND_CONNECT_BY_MIXLY_CODE = function (_, generator) {
generator.definitions_['import_mixiot'] = "import mixiot";
generator.definitions_['import_machine'] = "import machine";
generator.definitions_['import_ubinascii_hexlify'] = "from ubinascii import hexlify";
var server = generator.valueToCode(this, 'SERVER', generator.ORDER_ATOMIC);
// var port = '1883';
var username = '"MixIO_public"';

View File

@@ -2817,7 +2817,7 @@
</block>
</category>
</category>
<category id="catCloudAI" colour="#75878a">
<category id="catCloudAI" colour="#75878a">
<category id="catVI" colour="88ada6">
<block type="init_xunfei_vi">
<value name="VAR">
@@ -2868,6 +2868,33 @@
</shadow>
</value>
</block>
<block type="init_xunfei_Chinese_Model">
<value name="VAR">
<shadow type="variables_get">
<field name="VAR">llm</field>
</shadow>
</value>
<value name="APPID">
<shadow type="text">
<field name="TEXT"></field>
</shadow>
</value>
<value name="APISecret">
<shadow type="text">
<field name="TEXT"></field>
</shadow>
</value>
<value name="APIKey">
<shadow type="text">
<field name="TEXT"></field>
</shadow>
</value>
<value name="HW">
<shadow type="text">
<field name="TEXT"></field>
</shadow>
</value>
</block>
<block type="xunfei_vi_run">
<value name="VAR">
<shadow type="variables_get">

View File

@@ -2698,6 +2698,7 @@
<block type="GET_PICTURE_DATA_EXACT"></block>
</value>
</block>
<block type="GET_PICTURE_WIDTH_HEIGHT_DEVICE"></block>
<block type="CONVERT_IMAGE_TO_JPG">
<value name="SUB">
<shadow type="variables_get">