update

src/renderer/cocoblockly-x

@@ -1 +1 @@
-Subproject commit ab25535282c0988792256a37786924568d30bcba
+Subproject commit 924cc54d1d7f1196a6a429ac33091c15e6a9d21d

src/renderer/index.js

@@ -6,8 +6,8 @@ import { clearCache, upload, pythonupload, pythonuploadfile, pythonreset, getmcn
 import errHandler from './error_handle';
 import SerialPort from 'serialport';
 
-//var request = require('request');
-//var querystring = require('querystring');
+var request = require('request');
+var querystring = require('querystring');
 
 /* ************ Functions ************ */
 
@@ -423,7 +423,7 @@ app.post('/pythonuploadfilebyfile', (req, res) => {
     //     res.status(401).send('disconnection');
 });
 
-//获取参数使用
+// //获取参数使用
 // us.getParm = function (req, cb) {
 
 // }
@@ -528,37 +528,37 @@ app.post('/testSerialPort', (req, res) => {
 
 });
 
-//clearCache();
+clearCache();
 
 //codingagent
-function CodingAlive() {
-    // setInterval(function () {
-    //     netRequest('/plugin/alive', { "PluginID": "CocoRoboX" })
-    // }, 1500)
-    // netRequest('/plugin/alive', { "PluginID": "CocoRoboX" });
-}
-
-//CodingAlive();
-
-function netRequest(p, j) {
-    // var contents = querystring.stringify(j);
-    // var contents = JSON.stringify(j)
-    // var options = {
-    //     url: "http://127.0.0.1:8991" + p,
-    //     method: 'POST',
-    //     headers: {
-    //         'Content-Type': 'text/plain'
-    //     },
-    //     body: contents
-    // }
-    // try {
-    //     request(options, function (error, response) {
-    //         if (error) throw new Error(error);
-    //     });
-    // }
-    // catch (e) {
+// function CodingAlive() {
+//     setInterval(function () {
+//         netRequest('/plugin/alive', { "PluginID": "CocoRoboX" })
+//     }, 1500)
+//     netRequest('/plugin/alive', { "PluginID": "CocoRoboX" });
+// }
 
-    // }
-}
+// CodingAlive();
+
+// function netRequest(p, j) {
+//     var contents = querystring.stringify(j);
+//     var contents = JSON.stringify(j)
+//     var options = {
+//         url: "http://127.0.0.1:8991" + p,
+//         method: 'POST',
+//         headers: {
+//             'Content-Type': 'text/plain'
+//         },
+//         body: contents
+//     }
+//     try {
+//         request(options, function (error, response) {
+//             if (error) throw new Error(error);
+//         });
+//     }
+//     catch (e) {
+
+//     }
+// }
 
 window.serial = debugTool();

src/renderer/uploader.js

@@ -1061,7 +1061,7 @@ export function getmcnty(val, socket) {
                             resolve("AI");
                         }
                         else {
-                            reject(_strerr);
+                            resolve("");
                         }
                         _strerr = "";
                         //socket.emit('repl', { code: _strout });
@@ -1125,17 +1125,18 @@ export function pythoncmd(code, val, socket) {
                 clearTimeout(_timeout);
                 _strout += chunk.toString();
                 _timeout = setTimeout(() => {
-                    if (_strout.indexOf("Error") > -1) {
-                        reject(_strout);
-                        let error = errHandler(_strout);
-                        socket.emit('upload', { ProgrammerStatus: 'Error', Error: error });
-                    }
-                    else {
-                        resolve(_strout);
-                        socket.emit('repl', { code: _strout });
-                    }
+                    // if (_strout.indexOf("Error") > -1) {
+                    //     reject(_strout);
+                    //     let error = errHandler(_strout);
+                    //     socket.emit('upload', { ProgrammerStatus: 'Error', Error: error });
+                    // }
+                    // else {
+                    //     resolve(_strout);
+                    //     socket.emit('repl', { code: _strout });
+                    // }
                     //
-                    _strout = "";
+                    resolve();
+                    //_strout = "";
                 }, 100);
             });
 
@@ -1144,12 +1145,13 @@ export function pythoncmd(code, val, socket) {
                 clearTimeout(_timeout);
                 _strerr += data.toString();
                 _timeout = setTimeout(() => {
-                    if (_strerr.indexOf("SPIFFS") == -1 && _strerr.indexOf("ClearCommError") == -1 && (_strerr.indexOf("ERROR") > -1 || _strerr.indexOf("Error") > -1)) {
-                        reject(_strerr);
-                        let error = errHandler(_strerr);
-                        socket.emit('upload', { ProgrammerStatus: 'Error', Error: error });
-                    }
-                    _strerr = "";
+                    // if (_strerr.indexOf("SPIFFS") == -1 && _strerr.indexOf("ClearCommError") == -1 && (_strerr.indexOf("ERROR") > -1 || _strerr.indexOf("Error") > -1)) {
+                    //     reject(_strerr);
+                    //     let error = errHandler(_strerr);
+                    //     socket.emit('upload', { ProgrammerStatus: 'Error', Error: error });
+                    // }
+                    // _strerr = "";
+                    resolve();
                     //socket.emit('repl', { code: _strout });
                 }, 10);
             });