Skip to content

Commit

Permalink
Merge pull request #14 from estea8968/master
Browse files Browse the repository at this point in the history 
weekly update 09/12
  • Loading branch information
@ys-fang
ys-fang authored Sep 12, 2020
2 parents 6edd8e5 + b0459a8 commit abdda92
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 90 deletions.
2 changes: 1 addition & 1 deletion app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="google" value="notranslate">
<link rel="shortcut icon" href="static/favicon.ico">
<title>OSEP_Code Editor 1090903</title>
<title>OSEP_Code Editor 1090909</title>

</head>
<body>
Expand Down
114 changes: 71 additions & 43 deletions app/lib.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308500,7 +308500,7 @@ var blockIconURI = null; // https://widget.airmap.g0v.tw/create/LASS%24WF_127435
var LASS_URI = 'https://pm25.lass-net.org/data/last.php?device_id=';
var AQI_URI = 'https://data.epa.gov.tw/api/v1/aqx_p_432?limit=1000&api_key=9be7b239-557b-4c10-9775-78cadfc555e9&format=json';
var defaultId = 'WF_12743501';
var defaultCity = '板橋';
var defaultsiteName = '板橋';
var theLocale = null;
/**
* Enum for LASS specification.
Expand All @@ -308517,11 +308517,10 @@ var LassAttr = {
};
var aqiAttr = {
AQI: 'AQI',
PM25: 'PM2.5' // PM10: 'PM10',
//tempc: 's_t0',
// tempf: 'tempf',
//humidity: 's_h0'

PM25: 'PM2.5',
PM10: 'PM10',
O3: 'O3',
PublishTime: 'PublishTime'
};

var gasoLASS = /*#__PURE__*/function () {
Expand Down Expand Up @@ -308656,9 +308655,9 @@ var gasoLASS = /*#__PURE__*/function () {
opcode: 'aqiLASS',
blockType: BlockType.REPORTER,
arguments: {
city: {
siteName: {
type: ArgumentType.STRING,
defaultValue: defaultCity
defaultValue: defaultsiteName
},
attr: {
type: ArgumentType.STRING,
Expand Down Expand Up @@ -308715,19 +308714,16 @@ var gasoLASS = /*#__PURE__*/function () {
}, {
text: 'PM2.5',
value: aqiAttr.PM25
} //{
// text: msg.tempc[theLocale],
// value: aqiAttr.tempc
//},
// {
// text: '溫度 F',
// value: LassAttr.tempf
// },
//{
// text: msg.humidity[theLocale],
// value: LassAttr.humidity
//}
]
}, {
text: 'PM10',
value: aqiAttr.PM10
}, {
text: 'O3',
value: aqiAttr.O3
}, {
text: 'PublishTime',
value: aqiAttr.PublishTime
}]
}
}
};
Expand Down Expand Up @@ -308757,7 +308753,7 @@ var gasoLASS = /*#__PURE__*/function () {
value: function aqiLASS(args) {
var _this4 = this;

var city = args.city;
var siteName = args.siteName;
var attr = args.attr;
var url = "".concat(AQI_URI);
return fetch(url).then(function (res) {
Expand All @@ -308778,7 +308774,7 @@ var gasoLASS = /*#__PURE__*/function () {
_key = _Object$entries2$_i[0],
_value = _Object$entries2$_i[1];

if ("".concat(_key, ": ").concat(_value) == "".concat(_key, ": ").concat(city)) {
if ("".concat(_key, ": ").concat(_value) == "".concat(_key, ": ").concat(siteName)) {
console.log("".concat(_key, ": ").concat(_value));
_this4.aqidata = bdata;
console.log(_this4.aqidata);
Expand All @@ -308789,22 +308785,29 @@ var gasoLASS = /*#__PURE__*/function () {

}
});
var returndata = [];

for (x in _this4.aqidata) {
returndata.push(_this4.aqidata[x]);
}

;
console.log('returndata:', returndata);

if (attr == 'AQI') {
return typeof data === 'string' ? data : JSON.stringify(_this4.aqidata.AQI);
return _this4.aqidata.AQI; //return typeof data === 'string' ? data : JSON.stringify(this.aqidata.AQI);
}

if (attr == 'PM2.5') {
console.log('PM2.5');
return returndata[11]; //return typeof data === 'string' ? data : JSON.stringify(this.aqidata[11]');
return _this4.aqidata['PM2.5'];
}

if (attr == 'PM10') {
console.log('PM10');
return _this4.aqidata.PM10;
}

if (attr == 'O3') {
console.log('O3');
return _this4.aqidata.O3;
}

if (attr == 'PublishTime') {
console.log('PublishTime');
return _this4.aqidata.PublishTime;
} ///return this.aqidata.AQI;

}
Expand Down Expand Up @@ -308832,8 +308835,8 @@ var gasoLASS = /*#__PURE__*/function () {
try {
var parsed = JSON.parse(this.data.data);
console.warn('parsed ', attr, parsed);
var _data = parsed[attr];
return typeof _data === 'string' ? _data : JSON.stringify(_data);
var data = parsed[attr];
return typeof data === 'string' ? data : JSON.stringify(data);
} catch (err) {
return "Error: ".concat(err);
}
Expand Down Expand Up @@ -308876,8 +308879,8 @@ var fetchLASS = {
'zh-tw': 'LASS 設備編號 [id]'
};
var aqiLASS = {
'en': 'LASS AQI city [city] read [attr]',
'zh-tw': 'LASS AQI 城市 [city] 讀取 [attr]'
'en': 'LASS AQI city [siteName] read [attr]',
'zh-tw': '環保署測站 [siteName] 讀取 [attr]'
};
var onLASSReceived = {
'en': 'When received data from LASS',
Expand Down Expand Up @@ -317016,6 +317019,26 @@ var rwGoogle = /*#__PURE__*/function () {
column3: {
type: ArgumentType.STRING,
defaultValue: ' '
},
column4: {
type: ArgumentType.STRING,
defaultValue: ' '
},
column5: {
type: ArgumentType.STRING,
defaultValue: ' '
},
column6: {
type: ArgumentType.STRING,
defaultValue: ' '
},
column7: {
type: ArgumentType.STRING,
defaultValue: ' '
},
column8: {
type: ArgumentType.STRING,
defaultValue: ' '
}
},
text: msg.writeGoogleCalc[theLocale]
Expand Down Expand Up @@ -317120,8 +317143,13 @@ var rwGoogle = /*#__PURE__*/function () {
var column1 = args.column1 || defaultValue;
var column2 = args.column2 || defaultValue;
var column3 = args.column3 || defaultValue;
var column4 = args.column4 || defaultValue;
var column5 = args.column5 || defaultValue;
var column6 = args.column6 || defaultValue;
var column7 = args.column7 || defaultValue;
var column8 = args.column8 || defaultValue;
var url = args.url;
var gurl = url + "?c1=" + column1 + "&c2=" + column2 + "&c3=" + column3;
var gurl = url + "?c1=" + column1 + "&c2=" + column2 + "&c3=" + column3 + "&c4=" + column4 + "&c5=" + column5 + "&c6=" + column6 + "&c7=" + column7 + "&c8=" + column8;
return fetch(gurl).then(function (res) {
if (res.ok) {}
});
Expand Down Expand Up @@ -317164,8 +317192,8 @@ var googlecolumnTEXT = {
'zh-tw': 'Google [variable] 第 [n] 筆欄位名稱[column] '
};
var writeGoogleCalc = {
'en': 'Google API URL: [url] write [column1] to Col1,[column2] to Col2, [column3] to Col3',
'zh-tw': 'Google api網址：[url] 寫入 欄位1：[column1] 欄位2：[column2] 欄位3：[column3]'
'en': 'Google API URL: [url] write [column1] to Col1,[column2] to Col2, [column3] to Col3,[column4] to Col4,[column5] to Col5,[column6] to Col6,[column7] to Col7,[column8] to Col8',
'zh-tw': 'Google api網址：[url] 寫入 欄位1：[column1] 欄位2：[column2] 欄位3：[column3] 欄位4：[column4] 欄位5：[column5] 欄位6：[column6] 欄位7：[column7] 欄位8：[column8]'
};
var onJSONReceived = {
'en': 'When JSON data is recieved',
Expand Down Expand Up @@ -318233,7 +318261,7 @@ var gasoThingSpeak = /*#__PURE__*/function () {

return fetch(originalURL, {
mode: 'no-cors',
method: 'GET' // body: encodeURIComponent(JSON.stringify({value1, value2, value3}))
method: 'GET' //body: encodeURIComponent(JSON.stringify({value1, value2, value3 }))

})["catch"](function (error) {
return console.error('Error:', error);
Expand Down Expand Up @@ -318264,8 +318292,8 @@ var name = {
'zh-tw': 'ThingSpeak'
};
var fetchThingSpeak = {
'en': 'ThingSpeak [id] send event [event] value1 [value1] value2 [value2] value3 [value3] value4 [value4] value5 [value5] value6 [value6] value7 [value7] value8 [value8]',
'zh-tw': 'ThingSpeak [id] 傳送事件 [event] 參數1 [value1] 參數2 [value2] 參數3 [value3] 參數4 [value4] 參數5 [value5] 參數6 [value6] 參數7 [value7] 參數8 [value8]'
'en': 'ThingSpeak send event [key] value1 [value1] value2 [value2] value3 [value3] value4 [value4] value5 [value5] value6 [value6] value7 [value7] value8 [value8]',
'zh-tw': 'ThingSpeak api key [key] 參數1 [value1] 參數2 [value2] 參數3 [value3] 參數4 [value4] 參數5 [value5] 參數6 [value6] 參數7 [value7] 參數8 [value8]'
};

/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion app/lib.min.js.map
View file

Large diffs are not rendered by default.

75 changes: 40 additions & 35 deletions node_modules/scratch-vm/src/extensions/scratch3_lass/index.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions node_modules/scratch-vm/src/extensions/scratch3_lass/translation.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit abdda92

Please sign in to comment.