diff --git a/bin/thread.js b/bin/thread.js index bcfe616..5b670e4 100644 --- a/bin/thread.js +++ b/bin/thread.js @@ -6,6 +6,7 @@ var path = require('path'); var ipc = require('ipc-main'); +var iconv = require('iconv-lite'); var Emulator = require('./emulator'); // cache @@ -36,7 +37,7 @@ module.exports = { }); thread.on('data', function (data){ - event.sender.send('emulator', 'data', project, data.toString()); + event.sender.send('emulator', 'data', project, iconv.decode(data, 'gbk')); }); thread.on('error', function (error){ diff --git a/static/js/components/app-main/index.js b/static/js/components/app-main/index.js index a781a68..88474a2 100644 --- a/static/js/components/app-main/index.js +++ b/static/js/components/app-main/index.js @@ -225,7 +225,6 @@ module.exports = Vue.component('app-main', { } runtime.worker.port.postMessage({ action: 'write', name: project.name, data: data.toString() }); - // event.sender.send('emulator', project, 'stop'); }); }, ready: function (){