|
|
@@ -39,173 +39,35 @@ var VENDOR = {
|
|
|
};
|
|
|
|
|
|
var globalFinishedFlag = false;
|
|
|
+var globalInterestRootFlag = false;
|
|
|
|
|
|
-$(function () {
|
|
|
-
|
|
|
- RVC.GuideController = RVC.Object.extend({
|
|
|
- hideAllPage: function () {
|
|
|
- $('#guide_start_page').hide();
|
|
|
- $('#guide_init_param_page').hide();
|
|
|
- $('#guide_sync_centersetting_page').hide();
|
|
|
- $('#guide_access_authorize_page').hide();
|
|
|
- $('#guide_media_config_page').hide();
|
|
|
- $('#guide_finish_page').hide();
|
|
|
- $('#guide_reboot_page').hide();
|
|
|
- },
|
|
|
- hideAllRebootTipElem: function() {
|
|
|
- $('#reboot_operate').hide();
|
|
|
- $('#guide_rebootinfo').hide();
|
|
|
- $('#guide_rebootinfo_need_restart').hide();
|
|
|
- $('#guide_rebootinfo_need_reboot').hide();
|
|
|
- $('#guide_reboot_application_button').hide();
|
|
|
- $('#guide_reboot_device_button').hide();
|
|
|
-
|
|
|
- $('#guide_finished_button').hide();
|
|
|
- $('#guide_finish_device_button').hide();
|
|
|
- $('#guide_save_loading').hide();
|
|
|
- $('#guide_reboot_loading').hide();
|
|
|
- $('#guide_restart_loading').hide();
|
|
|
- },
|
|
|
- resizeWindow: function () {
|
|
|
- var winHei = $(window).height();
|
|
|
- var popHeight = 480;
|
|
|
- var adjustHeight = 0;
|
|
|
- var blueBackgroundHeight = 0;
|
|
|
- if (winHei < 860) {
|
|
|
- winHei = 860;
|
|
|
- }
|
|
|
- blueBackgroundHeight = winHei - $('.headcontainer').height() - $('#page_footer').height();
|
|
|
- $('#guide_height').height(blueBackgroundHeight);
|
|
|
- adjustHeight = (blueBackgroundHeight - popHeight) * 0.5;
|
|
|
-
|
|
|
- $('#guide_start_page').css('padding-top', (adjustHeight + 100) + 'px');
|
|
|
- var domWidth = $('body').width();
|
|
|
- var winWidth = $('window').width();
|
|
|
- if (domWidth > winWidth) {
|
|
|
- setTimeout(function () {
|
|
|
- $('body').scrollTop($('.headcontainer').height() + adjustHeight);
|
|
|
- $('body').scrollLeft(($('body').width() - $(window).width()) / 2);
|
|
|
- }, 1000)
|
|
|
- }
|
|
|
- $('#guide_init_param_page').css('padding-top', adjustHeight + 'px');
|
|
|
- },
|
|
|
- beginInstall: function() {
|
|
|
- this.gotoPage(CONST.DeployStep_GetTerminalInfo);
|
|
|
- },
|
|
|
- getPage: function(step) {
|
|
|
- var select_page = '';
|
|
|
- switch(step) {
|
|
|
- case CONST.DeployStep_Begin:
|
|
|
- select_page = 'guide_start_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_GetTerminalInfo :
|
|
|
- select_page = 'guide_init_param_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_FetchCenterSettings:
|
|
|
- select_page = 'guide_sync_centersetting_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_AccessAuthorize :
|
|
|
- select_page = 'guide_access_authorize_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_MediaConfig :
|
|
|
- select_page = 'guide_media_config_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_AdapterConfig :
|
|
|
- select_page = 'guide_adapter_config_page';
|
|
|
- break;
|
|
|
- case CONST.DeployStep_Finished :
|
|
|
- select_page = 'guide_finish_page';
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- return select_page;
|
|
|
- },
|
|
|
- checkPageAvailable: function(step) {
|
|
|
- const select_page = this.getPage(step);
|
|
|
- if(select_page !== '') {
|
|
|
- return true;
|
|
|
- } else {
|
|
|
- return false;
|
|
|
- }
|
|
|
- },
|
|
|
- preLoadPage: function(step) {
|
|
|
- this.hideAllPage();
|
|
|
- switch(step) {
|
|
|
- case CONST.DeployStep_MediaConfig:
|
|
|
- FulfillMediaDeviceList();
|
|
|
- break;
|
|
|
- case CONST.DeployStep_AdapterConfig:
|
|
|
- FulfillDevAdapterFileList();
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- },
|
|
|
- postLoadPage: function(step) {
|
|
|
- switch(step) {
|
|
|
- case CONST.DeployStep_Finished:
|
|
|
- globalFinishedFlag = true;
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- },
|
|
|
- gotoPage: function(nextStep) {
|
|
|
-
|
|
|
- var select_page = this.getPage(nextStep);
|
|
|
-
|
|
|
- if(select_page !== '') {
|
|
|
- this.preLoadPage(nextStep);
|
|
|
- $('#' + select_page).show();
|
|
|
- this.postLoadPage(nextStep);
|
|
|
- } else {
|
|
|
- utilShowToast('无法识别步骤标识：' + nextStep, 3000);
|
|
|
- }
|
|
|
- },
|
|
|
- sectOverPass: function() {
|
|
|
-
|
|
|
- },
|
|
|
- sectNext: function() {
|
|
|
|
|
|
- },
|
|
|
- setNavigaBtnAble: function(enable) {
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
+function VendorSelectChanged(name)
|
|
|
+{
|
|
|
+ utilStartAlertDialog(name);
|
|
|
+}
|
|
|
|
|
|
+function DeviceSelectChange(name)
|
|
|
+{
|
|
|
+ utilStartAlertDialog(name);
|
|
|
+}
|
|
|
|
|
|
- RVC.CameraConfigEntity = RVC.EntityController.extend({
|
|
|
- entityName: 'CameraConfigManage',
|
|
|
- className: 'CameraConfigManageService',
|
|
|
- methodID: {
|
|
|
- GetMediaAvailableList: 9,
|
|
|
- SetMediaDevice: 10,
|
|
|
- TestAvailableMedieDev: 11
|
|
|
- },
|
|
|
- methodSignature: {
|
|
|
- GetMediaAvailableList: -1547834445,
|
|
|
- SetMediaDevice: -865058557,
|
|
|
- TestAvailableMedieDev: -2126935432
|
|
|
- },
|
|
|
+function AdapterSelectChange(name)
|
|
|
+{
|
|
|
+ //utilStartAlertDialog(name);
|
|
|
+}
|
|
|
|
|
|
- GetMediaAvailableList: function(req, callback) {
|
|
|
- this.webSocketInvokeEx(req,
|
|
|
- ({id:this.methodID.GetMediaAvailableList, sig:this.methodSignature.GetMediaAvailableList}),
|
|
|
- callback);
|
|
|
- },
|
|
|
- SetMediaDevice: function(req, callback) {
|
|
|
- this.webSocketInvokeEx(req,
|
|
|
- ({id:this.methodID.SetMediaDevice, sig:this.methodSignature.SetMediaDevice}),
|
|
|
- callback);
|
|
|
- },
|
|
|
- TestAvailableMedieDev: function(req, callback) {
|
|
|
- this.webSocketInvokeEx(req,
|
|
|
- ({id:this.methodID.TestAvailableMedieDev, sig:this.methodSignature.TestAvailableMedieDev}),
|
|
|
- callback);
|
|
|
- }
|
|
|
- });
|
|
|
+function InterestRootSwitch()
|
|
|
+{
|
|
|
+ if ($('#gui_adapter_config_root_interest_switch').hasClass('switch_on')) {
|
|
|
+ globalInterestRootFlag = true;
|
|
|
+ } else {
|
|
|
+ globalInterestRootFlag = false;
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
+$(function () {
|
|
|
+
|
|
|
function ResetDeployConfig() {
|
|
|
let req = new Request();
|
|
|
req.preStep = CONST.DeployStep_Begin;
|
|
|
@@ -395,7 +257,7 @@ $(function () {
|
|
|
PreDeployTerminalWithIPAndPort(ip, port, true);
|
|
|
}
|
|
|
|
|
|
- function generateDeviceSelect(devices, select_id) {
|
|
|
+ function generateMediaDeviceSelect(devices, select_id) {
|
|
|
var deviceLength = 0;
|
|
|
if ((devices) instanceof Array) {
|
|
|
deviceLength = devices.length;
|
|
|
@@ -440,6 +302,8 @@ $(function () {
|
|
|
pushHtml = '<div id="{{type}}_item_{{loop}}" option="{{deviceName}}" class="select_medium hide_with_ellipsis"'
|
|
|
if(!(status[loop] & 0x1)) {
|
|
|
pushHtml += ' style="color:#C0C0C0;"'
|
|
|
+ } else {
|
|
|
+ pushHtml += ' onclick="AdapterSelectChange(\'{{deviceName}}\')"'
|
|
|
}
|
|
|
//root.ini 配置
|
|
|
if((status[loop] & 0x2)) {
|
|
|
@@ -477,10 +341,10 @@ $(function () {
|
|
|
cameras.push(result.AvailableList[n]);
|
|
|
}
|
|
|
}
|
|
|
- generateDeviceSelect(loundspeakers, 'gui_media_config_audio_output_outfree_list');
|
|
|
- generateDeviceSelect(loundspeakers, 'gui_media_config_audio_output_infree_list');
|
|
|
- generateDeviceSelect(microphones, 'gui_media_config_audio_input_outfree_list');
|
|
|
- generateDeviceSelect(microphones, 'gui_media_config_audio_input_infree_list');
|
|
|
+ generateMediaDeviceSelect(loundspeakers, 'gui_media_config_audio_output_outfree_list');
|
|
|
+ generateMediaDeviceSelect(loundspeakers, 'gui_media_config_audio_output_infree_list');
|
|
|
+ generateMediaDeviceSelect(microphones, 'gui_media_config_audio_input_outfree_list');
|
|
|
+ generateMediaDeviceSelect(microphones, 'gui_media_config_audio_input_infree_list');
|
|
|
if(typeof flag !== 'undefined') {
|
|
|
$('#gui_media_config_audio_input_infree').empty();
|
|
|
$('#gui_media_config_audio_input_infree').attr('value', '');
|
|
|
@@ -530,7 +394,7 @@ $(function () {
|
|
|
utilStartAlertDialog("操作失败：[" + result.result + "] " + result.msg);
|
|
|
}
|
|
|
} else if(typeof flag !== 'undefined'){
|
|
|
- RVC.CameraConfigEntity.commErrorCallback(ret);
|
|
|
+ RVC.DeviceControlEntityCtrl.commErrorCallback(ret);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -619,14 +483,14 @@ $(function () {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function CheckDevAdapterAvailable(adapterName)
|
|
|
+ function CheckDevAdapterAvailable(adapter, port, baudrate)
|
|
|
{
|
|
|
let req = new Request();
|
|
|
- req.filename= adapterName;
|
|
|
+ req.filename= adapter;
|
|
|
req.type = 0;
|
|
|
req.options = 0;
|
|
|
- req.port = 0;
|
|
|
- req.baudrate = 0;
|
|
|
+ req.port = parseInt(port, 10);
|
|
|
+ req.baudrate = parseInt(baudrate, 10);
|
|
|
req.param1 = 0;
|
|
|
req.param2 = 0;
|
|
|
req.param3 = "";
|
|
|
@@ -635,13 +499,150 @@ $(function () {
|
|
|
RVC.DeviceControlEntityCtrl.TestAdapterFileAvailable(req, function(ret) {
|
|
|
if(ret.errorCode === 0) {
|
|
|
let result = JSON.parse(ret[RVC.EntityController.sigResponseUUID])
|
|
|
- utilStartAlertDialog("操作结果：[" + result.status + "] " + result.msg);
|
|
|
- } else if(typeof flag !== 'undefined'){
|
|
|
- RVC.CameraConfigEntity.commErrorCallback(ret);
|
|
|
+ if(result.status == 0) {
|
|
|
+ utilStartAlertDialog("指定适配器文件成功加载，且尝试打开设备成功！");
|
|
|
+ } else {
|
|
|
+ utilStartAlertDialog("验证失败：[" + result.status + "] " + result.msg);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ RVC.DeviceControlEntityCtrl.commErrorCallback(ret);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ RVC.GuideController = RVC.Object.extend({
|
|
|
+ hideAllPage: function () {
|
|
|
+ $('#guide_start_page').hide();
|
|
|
+ $('#guide_init_param_page').hide();
|
|
|
+ $('#guide_sync_centersetting_page').hide();
|
|
|
+ $('#guide_access_authorize_page').hide();
|
|
|
+ $('#guide_media_config_page').hide();
|
|
|
+ $('#guide_finish_page').hide();
|
|
|
+ $('#guide_reboot_page').hide();
|
|
|
+ },
|
|
|
+ hideAllRebootTipElem: function() {
|
|
|
+ $('#reboot_operate').hide();
|
|
|
+ $('#guide_rebootinfo').hide();
|
|
|
+ $('#guide_rebootinfo_need_restart').hide();
|
|
|
+ $('#guide_rebootinfo_need_reboot').hide();
|
|
|
+ $('#guide_reboot_application_button').hide();
|
|
|
+ $('#guide_reboot_device_button').hide();
|
|
|
+
|
|
|
+ $('#guide_finished_button').hide();
|
|
|
+ $('#guide_finish_device_button').hide();
|
|
|
+ $('#guide_save_loading').hide();
|
|
|
+ $('#guide_reboot_loading').hide();
|
|
|
+ $('#guide_restart_loading').hide();
|
|
|
+ },
|
|
|
+ resizeWindow: function () {
|
|
|
+ var winHei = $(window).height();
|
|
|
+ var popHeight = 480;
|
|
|
+ var adjustHeight = 0;
|
|
|
+ var blueBackgroundHeight = 0;
|
|
|
+ if (winHei < 860) {
|
|
|
+ winHei = 860;
|
|
|
+ }
|
|
|
+ blueBackgroundHeight = winHei - $('.headcontainer').height() - $('#page_footer').height();
|
|
|
+ $('#guide_height').height(blueBackgroundHeight);
|
|
|
+ adjustHeight = (blueBackgroundHeight - popHeight) * 0.5;
|
|
|
+
|
|
|
+ $('#guide_start_page').css('padding-top', (adjustHeight + 100) + 'px');
|
|
|
+ var domWidth = $('body').width();
|
|
|
+ var winWidth = $('window').width();
|
|
|
+ if (domWidth > winWidth) {
|
|
|
+ setTimeout(function () {
|
|
|
+ $('body').scrollTop($('.headcontainer').height() + adjustHeight);
|
|
|
+ $('body').scrollLeft(($('body').width() - $(window).width()) / 2);
|
|
|
+ }, 1000)
|
|
|
+ }
|
|
|
+ $('#guide_init_param_page').css('padding-top', adjustHeight + 'px');
|
|
|
+ },
|
|
|
+ beginInstall: function() {
|
|
|
+ this.gotoPage(CONST.DeployStep_GetTerminalInfo);
|
|
|
+ },
|
|
|
+ getPage: function(step) {
|
|
|
+ var select_page = '';
|
|
|
+ switch(step) {
|
|
|
+ case CONST.DeployStep_Begin:
|
|
|
+ select_page = 'guide_start_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_GetTerminalInfo :
|
|
|
+ select_page = 'guide_init_param_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_FetchCenterSettings:
|
|
|
+ select_page = 'guide_sync_centersetting_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_AccessAuthorize :
|
|
|
+ select_page = 'guide_access_authorize_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_MediaConfig :
|
|
|
+ select_page = 'guide_media_config_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_AdapterConfig :
|
|
|
+ select_page = 'guide_adapter_config_page';
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_Finished :
|
|
|
+ select_page = 'guide_finish_page';
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ return select_page;
|
|
|
+ },
|
|
|
+ checkPageAvailable: function(step) {
|
|
|
+ const select_page = this.getPage(step);
|
|
|
+ if(select_page !== '') {
|
|
|
+ return true;
|
|
|
+ } else {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ preLoadPage: function(step) {
|
|
|
+ this.hideAllPage();
|
|
|
+ switch(step) {
|
|
|
+ case CONST.DeployStep_MediaConfig:
|
|
|
+ FulfillMediaDeviceList();
|
|
|
+ break;
|
|
|
+ case CONST.DeployStep_AdapterConfig:
|
|
|
+ InterestRootSwitch();
|
|
|
+ FulfillDevAdapterFileList();
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ postLoadPage: function(step) {
|
|
|
+ switch(step) {
|
|
|
+ case CONST.DeployStep_Finished:
|
|
|
+ globalFinishedFlag = true;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ gotoPage: function(nextStep) {
|
|
|
+
|
|
|
+ var select_page = this.getPage(nextStep);
|
|
|
+
|
|
|
+ if(select_page !== '') {
|
|
|
+ this.preLoadPage(nextStep);
|
|
|
+ $('#' + select_page).show();
|
|
|
+ this.postLoadPage(nextStep);
|
|
|
+ } else {
|
|
|
+ utilShowToast('无法识别步骤标识：' + nextStep, 3000);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ sectOverPass: function() {
|
|
|
+
|
|
|
+ },
|
|
|
+ sectNext: function() {
|
|
|
+
|
|
|
+ },
|
|
|
+ setNavigaBtnAble: function(enable) {
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
$(document).on('click', '#guide_init_param_ip_check #ip_connect_check', function(){
|
|
|
var ip = $('#guide_server_ip').val();
|
|
|
console.log('ip: ' + ip);
|
|
|
@@ -670,9 +671,15 @@ $(function () {
|
|
|
|
|
|
});
|
|
|
|
|
|
- $(document).on('click', '#guide_adapter_config_check', function() {
|
|
|
+ $(document).on('click', '#guide_adapter_config_test', function() {
|
|
|
var deviceName = $('#gui_adapter_config_device').attr('value');
|
|
|
- CheckDevAdapterAvailable(deviceName);
|
|
|
+ var vendorName = $('#gui_adapter_config_vendor').attr('value');
|
|
|
+
|
|
|
+ var adapterName = $('#gui_adapter_config_adapter').attr('value');
|
|
|
+ var paramPort = $('#guide_adapter_config_port_input').val();
|
|
|
+ var paramBaudrate = $('#guide_adapter_config_baudrate_input').val();
|
|
|
+
|
|
|
+ CheckDevAdapterAvailable(adapterName, paramPort, paramBaudrate);
|
|
|
});
|
|
|
|
|
|
$(document).on('click', '#guide_sync_centersetting_next', function() {
|
gifur