irext/private-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

private cloud update 2020-06-14

Browse Source 
1. completed i18n for private cloud (foreground and background)
2. fixed issues
This commit is contained in:
strawmanbobi
2020-06-14 11:56:18 +08:00
parent 7fc902a540
commit f94a89faef
28 changed files with 899 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
console/web/code/index.html
View File

@@ -295,7 +295,7 @@
<div id="verify_hint"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-info" onclick="verifyRemote();" data-i18n="page_code.d_verify_index_verify">确定</button>
<button type="button" class="btn btn-info" onclick="verifyRemote(true);" data-i18n="page_code.d_verify_index_verify">确定</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" data-i18n="page_code.d_verify_index_cancel">取消</button>
</div>
</div>
@@ -484,6 +484,7 @@
<script src="../public_js/bower_components/bootstrap-spinner/dist/bootstrap-spinner.min.js"></script>
<script src="../public_js/bower_components/bootstrap-table/dist/bootstrap-table.min.js"></script>
<script src="../public_js/bower_components/bootstrap-table/dist/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="../public_js/bower_components/bootstrap-table/dist/locale/bootstrap-table-en-US.min.js"></script>
<script src="../public_js/bower_components/bootstrap-progressbar/bootstrap-progressbar.min.js"></script>
<script src="../public_js/bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
<script src="../public_js/bower_components/select2/dist/js/select2.min.js"></script>

40
console/web/code/js/constants.js
View File

@@ -3,25 +3,25 @@
* 2017-03-27
*/
var LS_KEY_ID = 'user_name';
var LS_KEY_TOKEN = 'token';
let LS_KEY_ID = 'user_name';
let LS_KEY_TOKEN = 'token';
var CATEGORY_AC = 1;
var CATEGORY_TV = 2;
var CATEGORY_STB = 3;
var CATEGORY_NW = 4;
var CATEGORY_IPTV = 5;
var CATEGORY_DVD = 6;
var CATEGORY_FAN = 7;
var CATEGORY_PROJECTOR = 8;
var CATEGORY_STEREO = 9;
var CATEGORY_LIGHT_BULB = 10;
var CATEGORY_BSTB = 11;
var CATEGORY_CLEANING_ROBOT = 12;
var CATEGORY_AIR_CLEANER = 13;
var CATEGORY_DYSON = 14;
let CATEGORY_AC = 1;
let CATEGORY_TV = 2;
let CATEGORY_STB = 3;
let CATEGORY_NW = 4;
let CATEGORY_IPTV = 5;
let CATEGORY_DVD = 6;
let CATEGORY_FAN = 7;
let CATEGORY_PROJECTOR = 8;
let CATEGORY_STEREO = 9;
let CATEGORY_LIGHT_BULB = 10;
let CATEGORY_BSTB = 11;
let CATEGORY_CLEANING_ROBOT = 12;
let CATEGORY_AIR_CLEANER = 13;
let CATEGORY_DYSON = 14;
var TRANSFER_STATE_NONE = 0;
var TRANSFER_STATE_BIN_FETCHED = 1;
var TRANSFER_STATE_BIN_ON_GOING = 2;
var TRANSFER_STATE_BIN_DONE = 3;
let TRANSFER_STATE_NONE = 0;
let TRANSFER_STATE_BIN_FETCHED = 1;
let TRANSFER_STATE_BIN_ON_GOING = 2;
let TRANSFER_STATE_BIN_DONE = 3;

51
console/web/code/js/manage.js
View File

@@ -101,13 +101,6 @@ $(document).ready(function() {
let fileName = filePath.substring(filePath.lastIndexOf('\\') + 1, filePath.lastIndexOf('.'));
$('#protocol_name_b').val(fileName);
});
$('.dob_cbtn').click(function() {
onDoBClick(this.id);
});
updateTransferState(TRANSFER_STATE_NONE);
});
function initializeSelectors() {
@@ -128,7 +121,7 @@ function loadRemoteList(isSearch, remoteMap) {
url = '/irext/int/search_remote_indexes?remote_map='+
remoteMap+'&from=0&count=2000&admin_id='+id+'&token='+token;
} else {
if(currentFilterCategory.id === 3) {
if(parseInt(currentFilterCategory.id) === 3) {
url = '/irext/int/list_remote_indexes?category_id='+
currentFilterCategory.id+'&city_code='+currentFilterCity.code+
'&from=0&count=100&admin_id='+id+'&token='+token;
@@ -446,7 +439,7 @@ function searchRemote() {
}
}
function verifyRemote() {
function verifyRemote(pass) {
if(null == selectedRemote) {
popUpHintDialog(i18n.t("page_code.d_hint_common_select_index", { lng: userLang }));
return;
@@ -688,7 +681,8 @@ function initializeCategories() {
from : 0,
count : 200,
admin_id : id,
token : token
token : token,
lang: userLang
},
timeout: 20000,
success: function(response) {
@@ -724,7 +718,8 @@ function initializeProvince() {
dataType: 'JSON',
data: {
admin_id : id,
token : token
token : token,
lang : userLang
},
type: 'POST',
timeout: 20000,
@@ -760,7 +755,8 @@ function initializeCity() {
data: {
province_prefix : provincePrefix,
admin_id : id,
token : token
token : token,
lang : userLang
},
timeout: 20000,
success: function(response) {
@@ -810,7 +806,8 @@ function initializeOperator() {
from : 0,
count : 200,
admin_id : id,
token : token
token : token,
lang: userLang
},
timeout: 20000,
success: function(response) {
@@ -859,7 +856,8 @@ function initializeBrands() {
from : 0,
count : 300,
admin_id : id,
token : token
token : token,
lang: userLang
},
timeout: 20000,
success: function(response) {
@@ -896,7 +894,8 @@ function initializeFilterCategories() {
from : 0,
count : 200,
admin_id : id,
token : token
token : token,
lang: userLang
},
timeout: 20000,
success: function(response) {
@@ -929,7 +928,8 @@ function initializeFilterProvince() {
dataType: 'JSON',
data: {
admin_id : id,
token : token
token : token,
lang : userLang
},
timeout: 20000,
success: function(response) {
@@ -964,7 +964,8 @@ function initializeFilterCity() {
data: {
province_prefix : provincePrefix,
admin_id : id,
token : token
token : token,
lang : userLang
},
timeout: 20000,
success: function(response) {
@@ -978,7 +979,7 @@ function initializeFilterCity() {
name: cities[0].name
}
}
if(currentFilterCategory.id === 3) {
if(parseInt(currentFilterCategory.id) === 3) {
loadRemoteList();
}
} else {
@@ -1001,7 +1002,8 @@ function initializeFilterBrands() {
from : 0,
count : 300,
admin_id : id,
token : token
token : token,
lang: userLang
},
timeout: 20000,
success: function(response) {
@@ -1052,7 +1054,6 @@ function onProtocolTypeChange() {
function onCategoryChange() {
let currentCategoryID = $('#category_id').val();
currentCategory = getCategoryByID(currentCategoryID);
switchCategory();
}
@@ -1274,7 +1275,7 @@ function onFallbackRemote() {
return;
}
if (currentFilterCategory.id === 3) {
if (parseInt(currentFilterCategory.id) === 3) {
hintText = i18n.t("page_code.d_hint_fallback_confirm", { lng: userLang }) +
selectedRemote.city_name + ' ' + selectedRemote.category_name + ' ' +
selectedRemote.protocol + ' ' + selectedRemote.remote +
@@ -1298,7 +1299,7 @@ function onDeleteRemote() {
popUpHintDialog(i18n.t("page_code.d_hint_common_select_index", { lng: userLang }));
return;
}
if (currentFilterCategory.id === 3) {
if (parseInt(currentFilterCategory.id) === 3) {
hintText = i18n.t("page_code.d_hint_delete_confirm", { lng: userLang }) +
selectedRemote.city_name + ' ' + selectedRemote.category_name + ' ' +
selectedRemote.protocol + ' ' + selectedRemote.remote +
@@ -1329,7 +1330,7 @@ function onVerifyRemote(isPass) {
popUpHintDialog(i18n.t("page_code.d_hint_common_select_index", { lng: userLang }));
return;
}
if (currentFilterCategory.id === 3) {
if (parseInt(currentFilterCategory.id) === 3) {
hintText = i18n.t("page_code.d_hint_confirm_to", { lng: userLang }) +
passText + selectedRemote.city_name + ' ' + selectedRemote.category_name + ' ' +
selectedRemote.protocol + ' ' +
@@ -1643,7 +1644,7 @@ function getCategoryByID(categoryID) {
let i = 0;
for(i = 0; i < g_categories.length; i++) {
let category = g_categories[i];
if (category.id === categoryID) {
if (parseInt(category.id) === parseInt(categoryID)) {
return category;
}
}
@@ -1654,7 +1655,7 @@ function getBrandByID(brandID) {
let i = 0;
for(i = 0; i < g_brands.length; i++) {
let brand = g_brands[i];
if (brand.id === brandID) {
if (parseInt(brand.id) === parseInt(brandID)) {
return brand;
}
}

484
console/web/code/js/operate.js
View File

@@ -4,27 +4,27 @@
*/
// web COM socket
var ws = null;
var transferSocketConnected = false;
var serialPortConnected = false;
let ws = null;
let transferSocketConnected = false;
let serialPortConnected = false;
// initialize transfer object
var binToTransfer = {
let binToTransfer = {
category_id : 0,
content : null,
length : 0
};
var keyNames = [
let keyNames = [
"POWER", "UP", "DOWN", "LEFT", "RIGHT", "OK", "PLUS", "MINUS", "HOME", "BACK", "MENU"
];
var acPowers = ["ON", "OFF"];
var acTempBegin = 16;
var acModes = ["Cool", "Heat", "Auto", "Fan", "DEHUMID"];
var acSpeed = ["Low", "Medium", "High", "Auto"];
var acSwing = ["ON", "OFF"];
var acStatus = {
let acPowers = ["ON", "OFF"];
let acTempBegin = 16;
let acModes = ["Cool", "Heat", "Auto", "Fan", "DEHUMID"];
let acSpeed = ["Low", "Medium", "High", "Auto"];
let acSwing = ["ON", "OFF"];
let acStatus = {
power: 0,
temp: 8,
mode: 0,
@@ -32,19 +32,19 @@ var acStatus = {
wind_speed: 0
};
var decodedReceiverTimer = null;
var decodedValue = [];
var decodedReceiving = false;
let decodedReceiverTimer = null;
let decodedValue = [];
let decodedReceiving = false;
var transferState = TRANSFER_STATE_NONE;
let transferState = TRANSFER_STATE_NONE;
var BIN_TRANSFER_BYTE_MAX = 16;
let BIN_TRANSFER_BYTE_MAX = 16;
function downloadBin() {
var downloadURL = "";
let downloadURL = "";
if(null == selectedRemote) {
popUpHintDialog('请先选中一个索引');
popUpHintDialog(i18n.t("page_code.d_hint_common_select_index", { lng: userLang }));
return;
}
downloadURL = '/irext/int/download_remote_index?remote_index_id='+selectedRemote.id+'&admin_id='+id+'&token='+token;
@@ -57,452 +57,4 @@ function downloadBin() {
'_blank'
);
}
}
// binary transfer to IR decode chip sets
function onTransferBin() {
if(null == selectedRemote) {
popUpHintDialog('请先选中一个索引');
return;
}
$('#binary_transfer_dialog').modal({
backdrop: 'static',
keyboard: false
})
}
function onTransferTypeChanged() {
// TODO:
}
function prepareTransfer() {
if (false == transferSocketConnected) {
ws = new WebSocket('ws://localhost:8301/');
ws.binaryType = 'arraybuffer';
ws.addEventListener('error', function () {
onTransferSocketError();
});
ws.addEventListener('open', function () {
onTransferSocketOpened();
});
ws.addEventListener('close', function () {
onTransferSocketClosed();
});
ws.addEventListener('message', function (data) {
onTransferSocketData(data);
});
transferSocketConnected = true;
} else {
popUpHintDialog('连接已经建立');
}
}
function onTransferSocketError() {
popUpHintDialog('当前的环境不支持 Web COM，请参考 <a href="http://https://github.com/strawmanbobi/web-com">' +
'http://https://github.com/strawmanbobi/web-com</a> 获取更多信息');
updateTransferState(TRANSFER_STATE_NONE, 0, 100);
}
function onTransferSocketOpened() {
serialPortConnected = true;
}
function onTransferSocketClosed() {
transferSocketConnected = false;
popUpHintDialog("Web COM 已经关闭");
updateTransferState(TRANSFER_STATE_NONE, 0, 100);
}
function onTransferSocketData(e) {
// echo data from peer
if (TRANSFER_STATE_BIN_FETCHED == transferState ||
TRANSFER_STATE_BIN_ON_GOING == transferState) {
var array = new Uint8Array(e.data);
if (array[0] == 0x30) {
onTransferResponse(array.slice(1));
} else if (array[0] == 0x31) {
onCommandResponse(array.slice(1));
} else {
// might be decode result
console.log('error');
}
} else if (TRANSFER_STATE_BIN_DONE == transferState) {
var array = new Uint16Array(e.data);
// this is a part of the data chunk of the whole decoded values, concat this
onDecoded(array);
}
}
function onTransferResponse(data) {
if (TRANSFER_STATE_BIN_FETCHED == transferState ||
TRANSFER_STATE_BIN_ON_GOING == transferState) {
// verify if the expected byte index equals '0'
var index = parseInt(new TextDecoder("utf-8").decode(data));
updateTransferState(TRANSFER_STATE_BIN_ON_GOING, index, binToTransfer.length);
if (index >= binToTransfer.length) {
updateTransferState(TRANSFER_STATE_BIN_DONE,index, binToTransfer.length);
} else {
sendExpectedData(index);
}
} else {
console.log('invalid transfer state : ' + transferState);
}
}
function onCommandResponse(data) {
}
function onDecoded(array) {
if (decodedReceiverTimer) {
clearTimeout(decodedReceiverTimer);
}
if (false == decodedReceiving) {
// clear receiving buffer
decodedValue = new Uint16Array(array);
}
decodedReceiving = true;
// concat buffer
decodedValue = concatTypedArrays(decodedValue, array);
decodedReceiverTimer = setTimeout(function() {
decodedReceiving = false;
$('#dob_ir_wave_value').val(decodedValue);
}, 200);
}
function fetchBinary() {
var remoteToTransfer = selectedRemote;
remoteToTransfer.admin_id = id;
remoteToTransfer.token = token;
$.ajax({
url: '/irext/decode/prepare_transfering_remote_index',
type: 'POST',
dataType: 'json',
data: remoteToTransfer,
timeout: 20000,
success: function (response) {
if(response.status.code == 0) {
onTransferBinFetched(response.entity);
} else {
popUpHintDialog('获取二进制文件失败');
}
},
error: function () {
popUpHintDialog('获取二进制文件失败');
}
});
}
function startTransfer() {
if (!ws) {
console.log('invalid transfer socket');
return;
}
fetchBinary();
}
function startDoB() {
/*
if (TRANSFER_STATE_BIN_DONE != transferState) {
popUpHintDialog("需要先下载二进制码");
return;
}
*/
$('#binary_transfer_dialog').modal('hide');
$('#dob_ir_wave_value').val('');
resetKeyPressInfo();
$('#dob_dialog').modal({
backdrop: 'static',
keyboard: false
});
}
function quitDob() {
$('#dob_dialog').modal('hide');
}
function sendExpectedData(index) {
if (index < 0) {
console.log('expected index error : ' + index + ', abort !!');
return;
}
if (!ws) {
console.log('invalid transfer socket');
return;
}
var leftLength = binToTransfer.length - index;
var lengthToSend = 0;
if (leftLength < BIN_TRANSFER_BYTE_MAX) {
lengthToSend = parseInt(leftLength);
} else {
lengthToSend = parseInt(BIN_TRANSFER_BYTE_MAX);
}
var arrayToSend = binToTransfer.content.slice(index, parseInt(index) + parseInt(lengthToSend));
var binToSend = buildBinaryPacket(arrayToSend);
ws.send(binToSend);
}
function cancelTransfer() {
// close serial port by closing transfer socket
if (ws) {
ws.close();
}
serialPortConnected = false;
updateTransferState(TRANSFER_STATE_NONE, 0, 100);
$('#binary_transfer_dialog').modal('hide');
binToTransfer = {
category_id : 0,
content : null,
length : 0
};
}
function onTransferBinFetched(btt) {
var bin = _base64ToArrayBuffer(btt.bin);
// prepare binary in RAM
binToTransfer = {
category_id : btt.category_id,
// encode binary content into typed array
content : new Uint8Array(bin),
length : bin.byteLength
};
updateTransferState(TRANSFER_STATE_BIN_FETCHED, 0, 100);
if (false == serialPortConnected) {
popUpHintDialog("连接尚未建立，请先建立连接");
return;
}
if (null == binToTransfer || null == binToTransfer.content || 0 == binToTransfer.length ||
0 == binToTransfer.category_id) {
popUpHintDialog("没有获取到有效的编码二进制文件，请重试");
return;
}
// after remote binary is fetch, start binary data transfer by clicking 'start' button
var binaryLengthData = buildBinaryLength(binToTransfer.length);
if (null == binaryLengthData) {
console.log('failed to parse binary length, abort !!');
return;
}
var transferType = binToTransfer.category_id == CATEGORY_AC ? '2' : '1';
var header = buildSummaryPacket(transferType + binaryLengthData);
ws.send(header);
}
function updateTransferState(newState, progress, total) {
var progressText = '';
transferState = newState;
switch (parseInt(newState)) {
case TRANSFER_STATE_NONE:
progressText = '空闲中';
break;
case TRANSFER_STATE_BIN_FETCHED:
progressText = '二进制文件获得';
break;
case TRANSFER_STATE_BIN_ON_GOING:
progressText = '发送中: ' + progress + '/' + total;
break;
case TRANSFER_STATE_BIN_DONE:
progressText = '发送完成';
break;
default:
console.log('transfer state error : ' + newState);
break;
}
updateProgress(progress, total);
$('#transfer_progress_desc').html(progressText);
}
function updateProgress(current, total) {
var progress = $("#transfer_progress");
progress.attr('aria-valuemax', total);
progress.attr('data-transitiongoal', current);
progress.progressbar();
}
function buildBinaryLength(lengthInfo) {
try {
var len = parseInt(lengthInfo);
if (len >= 10000) {
console.log('binary size exceeded');
return null;
} else if (len >= 1000 && len < 10000) {
return lengthInfo;
} else if (len >= 100 && len < 1000) {
return "0" + lengthInfo;
} else if (len >= 10 && len < 100) {
return "00" + lengthInfo;
} else if (len >= 0 && len < 10) {
return "000" + lengthInfo;
} else {
console.log('binary size exceeded');
return null;
}
} catch (err) {
console.log('error occurred : ' + err);
return null;
}
}
function buildSummaryPacket(data) {
if (isByteArray(data)) {
return concatTypedArrays(new Uint8Array([0x30]), data);
} else if (isString(data)) {
return '0' + data;
}
}
function buildBinaryPacket(data) {
if (isByteArray(data)) {
return concatTypedArrays(new Uint8Array([0x31]), data);
} else if (isString(data)) {
return '1' + data;
} else {
console.log('invalid type of bin to send : ' + typeof data + ', ' + data.constructor);
}
}
function buildCommand(data) {
if (isByteArray(data)) {
return concatTypedArrays(new Uint8Array([0x32]), data);
} else if (isString(data)) {
return '2' + data;
}
}
function onDoBClick(buttonID) {
if (TRANSFER_STATE_BIN_DONE != transferState) {
popUpHintDialog('需要先下载二进制码');
return;
}
currentControl.key_id = buttonID.substring(8);
updateKeyPressInfo(currentControl.key_id);
decodeOnBoard(currentControl);
}
function updateKeyPressInfo(buttonID) {
$('#key_press').html(keyNames[parseInt(buttonID)]);
if(1 == selectedRemote.category_id && binToTransfer.category_id == CATEGORY_AC) {
$('#ac_status_power').html('AC POWER:' + acPowers[acStatus.power]);
$('#ac_status_mode').html('AC MODE:' + acModes[acStatus.mode]);
$('#ac_status_temp').html('AC TEMP:' + (16 + parseInt(acStatus.temp)));
$('#ac_status_speed').html('WIND SPEED:' + acSpeed[acStatus.wind_speed]);
$('#ac_status_swing').html('SWING:' + acSwing[acStatus.wind_dir]);
} else if (2 == selectedRemote.category_id && binToTransfer.category_id != CATEGORY_AC) {
$('#ac_status_power').html('');
$('#ac_status_mode').html('');
$('#ac_status_temp').html('');
$('#ac_status_speed').html('');
$('#ac_status_swing').html('');
}
}
function resetKeyPressInfo() {
$('#key_press').html('');
$('#ac_status_power').html('');
$('#ac_status_mode').html('');
$('#ac_status_temp').html('');
$('#ac_status_speed').html('');
$('#ac_status_swing').html('');
}
function decodeOnBoard(control) {
var command = '';
if (!ws) {
console.log('invalid command socket');
return;
}
var transferType = binToTransfer.category_id == CATEGORY_AC ? '2' : '1';
if(1 == selectedRemote.category_id && binToTransfer.category_id == CATEGORY_AC) {
// decode as AC
acStatus = {
power: '0',
temp: '8',
mode: '0',
wind_dir: '0',
wind_speed: '0'
};
control.ac_status = acStatus;
var acFunction = '0';
switch(control.key_id) {
case '0':
// power key --> change power
acFunction = '1';
break;
case '1':
// up key --> change wind speed
acFunction = '5';
break;
case '2':
// down key --> change wind dir
acFunction = '6';
break;
case '4':
// right key --> change mode
acFunction = '2';
break;
case '5':
// center key --> fix wind dir
acFunction = '7';
break;
case '6':
// plus key --> temp up
acFunction = '3';
break;
case '7':
// minus key --> temp down
acFunction = '4';
break;
default:
return;
}
command = buildCommand(transferType + acFunction + control.ac_status.power +
control.ac_status.temp + control.ac_status.mode +
control.ac_status.wind_dir + control.ac_status.wind_speed);
} else {
// decode as TV
command = buildCommand(transferType + control.key_id);
}
ws.send(command);
}
function _base64ToArrayBuffer(base64) {
var binary_string = window.atob(base64);
var len = binary_string.length;
var bytes = new Uint8Array(len);
for (var i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
}
function ab2hex(buffer) { // buffer is an ArrayBuffer
return Array.prototype.map.call(new Uint8Array(buffer), x => '0x' + ('00' + x.toString(16)).slice(-2)).join(',');
}
function concatTypedArrays(a, b) {
var c = new (a.constructor)(a.length + b.length);
c.set(a, 0);
c.set(b, a.length);
return c;
}
function isByteArray(obj) {
return (typeof obj == 'object') && obj.constructor == Uint8Array;
}
function isString(obj) {
return (typeof obj == 'string') && obj.constructor == String;
}