panweitong 4 år sedan
förälder
incheckning
08b22ed3a5

+ 18 - 2
index.css

@@ -10,6 +10,14 @@
     box-sizing: border-box;
 }
 
+body {
+    font-family: "Microsoft YaHei";
+}
+
+input {
+    font-family: "Microsoft YaHei";
+}
+
 .nav-fixed>.shadowbox {
     z-index: 2;
 }
@@ -829,6 +837,8 @@ ul, li {
     position: absolute;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_box1 {
@@ -836,9 +846,11 @@ ul, li {
     display: inline-block;
     bottom: 0;
     position: absolute;
-    left: 130px;
+    left: 240px;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_box2 {
@@ -846,9 +858,11 @@ ul, li {
     display: inline-block;
     bottom: 0;
     position: absolute;
-    left: 260px;
+    left: 450px;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_select {
@@ -856,6 +870,8 @@ ul, li {
     /* border-radius: 13px 15px 0px 0px; */
     color: #4A6AFF;
     font-weight: 700;
+    width: 150px;
+    text-align: center;
 }
 
 #repl_box_content div {

+ 35 - 26
index.html

@@ -241,10 +241,12 @@
                                 <span class="translatable_download_uploader">下载安装程序</span>
                                 <ul id="plugin_mac_or_windows" class='dropdown-content'
                                     style="display:none; position: fixed; left: 320px; top: 64px;">
-                                    <li id="Mac" onclick="openUrl('cocorobo.cn/downloads/CocoBlocklyXUploaderInstallerv1.0.10.pkg')">
+                                    <li id="Mac"
+                                        onclick="openUrl('cocorobo.cn/downloads/CocoBlocklyXUploaderInstallerv1.0.10.pkg')">
                                         <span><img src="./icons/mac-icon.png">Mac</span>
                                     </li>
-                                    <li id="Windows" onclick="openUrl('cocorobo.cn/downloads/CocoBlocklyXUploaderInstallerv1.0.11.exe')">
+                                    <li id="Windows"
+                                        onclick="openUrl('cocorobo.cn/downloads/CocoBlocklyXUploaderInstallerv1.0.11.exe')">
                                         <span><img src="./icons/windows-icon.png">Windows</span>
                                     </li>
                                 </ul>
@@ -320,7 +322,8 @@
                             <input type="text" value="A.I. Module" id="iot_modules" readonly
                                 class="selectMode_input browser-default"
                                 style="font-size: 0.9rem;border: none;width: 130px;">
-                            <i id="down" class="down" style="position: relative;top: -20px;float: right;right: 18px;"></i>
+                            <i id="down" class="down"
+                                style="position: relative;top: -20px;float: right;right: 18px;"></i>
                             <div class="downbox MouduleBox" id="downboxModule" style="top: 64px;">
                                 <div style="border: none;"><a href="javaScript:(0)" style="color: #424242 !important;"
                                         class="translatable_ai_module">A.I. Module</a></div>
@@ -681,21 +684,21 @@
                     <li id="cloudBtn-shares">
                         <i class="material-icons" style="margin-left:5px;cursor: pointer;display: none;">share</i>
                     </li>
-                    <i id="workspace_screenshot" style="margin-left:5px;cursor: pointer;">
+                    <i id="workspace_screenshot" style="margin-left:5px;cursor: pointer;position: absolute;right: 350px;">
                         <img src="./images/screenshot.png" style="width: 40px;height: 35px;margin:15px;" />
                     </i>
                     <i id="button_delete" class="material-icons sketch_name_icon right"
                         style="margin-left:5px;cursor: pointer;display: none;">delete</i>
 
-                    <li>
+                    <li id="sketch_name-li" style="position: absolute;right: 135px;">
                         <input id="sketch_name" placeholder="请输入作品名称" class="sketch_name"
-                            style="background: #fff;padding: 4px 10px 4px 20px;color:#222222;width:220px;font-style: initial;"
+                            style="background: #fff;padding: 4px 10px 4px 20px;color:#222222;width:200px;font-style: initial;line-height: 30px;"
                             type="text">
                     </li>
 
-                    <li>
+                    <li id="downloadbutton-li" style="position: absolute;right: 68px;">
                         <button id="downloadbutton" class="translatable_sketch_save"
-                            style="color: #fff;font-weight: 700;background: #4A6AFF;border: none;font-size: 15px;padding: 13px 20px;height: 40px;">保存</button>
+                            style="color: #fff;font-weight: 700;background: #4A6AFF;border: none;font-size: 14px;padding:13px 20px 9px 20px;">保存</button>
                     </li>
 
                     <!-- App Center demo -->
@@ -871,8 +874,9 @@
                 <div>
                     <div id='blockpy-content'>
                         <div class="blockpy-editor">
-                            <div class="white blockpy-blocks blockpy-editor-menu"> <img id="fullscreenIcon" class="fullscreenIcon"
-                                    src="./images/icon-fullscreen.svg"> <img id="fullscreenExitIcon" class="fullscreenIcon hidden"
+                            <div class="white blockpy-blocks blockpy-editor-menu"> <img id="fullscreenIcon"
+                                    class="fullscreenIcon" src="./images/icon-fullscreen.svg"> <img
+                                    id="fullscreenExitIcon" class="fullscreenIcon hidden"
                                     src="./images/icon-fullscreen-exit.svg">
                                 <div class='blockly-div' style="width:100%;height:100%;"></div>
                             </div>
@@ -884,27 +888,32 @@
                                     style='position:relative;height: 45px;line-height: 45px;background: #E6F1FF;border-bottom: unset;'>
                                     <!--<span class="header-icon">&lt &gt</span>--> <span id="python_SourceCode" class="header-text translate-code
                                             translatable_pythonSourceCode switch_box switch_select"
-                                        style='margin-left: 1px;'>Python
+                                        style='margin-left: 25px;'>Python
                                         Source Code</span> <span id="Serial_Interaction"
                                         class="header-text translatable_serial_plotter switch_box1">串口数据显示</span>
 
                                     <span id="Serial_Display"
                                         class="header-text translatable_serial_visualization switch_box2">串口数据可视化</span>
 
+                                </div>
+                                <div style="position: relative;">
                                     <a class="blockpy-toolbar-edit" style="position:absolute;top: 5px;right:
-                                        110px;"> <img id="edit-off" src="./images/icon-edit.svg"
+                                    130px;"> <img id="edit-off" src="./images/icon-edit.svg"
                                             style="margin-top: 7px;display: block;">
                                         <img id="edit-on" src="./images/icon-edit-on.svg"
                                             style="margin-top: 7px;display: none;">
                                     </a>
-                                    <a class="copy_code" style="position:absolute;top: 5px;right: 75px;"
+                                    <a class="copy_code" style="position:absolute;top: 5px;right: 95px;"
                                         data-clipboard-action="copy">
-                                        <img id="copy_code_view" src="./images/icon-view.svg" style="margin-top:7px;"> </a>
+                                        <img id="copy_code_view" src="./images/icon-view.svg" style="margin-top:7px;">
+                                    </a>
                                     <a class="blockpy-toolbar-download" style="position:absolute;top: 5px;right:
-                                        39px;"> <img id="blockpy-toolbar-download" src="./images/icon-download.svg" style="margin-top: 7px;">
+                                    59px;"> <img id="blockpy-toolbar-download" src="./images/icon-download.svg"
+                                            style="margin-top: 7px;">
                                     </a>
-                                    <a class="blockpy-toolbar-upload" style="position:absolute;top: 5px;right: 5px;">
-                                        <img id="blockpy-toolbar-upload" src="./images/icon-upload.svg" style="margin-top: 7px;"> </a>
+                                    <a class="blockpy-toolbar-upload" style="position:absolute;top: 5px;right: 25px;">
+                                        <img id="blockpy-toolbar-upload" src="./images/icon-upload.svg"
+                                            style="margin-top: 7px;"> </a>
                                     <img class="fullscreenIcon hidden" src="./images/icon-fullscreen.svg">
                                     <img class="fullscreenIcon hidden" src="./images/icon-fullscreen-exit.svg">
 
@@ -912,7 +921,7 @@
                                         style="margin-left: 20px;cursor: pointer;position: absolute;top: 12px;right: 0px;display:none;">delete</i>
                                 </div>
                                 <div class="card-content"
-                                    style="position:relative;height: calc(100% - 45px);overflow:auto;" id="python_box">
+                                    style="position:relative;height: calc(100% - 90px);overflow:auto;margin-top: 45px;" id="python_box">
 
                                     <div class="editDiv" id="editDiv" style="top: 0;width: 100%;left: 0;padding: 0;z-index: 0;
                                         right: 0;">
@@ -940,7 +949,7 @@
                                     </div>
                                 </div>
                                 <div class="card-content hidden"
-                                    style="position:relative;height: calc(100% - 60px);overflow:auto;padding:5px 10px;background-color: #fff; color: #000;"
+                                    style="position:relative;height: calc(100% - 90px);overflow:auto;padding:5px 10px;background-color: #fff; color: #000;margin-top: 45px;"
                                     id="repl_box">
                                     <div class="editDiv" id="editDiv" style="width: 100%;left: -10px;padding: 0;">
                                         <span class="translatable_serial_plotter serial-active" id="switchSerial1"
@@ -966,7 +975,7 @@
                             <div class='blockpy-content-left card-panel card'
                                 style='display: block;background: #f8f8f8;min-height: 245px;position:relative;'>
                                 <div class="card-header"
-                                    style='height: 60px;line-height: 60px;background: #f1f2f5;text-align: center;'>
+                                    style='height: 60px;line-height: 60px;background: #E6F1FF;text-align: center;'>
                                     <!-- http://help.cocorobo.cn/#/getting-started/info target="_blank"-->
                                     <div style='float:right;display: none;'>
                                         <a class="header-link upload_instruction" style="display: none;" href="#"
@@ -1013,17 +1022,17 @@
                                             src="./icons/uploader_connect.png"></div>
 
                                     <span id="device_connect_status" class="translatable_device_no_connect"
-                                        style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;">硬件(未连接)</span>
+                                        style="color: #2D2F33;font-size: 16px;font-weight: bold;">硬件(未连接)</span>
 
                                     <a id="send_string" onclick="sendstring('machine.reset()')" class="waves-effect
                                     waves-light blue  disabled"
-                                        style="margin-right:0.5rem;background-color: #f1f2f5 !important;float: right;margin-top: 10px;">
+                                        style="margin-right:0.5rem;background-color: #E6F1FF !important;float: right;margin-top: 10px;">
                                         <!-- <span id="resetDevice">Reset Device</span> -->
 
-                                        <img id="refresh-disabled" src="./images/icon-refresh-disabled.svg"
-                                            style="margin-top: 7px;display: block;">
+                                        <!-- <img id="refresh-disabled" src="./images/icon-refresh-disabled.svg"
+                                            style="margin-top: 7px;display: block;"> -->
                                         <img id="refresh" src="./images/icon-refresh.svg"
-                                            style="margin-top: 7px;display: none;">
+                                            style="margin-top: 7px;display: block;">
                                         <img id="refresh-press" src="./images/icon-refresh-press.svg"
                                             style="margin-top: 7px;display: none;">
                                     </a>
@@ -1222,7 +1231,7 @@
                                     </div>
                                     <div style="width:100%;height:78%;">
                                         <textarea readonly id="err-msg"
-                                            style="color:#fff;overflow:visible;font-family:consolas;font-size:14px;height:100%;resize:none;border:none;"></textarea>
+                                            style="color:#fff;overflow:visible;font-size:14px;height:100%;resize:none;border:none;"></textarea>
                                     </div>
                                 </div>
                             </div>

+ 12 - 8
index.js

@@ -448,11 +448,11 @@ window.onload = function () {
     }
     else if(window.location.href.indexOf("zh-hans") > -1){
       this.setAttribute("placeholder", "请输入作品名称");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
     else{
       this.setAttribute("placeholder", "請輸入作品名稱");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
   }).blur(function () {
     if (window.location.href.indexOf("en") > -1) {
@@ -461,11 +461,11 @@ window.onload = function () {
     }
     else if(window.location.href.indexOf("zh-hans") > -1){
       this.setAttribute("placeholder", "请输入作品名称");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
     else{
       this.setAttribute("placeholder", "請輸入作品名稱");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
   });
 }
@@ -476,16 +476,20 @@ function styled() {
     $("#downboxModule").addClass("english");
     $("#local_saveOrOpen").addClass("fileEnglish");
     $("#local_connect_select").addClass("fileEnglish");
-    $("#Serial_Interaction").css("marginLeft", "15px");
-    $("#Serial_Display").css("marginLeft", "35px");
+    // $("#Serial_Interaction").css("marginLeft", "15px");
+    // $("#Serial_Display").css("marginLeft", "35px");
     $("#iot_modules").css("width", "180px");
     $("#plugin_mac_or_windows").css("left", "390px");
     $("#connect_method").css("left", "390px");
     $("#local_help").addClass("helpEnglish");
     $("#local_help_ai_kit").css("left", "528px");
     $("#help_extends").css("left", "528px");
-    $("#Serial_Interaction").css("left","120px");
-    $("#Serial_Display").css("left","260px");
+    // $("#Serial_Interaction").css("left","120px");
+    // $("#Serial_Display").css("left","260px");
+    $("body").css("font-family","Arial");
+    $("input").css("font-family","Arial");
+    $("#workspace_screenshot").css("right","470px");
+    $("#downloadbutton-li").css("right","62px");
   }
 }
 

+ 3 - 3
materialize/js/materialize.js

@@ -4972,8 +4972,8 @@ if (Vel) {
           a2.className += a;
           a3.className += a;
           a4.className += a;
-          $("#refresh-disabled").css("display","block");
-          $("#refresh").css("display","none");
+          // $("#refresh-disabled").css("display","block");
+          $("#refresh").css("display","block");
           $("#refresh-press").css("display","none");
           $('#device_connect_status').replaceWith(`<span id="device_connect_status" style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;"><span id="device_connect_status_txt">${Ardublockly.LOCALISED_TEXT.device_no_connect}&nbsp&nbsp&nbsp&nbsp</span></span>`);
         }
@@ -4982,7 +4982,7 @@ if (Vel) {
         a2.className = a2.className.replace(a, "");
         a3.className = a3.className.replace(a, "");
         a4.className = a4.className.replace(a, "");
-        $("#refresh-disabled").css("display","none");
+        // $("#refresh-disabled").css("display","none");
         $("#refresh").css("display","block");
         $("#refresh-press").css("display","none");
         $('#device_connect_status').replaceWith(`<span id="device_connect_status" style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;"><span id="device_connect_status_txt">${Ardublockly.LOCALISED_TEXT.device_connect}&nbsp&nbsp&nbsp&nbsp</span></span>`);

+ 16 - 0
python/index.css

@@ -10,6 +10,14 @@
     box-sizing: border-box;
 }
 
+body {
+    font-family: "Microsoft YaHei";
+}
+
+input {
+    font-family: "Microsoft YaHei";
+}
+
 .nav-fixed>.shadowbox {
     z-index: 2;
 }
@@ -829,6 +837,8 @@ ul, li {
     position: absolute;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_box1 {
@@ -839,6 +849,8 @@ ul, li {
     left: 170px;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_box2 {
@@ -849,6 +861,8 @@ ul, li {
     left: 300px;
     padding: 0px 10px;
     color: #2D2F33;
+    width: 150px;
+    text-align: center;
 }
 
 .switch_select {
@@ -856,6 +870,8 @@ ul, li {
     /* border-radius: 13px 15px 0px 0px; */
     color: #4A6AFF;
     font-weight: 700;
+    width: 150px;
+    text-align: center;
 }
 
 #repl_box_content div {

+ 11 - 11
python/index.html

@@ -683,21 +683,21 @@
                     <li id="cloudBtn-shares">
                         <i class="material-icons" style="margin-left:5px;cursor: pointer;display: none;">share</i>
                     </li>
-                    <i id="workspace_screenshot" style="margin-left:5px;cursor: pointer;">
+                    <i id="workspace_screenshot" style="margin-left:5px;cursor: pointer;display: none;">
                         <img src="./images/screenshot.png" style="width: 40px;height: 35px;margin:15px;" />
                     </i>
                     <i id="button_delete" class="material-icons sketch_name_icon right"
                         style="margin-left:5px;cursor: pointer;display: none;">delete</i>
 
-                    <li>
+                    <li id="sketch_name-li" style="position: absolute;right: 135px;">
                         <input id="sketch_name" placeholder="请输入作品名称" class="sketch_name"
-                            style="background: #fff;padding: 4px 10px 4px 20px;color:#222222;width:220px;font-style: initial;"
+                            style="background: #fff;padding: 4px 10px 4px 20px;color:#222222;width:200px;font-style: initial;line-height: 30px;"
                             type="text">
                     </li>
 
-                    <li>
+                    <li id="downloadbutton-li" style="position: absolute;right: 68px;">
                         <button id="downloadbutton" class="translatable_sketch_save"
-                            style="color: #fff;font-weight: 700;background: #4A6AFF;border: none;font-size: 15px;padding: 13px 20px;height: 40px;">保存</button>
+                            style="color: #fff;font-weight: 700;background: #4A6AFF;border: none;font-size: 14px;padding:13px 20px 9px 20px;">保存</button>
                     </li>
 
                     <!-- App Center demo -->
@@ -961,7 +961,7 @@
                                     </div>
                                 </div>
                                 <div class="card-header"
-                                    style='height: 60px;line-height: 60px;background: #f1f2f5;text-align: center;'>
+                                    style='height: 60px;line-height: 60px;background: #E6F1FF;text-align: center;'>
                                     <!-- http://help.cocorobo.cn/#/getting-started/info target="_blank"-->
                                     <div style='float:right;display: none;'>
                                         <a class="header-link upload_instruction" style="display: none;" href="#"
@@ -1010,17 +1010,17 @@
 
 
                                     <span id="device_connect_status" class="translatable_device_no_connect"
-                                        style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;">硬件(未连接)</span>
+                                        style="color: #2D2F33;font-family: '微软雅黑';font-size: 16px;font-weight: bold;">硬件(未连接)</span>
 
                                     <a id="send_string" onclick="sendstring('machine.reset()')" class="waves-effect
                                     waves-light blue  disabled"
-                                        style="margin-right:0.5rem;background-color: #f1f2f5 !important;float: right;margin-top: 10px;">
+                                        style="margin-right:0.5rem;background-color: #E6F1FF !important;float: right;margin-top: 10px;">
                                         <!-- <span id="resetDevice">Reset Device</span> -->
 
-                                        <img id="refresh-disabled" src="./images/icon-refresh-disabled.svg"
-                                            style="margin-top: 7px;display: block;">
+                                        <!-- <img id="refresh-disabled" src="./images/icon-refresh-disabled.svg"
+                                            style="margin-top: 7px;display: block;"> -->
                                         <img id="refresh" src="./images/icon-refresh.svg"
-                                            style="margin-top: 7px;display: none;">
+                                            style="margin-top: 7px;display: block;">
                                         <img id="refresh-press" src="./images/icon-refresh-press.svg"
                                             style="margin-top: 7px;display: none;">
                                     </a>

+ 7 - 4
python/index.js

@@ -448,11 +448,11 @@ window.onload = function () {
     }
     else if(window.location.href.indexOf("zh-hans") > -1){
       this.setAttribute("placeholder", "请输入作品名称");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
     else{
       this.setAttribute("placeholder", "請輸入作品名稱");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
   }).blur(function () {
     if (window.location.href.indexOf("en") > -1) {
@@ -461,11 +461,11 @@ window.onload = function () {
     }
     else if(window.location.href.indexOf("zh-hans") > -1){
       this.setAttribute("placeholder", "请输入作品名称");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
     else{
       this.setAttribute("placeholder", "請輸入作品名稱");
-      $('#sketch_name').css("width","220px");
+      $('#sketch_name').css("width","200px");
     }
   });
 }
@@ -484,6 +484,9 @@ function styled() {
     $("#local_help").addClass("helpEnglish");
     $("#local_help_ai_kit").css("left", "528px");
     $("#help_extends").css("left", "528px");
+    $("body").css("font-family","Arial");
+    $("input").css("font-family","Arial");
+    $("#downloadbutton-li").css("right","62px");
   }
 }
 

+ 3 - 3
python/materialize/js/materialize.js

@@ -4972,8 +4972,8 @@ if (Vel) {
           a2.className += a;
           a3.className += a;
           a4.className += a;
-          $("#refresh-disabled").css("display","block");
-          $("#refresh").css("display","none");
+          // $("#refresh-disabled").css("display","block");
+          $("#refresh").css("display","block");
           $("#refresh-press").css("display","none");
           $('#device_connect_status').replaceWith(`<span id="device_connect_status" style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;"><span id="device_connect_status_txt">${Ardublockly.LOCALISED_TEXT.device_no_connect}&nbsp&nbsp&nbsp&nbsp</span></span>`);
         }
@@ -4982,7 +4982,7 @@ if (Vel) {
         a2.className = a2.className.replace(a, "");
         a3.className = a3.className.replace(a, "");
         a4.className = a4.className.replace(a, "");
-        $("#refresh-disabled").css("display","none");
+        // $("#refresh-disabled").css("display","none");
         $("#refresh").css("display","block");
         $("#refresh-press").css("display","none");
         $('#device_connect_status').replaceWith(`<span id="device_connect_status" style="color: #222222;font-family: '微软雅黑';font-size: 16px;font-weight: bold;"><span id="device_connect_status_txt">${Ardublockly.LOCALISED_TEXT.device_connect}&nbsp&nbsp&nbsp&nbsp</span></span>`);

+ 2 - 2
python/src/blockly/cocoblockly.js

@@ -1375,13 +1375,13 @@ async function cocoblockly() {
         // for (var i = 0; i < $('.Hardware2').length - 1; i++) {
         //     $('.HarxA')[i].className = 'Hardware2 HarxA max'
         // }
-        $("#python_SourceCode")[0].style.marginLeft = '0px';
+        $("#python_SourceCode")[0].style.marginLeft = '25px';
         // $("#repl_delete")[0].style.left = '310px'
     } else {
         // for (var i = 0; i < $('.Hardware2').length - 1; i++) {
         //     $('.HarxA')[i].className = 'Hardware2 HarxA'
         // }
-        $("#python_SourceCode")[0].style.marginLeft = '1px';
+        $("#python_SourceCode")[0].style.marginLeft = '25px';
         // $("#repl_delete")[0].style.left = '260px'
     }
     // (function() {

+ 1 - 1
python/src/blockly/dist/cocoblockly.dev.js

@@ -1375,7 +1375,7 @@ function cocoblockly() {
               $('.HarxA')[i].className = 'Hardware2 HarxA max';
             }
 
-            $("#python_SourceCode")[0].style.marginLeft = '0px';
+            $("#python_SourceCode")[0].style.marginLeft = '25px';
             $("#repl_delete")[0].style.left = '310px';
           } else {
             for (i = 0; i < $('.Hardware2').length - 1; i++) {

+ 3 - 3
python/src/blockly/web.js

@@ -75,7 +75,7 @@ sendstring = function () {
         // $('#resetDevice')[0].style.backgroundColor = "d9d9d9";
         $("#refresh-press").css("display","block");
         $("#refresh").css("display","none");
-        $("#refresh-disabled").css("display","none");
+        // $("#refresh-disabled").css("display","none");
         //上传中的处理
         $.ajax(`${CCB.socket.io.uri}/pythonreset`, {
             method: 'POST',
@@ -86,14 +86,14 @@ sendstring = function () {
                 // $('#resetDevice')[0].style.backgroundColor = "#508cf0";
                 $("#refresh").css("display","block");
                 $("#refresh-press").css("display","none");
-                $("#refresh-disabled").css("display","none");
+                // $("#refresh-disabled").css("display","none");
             },
             error: function (error) {
                 // $('#resetDevice')[0].innerHTML = CCB.str_group.reset_device;
                 // $('#resetDevice')[0].style.backgroundColor = "#508cf0";
                 $("#refresh").css("display","block");
                 $("#refresh-press").css("display","none");
-                $("#refresh-disabled").css("display","none");
+                // $("#refresh-disabled").css("display","none");
             }
         });
     }

+ 2 - 2
src/blockly/cocoblockly.js

@@ -1375,13 +1375,13 @@ async function cocoblockly() {
         // for (var i = 0; i < $('.Hardware2').length - 1; i++) {
         //     $('.HarxA')[i].className = 'Hardware2 HarxA max'
         // }
-        $("#python_SourceCode")[0].style.marginLeft = '0px';
+        $("#python_SourceCode")[0].style.marginLeft = '25px';
         // $("#repl_delete")[0].style.left = '310px'
     } else {
         // for (var i = 0; i < $('.Hardware2').length - 1; i++) {
         //     $('.HarxA')[i].className = 'Hardware2 HarxA'
         // }
-        $("#python_SourceCode")[0].style.marginLeft = '1px';
+        $("#python_SourceCode")[0].style.marginLeft = '25px';
         // $("#repl_delete")[0].style.left = '260px'
     }
     // (function() {

+ 3 - 3
src/blockly/web.js

@@ -75,7 +75,7 @@ sendstring = function () {
         // $('#resetDevice')[0].style.backgroundColor = "d9d9d9";
         $("#refresh-press").css("display","block");
         $("#refresh").css("display","none");
-        $("#refresh-disabled").css("display","none");
+        // $("#refresh-disabled").css("display","none");
         //上传中的处理
         $.ajax(`${CCB.socket.io.uri}/pythonreset`, {
             method: 'POST',
@@ -86,14 +86,14 @@ sendstring = function () {
                 // $('#resetDevice')[0].style.backgroundColor = "#508cf0";
                 $("#refresh").css("display","block");
                 $("#refresh-press").css("display","none");
-                $("#refresh-disabled").css("display","none");
+                // $("#refresh-disabled").css("display","none");
             },
             error: function (error) {
                 // $('#resetDevice')[0].innerHTML = CCB.str_group.reset_device;
                 // $('#resetDevice')[0].style.backgroundColor = "#508cf0";
                 $("#refresh").css("display","block");
                 $("#refresh-press").css("display","none");
-                $("#refresh-disabled").css("display","none");
+                // $("#refresh-disabled").css("display","none");
             }
         });
     }