From 777bc70e45300aed89d721fdbe414ecf468a7871 Mon Sep 17 00:00:00 2001
From: Eason010212 <1371033826@qq.com>
Date: Thu, 22 Aug 2024 15:53:07 +0800
Subject: [PATCH] localeTimeStr

---
 blockly/iot/IOT_Blocks.js   | 10 ++++++++++
 blockly/iot/IOT_Generate.js |  5 +++++
 ejs/projects.ejs            |  3 +++
 3 files changed, 18 insertions(+)

diff --git a/blockly/iot/IOT_Blocks.js b/blockly/iot/IOT_Blocks.js
index 4591293..f4861b7 100644
--- a/blockly/iot/IOT_Blocks.js
+++ b/blockly/iot/IOT_Blocks.js
@@ -1697,6 +1697,16 @@ Blockly.Blocks['current_time'] = {
   }
 };
 
+Blockly.Blocks['current_time_string'] = {
+  init: function() {
+    this.appendDummyInput().appendField(Blockly.Msg.CURRENT_TIME + "(LocaleString)");
+    this.setOutput(true, "String");
+    this.setColour("5BA58C");
+    this.setTooltip("");
+    this.setHelpUrl("");
+  }
+};
+
 
 Blockly.Blocks['math_parse_int'] = {
   init: function() {
diff --git a/blockly/iot/IOT_Generate.js b/blockly/iot/IOT_Generate.js
index 772af11..2d6bf7f 100644
--- a/blockly/iot/IOT_Generate.js
+++ b/blockly/iot/IOT_Generate.js
@@ -648,6 +648,11 @@ Blockly.JavaScript.current_time=function(block) {
     return [code, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
+Blockly.JavaScript.current_time_string=function(block) {
+    var code="Date().toLocaleString()"
+    return [code, Blockly.JavaScript.ORDER_ATOMIC];
+};
+
 
 Blockly.JavaScript.math_parse_int=function(block) {
     var name = Blockly.JavaScript.valueToCode(this, 'name', Blockly.JavaScript.ORDER_ATOMIC);
diff --git a/ejs/projects.ejs b/ejs/projects.ejs
index 5a6b16d..891f07f 100644
--- a/ejs/projects.ejs
+++ b/ejs/projects.ejs
@@ -48,6 +48,8 @@
     <script>var OFFLINE_MODE = <%=configs['OFFLINE_MODE']%></script>
     <script>var MAX_PROJECT_NUM_PER_USER = <%=configs['MAX_PROJECT_NUM_PER_USER']%></script>
     <script>var BAIDU_MAP_AK = '<%=configs['BAIDU_MAP_AK']%>'</script>
+    <script>var MIXIO_WS_PORT = '<%=configs['MIXIO_WS_PORT']%>'</script>
+    <script>var MIXIO_WSS_PORT = '<%=configs['MIXIO_WSS_PORT']%>'</script>
     <script src="js/projects.js?v=273"></script>
     <script src="js/MixIO.js?v=30"></script>
     <style>
@@ -282,6 +284,7 @@
     <category name="文本" colour="160" toolboxitemid="catText" css-icon="blocklyTreeIcon">
         <block type="text"></block>
         <block type="current_time"></block>
+        <block type="current_time_string"></block>
         <block type="text_join"></block>
         <block type="text_append"></block>
         <block type="text_length"></block>