panweitong 4 years ago
parent
commit
3b29506940

+ 3 - 3
data.json

@@ -6,7 +6,7 @@
             "ws_connect_fail": "No Plugin Connection. Uploading is disabled until you reconnect.",
             "ws_connect_success": "Plugin is connected successfully!",
             "ws_connect_loss": "Plugin is lost, please try to reconnect it.",
-            "no_port_option": "No ports detected",
+            "no_port_option": "",
             "uploading": "implement...",
             "reseting": "reseting...",
             "upload_fail": "implement failed",
@@ -191,7 +191,7 @@
             "ws_connect_fail": "插件沒有連接。上載無法使用,直到插件重新連接。",
             "ws_connect_success": "插件已經成功連接!",
             "ws_connect_loss": "插件丟失,請重新連接它。",
-            "no_port_option": "檢測不到連接端口",
+            "no_port_option": "",
             "uploading": "執行中...",
             "reseting": "重啟中...",
             "upload_fail": "執行失敗",
@@ -359,7 +359,7 @@
             "ws_connect_fail": "插件没有连接。上传无法使用,直到插件重新连接。",
             "ws_connect_success": "插件已经成功连接!",
             "ws_connect_loss": "插件丢失,请重新连接它。",
-            "no_port_option": "检测不到连接端口",
+            "no_port_option": "",
             "uploading": "执行中...",
             "reseting": "重启中...",
             "upload_fail": "执行失败",

+ 33 - 18
index.html

@@ -331,7 +331,7 @@
                                         class="translatable_iot_module">IoT Module
                                         Mode</a></div>
                                 <div style="border: none;"><a href="./python/" style="color: #424242 !important;"
-                                        class="translatable_python_full_screen_mode" target="_blank">Cloud
+                                        class="translatable_python_full_screen_mode">Cloud
                                         Mode</a></div>
                             </div>
                         </div>
@@ -883,7 +883,7 @@
                         </div>
                         <div id='sss' style='display:block;overflow: auto;'>
                             <div id="py-editor" class="blockpy-editor card-panel"
-                                style='height:calc(100% - 245px);display:block;overflow:auto'>
+                                style='height:calc(100% - 243px);display:block;overflow:auto'>
                                 <div class="card-header"
                                     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
@@ -973,7 +973,7 @@
                                 <!-- <a class="copy_code" style="position:absolute;top:160px;right:70px;z-index:999;cursor:pointer;" data-clipboard-action="copy">                    <img src="./images/icon-copy.svg" width="24px">                </a>                <div class="blockpy-toolbar-download" style="position:absolute;top:160px;right:95px;z-index:999;cursor:pointer;">                    <img src="./images/icon-downward.svg" width="24px">                </div> -->
                             </div>
                             <div class='blockpy-content-left card-panel card'
-                                style='display: block;background: #f8f8f8;min-height: 245px;position:relative;'>
+                                style='display: block;background: #f8f8f8;min-height: 243px;position:relative;'>
                                 <div class="card-header"
                                     style='height: 60px;line-height: 60px;background: #E6F1FF;text-align: center;'>
                                     <!-- http://help.cocorobo.cn/#/getting-started/info target="_blank"-->
@@ -1039,7 +1039,7 @@
                                 </div>
                                 <!--<div class="card-header">                    <span class="header-icon" style="line-height:40px;"><img style="height:30px;vertical-align:middle;" src="./images/icon-aspect.svg"></span>                    <span class="header-text translate-output">Output Area</span>                    <img class="fullscreenIcon" src="./images/icon-fullscreen.svg">                    <img class="fullscreenIcon hidden" src="./images/icon-fullscreen-exit.svg">                </div>-->
                                 <!--<div class="card-content" style="display:block;grid-template-rows:1fr 50px;">                    <div style="border-bottom:1px solid #ddd;padding:8px;overflow:hidden;">                   <div style="height:100%;overflow:hidden;">                            <div class='blockpy-printer blockpy-printer-default' style="resize:none;height:98%;width:100%;border:1px solid #818181;">                            </div>                        </div>                   </div>-->
-                                <div class="card-content" style="padding:8px 10px;width:100%">
+                                <div class="card-content" style="padding:0 10px;width:100%;height: 183px;background: #FFFFFF;">
                                     <div class="row" id="status" style="display: none;">
                                         <div class="col s12"><img id="error-btn" class="activator"
                                                 src="./icons/error.png">
@@ -1051,15 +1051,19 @@
                                         <div id="uploader-btns" class="col s6">
                                             <a onclick='sendfile();' id="send_file" class="waves-effect
                                                     waves-light btn blue disabled"
-                                                style="margin-right:0.5rem;padding:0 0.5rem;">
-                                                <i style="cursor: pointer;" class="fa fa-play-circle"
-                                                    aria-hidden="true"></i>
-                                                <span id="runCode"></span>
+                                                style="margin-right:2.5rem;padding:0 0.5rem;border-radius: 3px;
+                                                width: 90px;height: 36px;">
+                                                <!-- <i style="cursor: pointer;" class="fa fa-play-circle"
+                                                    aria-hidden="true"></i> -->
+                                                <img src="./images/run.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="runCode" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <a onclick="uploadpyfile()" id="uploadpy" class="waves-effect
-                                            waves-light btn blue disabled" style="padding:0 0.5rem;">
-                                                <i style="cursor: pointer;" class="fa fa-upload" aria-hidden="true"></i>
-                                                <span id="uploadFiles"></span>
+                                            waves-light btn blue disabled" style="padding:0 0.5rem;border-radius: 3px;
+                                            width: 90px;height: 36px;">
+                                                <!-- <i style="cursor: pointer;" class="fa fa-upload" aria-hidden="true"></i> -->
+                                                <img src="./images/uploadCode.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="uploadFiles" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <div style="float: right;">
                                                 <li style="display: none;">
@@ -1086,18 +1090,21 @@
                                                 files</span></a>
 
                                         <div class="col s6 btn-network" style="padding-right:1px;">
-                                            <div class="select-wrapper initialized"><span class="caret">▼</span><input
+                                            <div class="select-wrapper initialized">
+                                                <!-- <span class="caret">▼</span> -->
+                                                <i class="down"></i>
+                                                <input
                                                     type="text" class="select-dropdown" id="select_dropdown"
                                                     readonly="true"
                                                     data-activates="select-options-eca84f35-6884-7dc4-9d8b-c14115abe698"
-                                                    value="检测不到连接端口">
+                                                    value="">
                                                 <ul id="select-options-eca84f35-6884-7dc4-9d8b-c14115abe698" class="dropdown-content
                                                                 select-dropdown ">
-                                                    <li class="disabled "><span>检测不到连接端口</span></li>
+                                                    <li class="disabled "><span></span></li>
                                                 </ul><select id="ports"
                                                     data-select-id="eca84f35-6884-7dc4-9d8b-c14115abe698"
                                                     class="initialized">
-                                                    <option value="null" disabled="">检测不到连接端口</option>
+                                                    <option value="null" disabled=""></option>
                                                 </select>
                                             </div>
                                         </div>
@@ -1173,7 +1180,15 @@
                                         
                                     </div> -->
 
-                                    <div class="row" id="progress" style="margin-top: 30px;">
+                                    <div class="row" id="uploader_connect_status" style="margin-top: 16px;display: block;">
+                                        <div class="col s12">
+                                            <div style="margin:7px 0;">
+                                                <span class="translatable_uploader_connect_status" style="font-size: 16px;color: #3D3D3D;letter-spacing: 0;">请到"连接"下载安装程序并连接硬件。</span>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="row" id="progress" style="margin-top: 16px;display: none;">
                                         <div class="col s12">
                                             <div class="progress" style="margin:7px 0;">
                                                 <div class="determinate green" style="width:0%;"></div>
@@ -1190,7 +1205,7 @@
                                                     <img id="runFail" src="./images/fail.png" style="display: none;" />
                                                 </div>
                                                 <div style="display: inline-block;">
-                                                    <span id="statusMsg"></span>
+                                                    <span id="statusMsg" style="display: none;"></span>
                                                 </div>
 
                                             </div>
@@ -1215,7 +1230,7 @@
                                     <div class="btn-toolbar-title2">直接将代码上传到电子模块中 <div></div>
                                     </div>
                                     <div class="btn-toolbar-inputbox2"><select>
-                                            <option>检测不到连接端口</option>
+                                            <option></option>
                                         </select></div>
                                 </div>
                                 <div class="card-reveal grey darken-3 white-text" style="padding:8px 13px;">

File diff suppressed because it is too large
+ 0 - 0
libs/materialize.min.css


+ 9 - 0
materialize/js/materialize.js

@@ -4975,6 +4975,12 @@ if (Vel) {
           // $("#refresh-disabled").css("display","block");
           $("#refresh").css("display","block");
           $("#refresh-press").css("display","none");
+          $("#progress").css("display","none");
+          $("#uploader_connect_status").css("display","block");
+          $("#runSuccess").css("display","none");
+          $("#runFail").css("display","none");
+          $(".determinate").css("width","0%");
+          $("#statusMsg").replaceWith(`<span id="statusMsg" style="display: none;"></span>`);
           $('#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>`);
         }
       } else {
@@ -4985,6 +4991,9 @@ if (Vel) {
         // $("#refresh-disabled").css("display","none");
         $("#refresh").css("display","block");
         $("#refresh-press").css("display","none");
+        $("#progress").css("display","block");
+        $("#uploader_connect_status").css("display","none");
+        $("#statusMsg").css("display","block");
         $('#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>`);
       }
       // Function that renders and appends the option taking into

+ 1 - 0
msg/en.js

@@ -10,6 +10,7 @@ Ardublockly.LOCALISED_TEXT = {
     python_full_screen_mode: "Python Code Mode",
     cloud_mode: "Cloud Python Mode",
     javascript_mode: "JavaScript Mode",
+    uploader_connect_status: "Please go to 'Connect' to download the installation program and connect the hardware.",
 
     /* Menu */
     pageLoading: "Loading...",

+ 1 - 0
msg/zh-hans.js

@@ -9,6 +9,7 @@ Ardublockly.LOCALISED_TEXT = {
     python_full_screen_mode: "python代码模式",
     cloud_mode: "云端Python模式",
     javascript_mode: "JavaScript 模式",
+    uploader_connect_status: "请到'连接'下载安装程序并连接硬件。",
 
     /* Menu */
     pageLoading: "加载中...",

+ 1 - 0
msg/zh-hant.js

@@ -10,6 +10,7 @@ Ardublockly.LOCALISED_TEXT = {
     python_full_screen_mode: "python代碼模式",
     cloud_mode: "雲端模式",
     javascript_mode: "JavaScript 模式",
+    uploader_connect_status: "請到'連接'下載安裝程序並連接硬件。",
 
     /* Menu */
     pageLoading: "加載中...",

+ 3 - 3
python/data.json

@@ -6,7 +6,7 @@
             "ws_connect_fail": "No Plugin Connection. Uploading is disabled until you reconnect.",
             "ws_connect_success": "Plugin is connected successfully!",
             "ws_connect_loss": "Plugin is lost, please try to reconnect it.",
-            "no_port_option": "No ports detected",
+            "no_port_option": "",
             "uploading": "implement...",
             "reseting": "reseting...",
             "upload_fail": "implement failed",
@@ -191,7 +191,7 @@
             "ws_connect_fail": "插件沒有連接。上載無法使用,直到插件重新連接。",
             "ws_connect_success": "插件已經成功連接!",
             "ws_connect_loss": "插件丟失,請重新連接它。",
-            "no_port_option": "檢測不到連接端口",
+            "no_port_option": "",
             "uploading": "執行中...",
             "reseting": "重啟中...",
             "upload_fail": "執行失敗",
@@ -359,7 +359,7 @@
             "ws_connect_fail": "插件没有连接。上传无法使用,直到插件重新连接。",
             "ws_connect_success": "插件已经成功连接!",
             "ws_connect_loss": "插件丢失,请重新连接它。",
-            "no_port_option": "检测不到连接端口",
+            "no_port_option": "",
             "uploading": "执行中...",
             "reseting": "重启中...",
             "upload_fail": "执行失败",

+ 29 - 18
python/index.html

@@ -317,7 +317,7 @@
                     </li>
 
 
-                    <li style="display: none;">
+                    <li>
                         <div style="margin: 0px 20px 0px 0px;">
                             <input type="text" value="A.I. Module" id="iot_modules" readonly
                                 class="selectMode_input browser-default"
@@ -329,8 +329,8 @@
                                 <div style="border: none;"><a href="javaScript:(0)" style="color: #424242 !important;"
                                         class="translatable_iot_module">IoT Module
                                         Mode</a></div>
-                                <div style="border: none;"><a href="/python" style="color: #424242 !important;"
-                                        class="translatable_python_full_screen_mode" target="_blank">Cloud
+                                <div style="border: none;"><a href="/python/" style="color: #424242 !important;"
+                                        class="translatable_python_full_screen_mode">Cloud
                                         Mode</a></div>
                             </div>
                         </div>
@@ -935,7 +935,7 @@
                             <div class='blockpy-content-left card-panel card'
                                 style='display: block;background: #f8f8f8;height: 100%;position:relative;'>
                                 <div class="card-content"
-                                    style="position:relative;height: calc(100% - 245px);overflow:auto;padding:5px 10px;background-color: #fff; color: #000;"
+                                    style="position:relative;height: calc(100% - 243px);overflow:auto;padding:5px 10px;background-color: #fff; color: #000;"
                                     id="repl_box">
                                     <div class="editDiv" id="editDiv"
                                         style="width: 100%;left: -10px;background: #E6F1FF;">
@@ -1026,7 +1026,7 @@
                                     </a>
                                 </div>
 
-                                <div class="card-content" style="padding:8px 10px;width:100%">
+                                <div class="card-content" style="padding:0 10px;width:100%;height: 183px;background: #FFFFFF;">
                                     <div class="row" id="status" style="display: none;">
                                         <div class="col s12"><img id="error-btn" class="activator"
                                                 src="./icons/error.png">
@@ -1038,15 +1038,19 @@
                                         <div id="uploader-btns" class="col s6">
                                             <a onclick='sendfile();' id="send_file" class="waves-effect
                                                     waves-light btn blue disabled"
-                                                style="margin-right:0.5rem;padding:0 0.5rem;">
-                                                <i style="cursor: pointer;" class="fa fa-play-circle"
-                                                    aria-hidden="true"></i>
-                                                <span id="runCode"></span>
+                                                style="margin-right:2.5rem;padding:0 0.5rem;border-radius: 3px;
+                                                width: 90px;height: 36px;">
+                                                <!-- <i style="cursor: pointer;" class="fa fa-play-circle"
+                                                    aria-hidden="true"></i> -->
+                                                <img src="./images/run.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="runCode" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <a onclick="uploadpyfile()" id="uploadpy" class="waves-effect
-                                            waves-light btn blue disabled" style="padding:0 0.5rem;">
-                                                <i style="cursor: pointer;" class="fa fa-upload" aria-hidden="true"></i>
-                                                <span id="uploadFiles"></span>
+                                            waves-light btn blue disabled" style="padding:0 0.5rem;border-radius: 3px;
+                                            width: 90px;height: 36px;">
+                                                <!-- <i style="cursor: pointer;" class="fa fa-upload" aria-hidden="true"></i> -->
+                                                <img src="./images/uploadCode.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="uploadFiles" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <div style="float: right;">
                                                 <li style="display: none;">
@@ -1077,14 +1081,14 @@
                                                     type="text" class="select-dropdown" id="select_dropdown"
                                                     readonly="true"
                                                     data-activates="select-options-eca84f35-6884-7dc4-9d8b-c14115abe698"
-                                                    value="检测不到连接端口">
+                                                    value="">
                                                 <ul id="select-options-eca84f35-6884-7dc4-9d8b-c14115abe698" class="dropdown-content
                                                                 select-dropdown ">
-                                                    <li class="disabled "><span>检测不到连接端口</span></li>
+                                                    <li class="disabled "><span></span></li>
                                                 </ul><select id="ports"
                                                     data-select-id="eca84f35-6884-7dc4-9d8b-c14115abe698"
                                                     class="initialized">
-                                                    <option value="null" disabled="">检测不到连接端口</option>
+                                                    <option value="null" disabled=""></option>
                                                 </select>
                                             </div>
                                         </div>
@@ -1151,7 +1155,14 @@
                                             style="display:none"><span id="gettype">Upload
                                                 files</span></a>
                                     </div> -->
-                                    <div class="row" id="progress" style="margin-top: 30px;">
+                                    <div class="row" id="uploader_connect_status" style="margin-top: 16px;display: block;">
+                                        <div class="col s12">
+                                            <div style="margin:7px 0;">
+                                                <span class="translatable_uploader_connect_status" style="font-size: 16px;color: #3D3D3D;letter-spacing: 0;">请到"连接"下载安装程序并连接硬件。</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row" id="progress" style="margin-top: 16px;display: none;">
                                         <div class="col s12">
                                             <div class="progress" style="margin:7px 0;">
                                                 <div class="determinate green" style="width:0%;"></div>
@@ -1168,7 +1179,7 @@
                                                     <img id="runFail" src="./images/fail.png" style="display: none;" />
                                                 </div>
                                                 <div style="display: inline-block;">
-                                                    <span id="statusMsg"></span>
+                                                    <span id="statusMsg" style="display: none;"></span>
                                                 </div>
 
                                             </div>
@@ -1194,7 +1205,7 @@
                                     <div class="btn-toolbar-title2">直接将代码上传到电子模块中 <div></div>
                                     </div>
                                     <div class="btn-toolbar-inputbox2"><select>
-                                            <option>检测不到连接端口</option>
+                                            <option></option>
                                         </select></div>
                                 </div>
                                 <div class="card-reveal grey darken-3 white-text" style="padding:8px 13px;">

+ 2 - 2
python/index.js

@@ -755,13 +755,13 @@ function selectOnload() {
           $("#mode")[0].selectedIndex = 1;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
-          appearExample(1);
+          window.location.href = "/";
         }
         else if (e.innerHTML == Ardublockly.LOCALISED_TEXT.ai_module) {
           $("#mode")[0].selectedIndex = 0;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
-          appearExample(0);
+          window.location.href = "/";
         }
         $('.MouduleBox')[0].style.display = 'none';
         $('.MouduleBox')[1].style.display = 'none';

File diff suppressed because it is too large
+ 0 - 0
python/libs/materialize.min.css


+ 9 - 0
python/materialize/js/materialize.js

@@ -4975,6 +4975,12 @@ if (Vel) {
           // $("#refresh-disabled").css("display","block");
           $("#refresh").css("display","block");
           $("#refresh-press").css("display","none");
+          $("#progress").css("display","none");
+          $("#uploader_connect_status").css("display","block");
+          $("#runSuccess").css("display","none");
+          $("#runFail").css("display","none");
+          $(".determinate").css("width","0%");
+          $("#statusMsg").replaceWith(`<span id="statusMsg" style="display: none;"></span>`);
           $('#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>`);
         }
       } else {
@@ -4985,6 +4991,9 @@ if (Vel) {
         // $("#refresh-disabled").css("display","none");
         $("#refresh").css("display","block");
         $("#refresh-press").css("display","none");
+        $("#progress").css("display","block");
+        $("#uploader_connect_status").css("display","none");
+        $("#statusMsg").css("display","block");
         $('#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>`);
       }
       // Function that renders and appends the option taking into

+ 3 - 2
python/msg/en.js

@@ -7,10 +7,11 @@ Ardublockly.LOCALISED_TEXT = {
     hardware_mode: "Hardware Mode",
     mcu_module: "IoT Module",
     ai_module: "Hardware AI Mode",
-    python_full_screen_mode: "Python FullScreen Mode",
+    python_full_screen_mode: "Python Code Mode",
     cloud_mode: "Cloud Python Mode",
     javascript_mode: "JavaScript Mode",
 
+    uploader_connect_status: "Please go to 'Connect' to download the installation program and connect the hardware.",
     /* Menu */
     pageLoading: "Loading...",
     home: "Home",
@@ -735,7 +736,7 @@ Ardublockly.LOCALISED_TEXT = {
 
     sketch_name: "Untitled",
     sketch_save: "Save",
-    iot_module: "Hardware IOT Mode",
+    iot_module: "Hardware IoT Mode",
     a_csm: "Change Startup Mode",
     a_butvmi: "Boot Up the Visual Menu InterFace",
     a_buartlp: "Boot Up and Run the Last Program",

+ 4 - 2
python/msg/zh-hans.js

@@ -6,10 +6,12 @@ Ardublockly.LOCALISED_TEXT = {
     hardware_mode: "硬件模式",
     mcu_module: "IoT模块",
     ai_module: "硬件AI模式",
-    python_full_screen_mode: "python全屏模式",
+    python_full_screen_mode: "python代码模式",
     cloud_mode: "云端Python模式",
     javascript_mode: "JavaScript 模式",
 
+    uploader_connect_status: "请到'连接'下载安装程序并连接硬件。",
+
     /* Menu */
     pageLoading: "加载中...",
     home: "首页",
@@ -755,7 +757,7 @@ Ardublockly.LOCALISED_TEXT = {
 
     sketch_name: "未命名",
     sketch_save: "保存",
-    iot_module: "硬件IOT模式",
+    iot_module: "硬件IoT模式",
 
     select_aiaor: "物体识别进阶",
     select_aifr: "人脸检测",

+ 4 - 2
python/msg/zh-hant.js

@@ -7,10 +7,12 @@ Ardublockly.LOCALISED_TEXT = {
     hardware_mode: "硬件模式",
     mcu_module: "Iot模組",
     ai_module: "硬件AI模式",
-    python_full_screen_mode: "python全屏模式",
+    python_full_screen_mode: "python代碼模式",
     cloud_mode: "雲端模式",
     javascript_mode: "JavaScript 模式",
 
+    uploader_connect_status: "請到'連接'下載安裝程序並連接硬件。",
+
     /* Menu */
     pageLoading: "加載中...",
     home: "首頁",
@@ -724,7 +726,7 @@ Ardublockly.LOCALISED_TEXT = {
     select_fgaat: "尋找綠色區域並進行追踪",
     sketch_name: "未命名",
     sketch_save: "保存",
-    iot_module: "硬件IOT模式",
+    iot_module: "硬件IoT模式",
 
     select_work_u: "IoT工作坊上",
     select_work_d: "IoT工作坊下",

+ 1 - 0
python/src/blockly/cocoblockly.js

@@ -670,6 +670,7 @@ function ws_disconn(socket, empty) {
         socket.emit('command', { cmd: 'close' });
     add_disabled('#upload-btn', '#comms-cnt', '#uploader-relaunch-btn');
     $('#discnt_icon').css('display', 'inline-block');
+    $("#progress").css('display', 'none');
     $('#cnt_icon').css('display', 'none');
     select.empty()
         .append(create_opts(CCB.str_group.no_port_option, null, true))

+ 1 - 0
src/blockly/cocoblockly.js

@@ -670,6 +670,7 @@ function ws_disconn(socket, empty) {
         socket.emit('command', { cmd: 'close' });
     add_disabled('#upload-btn', '#comms-cnt', '#uploader-relaunch-btn');
     $('#discnt_icon').css('display', 'inline-block');
+    $("#progress").css('display', 'none');
     $('#cnt_icon').css('display', 'none');
     select.empty()
         .append(create_opts(CCB.str_group.no_port_option, null, true))

Some files were not shown because too many files changed in this diff