From 782ac78c5bb76d796143b9e0bbf9eba9cb2e8f18 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Mon, 16 Jun 2025 16:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BE=E5=83=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
boards/default_src/micropython/blocks/ai_local.js | 15 ++-------------
.../micropython/generators/ai_local.js | 9 ++-------
.../default_src/micropython_esp32s3/template.xml | 1 -
common/msg/blockly/en.js | 5 ++---
common/msg/blockly/zh-hans.js | 5 ++---
common/msg/blockly/zh-hant.js | 5 ++---
6 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/boards/default_src/micropython/blocks/ai_local.js b/boards/default_src/micropython/blocks/ai_local.js
index 567a8a59..54efc266 100644
--- a/boards/default_src/micropython/blocks/ai_local.js
+++ b/boards/default_src/micropython/blocks/ai_local.js
@@ -277,22 +277,11 @@ export const SHOOT_AND_SAVE_PICTURE = {
}
};
-export const GET_PICTURE_DATA = {
- init: function () {
- this.setColour(AI_LOCAL_GRAPH_HUE);
- this.appendDummyInput()
- .appendField(Blockly.Msg.MIXLY_GET_PICTURE_DATA);
- this.setOutput(true);
- this.setInputsInline(true);
- this.setTooltip(Blockly.Msg.MIXLY_GET_PICTURE_DATA_TOOLTIP);
- }
-};
-
export const GET_PICTURE_DATA_EXACT = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendDummyInput()
- .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET + Blockly.Msg.MIXLY_MICROBIT_IMAGE)
+ .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"],
@@ -578,7 +567,7 @@ export const MIXIO_REPORT_IMAGE_DATA = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
this.appendDummyInput()
- .appendField(Blockly.Msg.MIXLY_REPORT_IMAGE_DATA + Blockly.Msg.LANG_CONTROLS_FOR_INPUT_FROM + Blockly.Msg.MIXLY_CHOOSE_AND_GET_DIR)
+ .appendField(Blockly.Msg.MIXLY_GET +Blockly.Msg.MIXLY_IMAGE_OF_FILE)
this.appendValueInput('SUB');
this.setOutput(true);
this.setInputsInline(true);
diff --git a/boards/default_src/micropython/generators/ai_local.js b/boards/default_src/micropython/generators/ai_local.js
index d125f810..6227f38f 100644
--- a/boards/default_src/micropython/generators/ai_local.js
+++ b/boards/default_src/micropython/generators/ai_local.js
@@ -118,15 +118,10 @@ export const SHOOT_AND_SAVE_PICTURE = function (_, generator) {
return code;
}
-export const GET_PICTURE_DATA = function (_, generator) {
- var code = 'cam.snapshot()';
- return [code, generator.ORDER_ATOMIC];
-}
-
export const GET_PICTURE_DATA_EXACT = function (_, generator) {
generator.definitions_['import_base64'] = 'import base64';
var kind = this.getFieldValue('kind');
- var code = 'cam.snapshot(' + kind +')';
+ var code = 'cam.snapshot(formats=' + kind +')';
return [code, generator.ORDER_ATOMIC];
}
@@ -242,6 +237,6 @@ export const AI_STOP_ACQUISITION = function (_, generator) {
export const MIXIO_REPORT_IMAGE_DATA = function (_, generator) {
generator.definitions_['import_base64'] = 'import base64';
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
- var code = 'mixio.image_base64('+ sub +')';
+ var code = 'mixiot.image_base64('+ sub +')';
return [code, generator.ORDER_ATOMIC];
}
\ No newline at end of file
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 33a1584b..41b1a1f3 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -2389,7 +2389,6 @@
-
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index 65f03747..663aa53f 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -3931,7 +3931,7 @@ En.MIXLY_REF_TO_PRESSURE = 'Reference pressure';
En.MIXLY_CAL_TO_ALTITUDE = 'Calculate the altitude';
En.MIXLY_SHOOTING_SIZE = 'Capture Size';
En.MIXLY_SHOOT_AND_SAVE_PICTURE = 'Capture and Save Photo';
-En.MIXLY_GET_PICTURE_DATA = 'Get Image Data';
+En.MIXLY_GET_PICTURE_DATA = 'Get Image of Camera';
En.MIXlY_SCREEN_SHOW_CAM_SHOOT = 'Display Camera Capture on Screen';
En.MIXlY_STOP_SCREEN_DISPLAY = 'Turn Off Real-Time LCD Display of Camera Capture';
En.MIXLY_RECOGNITION = 'Detection';
@@ -3950,7 +3950,6 @@ En.MIXLY_GET_CAT_FACE_DETECTION_RESULT_TOOLTIP = 'Get cat face detection results
// En.MIXLY_GET_PEOPLE_FACE_RECOGNITION_RESULT_TOOLTIP = 'Get face recognition results, returning face ID (starting from 1), rectangular regions, and corresponding 5-point coordinates. Explanation: v[0]: number of faces; v[1-4]: top-left and bottom-right coordinates; v[5-14]: left eye, right eye, nose, left mouth corner, right mouth corner coordinates.';
En.FACE_ENROLL = 'Enroll Face';
En.MIXLY_DELETE_PEOPLE_FACE_ID = 'Delete Face ID Information';
-En.MIXLY_GET_PICTURE_DATA_TOOLTIP = 'Return the image data (width, height, data)';
En.MIXLY_HOW_MUCH = 'How many';
En.MIXLY_Pixel_block = 'Pixel block';
En.MIXLY_KEYPOINT = 'Keypoint';
@@ -3971,5 +3970,5 @@ En.MIXLY_TVOC_CO2_SENSOR = 'TVOC,formaldehyde and carbon dioxide sensors';
En.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = 'Obtain the concentrations of TVOC(mg/m³), formaldehyde (mg/m³), and carbon dioxide (ppm)';
En.MIXLY_IMAGE_ACQUISITION = 'image acquisition';
En.MIXLY_JPG_base64_CODE= "JPG's base64 code";
-En.MIXLY_REPORT_IMAGE_DATA = 'report image data';
+En.MIXLY_IMAGE_OF_FILE = ' image file';
})();
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index ab85dc80..a8ed4081 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -4091,7 +4091,7 @@ ZhHans.MIXLY_REF_TO_PRESSURE = '参考气压';
ZhHans.MIXLY_CAL_TO_ALTITUDE = '计算获取海拔';
ZhHans.MIXLY_SHOOTING_SIZE = '拍摄尺寸';
ZhHans.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍摄照片并保存';
-ZhHans.MIXLY_GET_PICTURE_DATA = '获取图像数据';
+ZhHans.MIXLY_GET_PICTURE_DATA = '获取摄像头图像';
ZhHans.MIXlY_SCREEN_SHOW_CAM_SHOOT = '屏幕实时显示摄像头采集图像';
ZhHans.MIXLY_RECOGNITION = '检测';
ZhHans.MIXLY_GET_QR_CODE_RECOGNITION_RESULT = '获取二维码检测结果';
@@ -4109,7 +4109,6 @@ ZhHans.MIXLY_GET_CAT_FACE_DETECTION_RESULT_TOOLTIP = '获取猫脸检测结果
// ZhHans.MIXLY_GET_PEOPLE_FACE_RECOGNITION_RESULT_TOOLTIP = '获取人脸识别结果,获取人识别结果,返回人脸ID(ID从1开始)、矩形区域和和对应的5点坐标。说明:v[0]:人脸数量;v[1-4]:矩形左上角和右下角坐标;v[5-14]:左眼、右眼、鼻子、左嘴角、右嘴角坐标。';
ZhHans.FACE_ENROLL = '录入人脸';
ZhHans.MIXLY_DELETE_PEOPLE_FACE_ID = '删除人脸ID信息';
-ZhHans.MIXLY_GET_PICTURE_DATA_TOOLTIP = '返回图像的(宽,高,数据)';
ZhHans.MIXLY_HOW_MUCH = '有几个';
ZhHans.MIXLY_Pixel_block = '像素块';
ZhHans.MIXLY_KEYPOINT = '关键点';
@@ -4130,5 +4129,5 @@ ZhHans.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳传感器';
ZhHans.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '获取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的浓度(ppm)';
ZhHans.MIXLY_IMAGE_ACQUISITION = '图像采集';
ZhHans.MIXLY_JPG_base64_CODE= 'JPG的base64编码';
-ZhHans.MIXLY_REPORT_IMAGE_DATA = '上报图像数据';
+ZhHans.MIXLY_IMAGE_OF_FILE = '文件图像';
})();
\ No newline at end of file
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index dc4cd90c..21da290e 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -4085,7 +4085,7 @@ ZhHant.MIXLY_REF_TO_PRESSURE = '參考氣壓';
ZhHant.MIXLY_CAL_TO_ALTITUDE = '計算獲取海拔';
ZhHant.MIXLY_SHOOTING_SIZE = '拍攝尺寸';
ZhHant.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍攝照片並保存';
-ZhHant.MIXLY_GET_PICTURE_DATA = '獲取圖像數據';
+ZhHant.MIXLY_GET_PICTURE_DATA = '獲取攝像頭圖像';
ZhHant.MIXlY_SCREEN_SHOW_CAM_SHOOT = '屏幕顯示攝像頭採集圖像';
ZhHant.MIXlY_STOP_SCREEN_DISPLAY = '關閉攝像頭採集圖像LCD實時顯示';
ZhHant.MIXLY_RECOGNITION = '檢測';
@@ -4104,7 +4104,6 @@ ZhHant.MIXLY_GET_CAT_FACE_DETECTION_RESULT_TOOLTIP = '獲取貓臉檢測結果
// ZhHant.MIXLY_GET_PEOPLE_FACE_RECOGNITION_RESULT_TOOLTIP = '獲取人臉識別結果,獲取人識別結果,返回人臉ID(ID從1開始)、矩形區域和和對應的5點坐標。說明:v[0]:人臉數量;v[1-4]:矩形左上角和右下角坐標;v[5-14]:左眼、右眼、鼻子、左嘴角、右嘴角坐標。';
ZhHant.FACE_ENROLL = '錄入人臉';
ZhHant.MIXLY_DELETE_PEOPLE_FACE_ID = '刪除人臉ID信息';
-ZhHant.MIXLY_GET_PICTURE_DATA_TOOLTIP = '返回圖像的（寬，高，數據）';
ZhHant.MIXLY_HOW_MUCH = '有幾個';
ZhHant.MIXLY_Pixel_block = '像素塊';
ZhHant.MIXLY_KEYPOINT = '關鍵點';
@@ -4125,5 +4124,5 @@ ZhHant.MIXLY_TVOC_CO2_SENSOR = 'TVOC、甲醛、二氧化碳傳感器';
ZhHant.MIXLY_TVOC_CO2_SENSOR_GRT_DATA = '獲取TVOC(mg/m3) 、甲醛(mg/m3)、二氧化碳的濃度(ppm)';
ZhHant.MIXLY_IMAGE_ACQUISITION = '圖像採集';
ZhHant.MIXLY_JPG_base64_CODE= 'JPG的base64編碼';
-ZhHant.MIXLY_REPORT_IMAGE_DATA = '上報圖像數據';
+ZhHant.MIXLY_IMAGE_OF_FILE = '文件圖像';
})();