[Feature][S300AI][task-view-1715][app] add s300 app
Change-Id: Ifdc29666a80c46ec30ab5cadfcbdf4644ffa9ed7
diff --git a/lynq/S300AI/ap/app/zte_webui/js/com.js b/lynq/S300AI/ap/app/zte_webui/js/com.js
index 79c290a..5bba194 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/com.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/com.js
@@ -91,7 +91,8 @@
function prepare(values, isPost) {
var obj = {
goformId: "LOGIN",
- password: config.PASSWORD_ENCODE ? Base64.encode(values.password) : values.password
+ password: config.PASSWORD_ENCODE ? Base64.encode(values.password) : values.password,
+ username: config.PASSWORD_ENCODE ? Base64.encode(values.username) : values.username
};
return obj;
}
@@ -2904,7 +2905,7 @@
function prepare(values, isPost) {
var wpask = config.PASSWORD_ENCODE ? "WPAPSK1_encode,m_WPAPSK1_encode," : "rnum_js,WPAPSK1_enaes,m_WPAPSK1_enaes,";
var valueReq = {
- cmd: "wifi_coverage,m_ssid_enable,imei,ziccid,cell_id,network_type,sub_network_type,rssi,rscp,lte_rsrp,imsi,sim_imsi,cr_version,hw_version,MAX_Access_num," + wpask + "SSID1,AuthMode,m_SSID,m_AuthMode,m_HideSSID,m_MAX_Access_num,lan_ipaddr," + "mac_address,msisdn,LocalDomain,wan_ipaddr,static_wan_ipaddr,ipv6_wan_ipaddr,ipv6_pdp_type,pdp_type,ppp_status,sta_ip_status,rj45_state,ethwan_mode",
+ cmd: "wifi_coverage,m_ssid_enable,imei,network_type,sub_network_type,rssi,rscp,lte_rsrp,imsi,sim_imsi,cr_version,hw_version,MAX_Access_num," + wpask + "SSID1,AuthMode,m_SSID,m_AuthMode,m_HideSSID,m_MAX_Access_num,lan_ipaddr," + "mac_address,msisdn,LocalDomain,wan_ipaddr,static_wan_ipaddr,ipv6_wan_ipaddr,ipv6_pdp_type,pdp_type,ppp_status,sta_ip_status,rj45_state,ethwan_mode,cell_id",
multi_data: 1
};
return valueReq;
@@ -2930,9 +2931,8 @@
lanDomain: paramD.LocalDomain,
imei: paramD.imei,
signal: convertSignal(paramD),
- imsi: paramD.imsi || paramD.sim_imsi,
- iccid: paramD.ziccid,
cellid: paramD.cell_id,
+ imsi: paramD.imsi || paramD.sim_imsi,
sw_version: paramD.cr_version,
hw_version: paramD.hw_version,
max_access_num: paramD.MAX_Access_num,
@@ -6597,7 +6597,7 @@
});
} else {
$('input', '#frmLan').each(function () {
- $(this).attr("disabled", true);
+ $(this).attr("disabled", false);
});
clearValidateMsg();
@@ -6877,7 +6877,7 @@
var fwVm = new LanViewModel();
ko.applyBindings(fwVm, container[0]);
- addInterval(fwVm.refreshStatus, 1000);
+ //addInterval(fwVm.refreshStatus, 1000);
$('#frmLan').validate({
submitHandler:function () {
@@ -8792,7 +8792,6 @@
target.hasRj45 = set.RJ45_SUPPORT;
target.notDataCard = set.PRODUCT_TYPE != 'DATACARD';
target.hasParentalControl = set.HAS_PARENTAL_CONTROL;
- target.hasUssd = set.HAS_USSD;
target.hasVoice = set.HAS_VOICE;
var wifiInfo = fnc.getWifiBasic();
if (set.WIFI_SUPPORT_QR_SWITCH) {
@@ -8843,8 +8842,6 @@
target.simSerialNumber = libko.observable('');
target.imei = libko.observable('');
target.imsi = libko.observable('');
- target.iccid = libko.observable('');
- target.cellid = libko.observable('');
target.ssid = libko.observable('');
target.hasWifi = set.HAS_WIFI;
target.showMultiSsid = libko.observable(set.HAS_MULTI_SSID && wifiInfo.multi_ssid_enable == "1");
@@ -8881,8 +8878,6 @@
target.simSerialNumber(verifyDeviceInfo(data.simSerialNumber));
target.imei(verifyDeviceInfo(data.imei));
target.imsi(verifyDeviceInfo(data.imsi));
- target.iccid(verifyDeviceInfo(data.iccid));
- target.cellid(verifyDeviceInfo(data.cellid));
target.ssid(verifyDeviceInfo(data.ssid));
target.showMultiSsid(set.HAS_MULTI_SSID && data.multi_ssid_enable == "1");
return data;
@@ -8897,9 +8892,8 @@
simSerialNumber: verifyDeviceInfo(data.simSerialNumber),
imei: verifyDeviceInfo(data.imei),
imsi: verifyDeviceInfo(data.imsi),
- iccid : verifyDeviceInfo(data.iccid),
- cellid: verifyDeviceInfo(data.cellid),
signal: signalFormat(data.signal),
+ cellid: verifyDeviceInfo(data.cellid),
hasWifi: set.HAS_WIFI,
isCPE: set.PRODUCT_TYPE == 'CPE',
hasRj45: set.RJ45_SUPPORT,
@@ -9103,6 +9097,7 @@
target.loginSecuritySupport = ko.observable(config.LOGIN_SECURITY_SUPPORT);
target.newPIN = ko.observable();
target.password = ko.observable();
+ target.username = ko.observable();
target.PIN = ko.observable();
target.pinNumber = ko.observable(data.pinnumber);
target.PUK = ko.observable();
@@ -9162,6 +9157,7 @@
var ciphertext = "";
if (config.PASSWORD_ENCODE) {
ciphertext = target.password();
+ var username = target.username();
} else {
var kparam = service.getDeviceInfoLow();
var tkey = CryptoJS.enc.Latin1.parse(kparam.skey);
@@ -9173,7 +9169,8 @@
}).toString();
}
service.login({
- password:ciphertext
+ password:ciphertext,
+ username: username
}, function (info) {
setTimeout(function () {
timer = loginStatusCheckingTimer();
@@ -9190,6 +9187,7 @@
logout.init();
} else {
target.password("");
+ target.username("");
if(config.LOGIN_SECURITY_SUPPORT){
target.checkLoginData(function(){
if (target.loginCount() == config.MAX_LOGIN_COUNT) {
@@ -9274,9 +9272,12 @@
function setFocus(){
setTimeout(function () {
var txtAdmin = $('#txtAdmin:visible');
+ var txtUser = $('#txtUser:visible');
var txtPIN = $('#txtPIN:visible');
var txtPUK = $('#txtPUK:visible');
- if (txtAdmin.length > 0) {
+ if(txtUser.length > 0) {
+ txtUser.focus();
+ } else if (txtAdmin.length > 0) {
txtAdmin.focus();
} else if (txtPIN.length > 0) {
txtPIN.focus();
diff --git a/lynq/S300AI/ap/app/zte_webui/js/ext/menu.js b/lynq/S300AI/ap/app/zte_webui/js/ext/menu.js
index f57ab02..9a909b9 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/ext/menu.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/ext/menu.js
@@ -307,7 +307,8 @@
}, {
hash: '#usat',
path: 'ussd',
- level: '1',
+ level: '2',
+ parent: '#normal_set',
requireLogin: needLogin,
checkSIMStatus: false
}, {
diff --git a/lynq/S300AI/ap/app/zte_webui/js/ext/menu_pppoe.js b/lynq/S300AI/ap/app/zte_webui/js/ext/menu_pppoe.js
index 4ee45e4..c38efc3 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/ext/menu_pppoe.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/ext/menu_pppoe.js
@@ -307,7 +307,8 @@
}, {
hash: '#usat',
path: 'ussd',
- level: '1',
+ level: '2',
+ parent: '#normal_set',
requireLogin: needLogin,
checkSIMStatus: false
}, {
diff --git a/lynq/S300AI/ap/app/zte_webui/js/ext/set_aic8800d40i.js b/lynq/S300AI/ap/app/zte_webui/js/ext/set_aic8800d40i.js
index 8dcea96..8a83356 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/ext/set_aic8800d40i.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/ext/set_aic8800d40i.js
@@ -24,8 +24,8 @@
HAS_UPNP: false, //ÊÇ·ñÖ§³ÖUPNP
DDNS_SUPPORT: false, //DDNS
NETWORK_UNLOCK_SUPPORT: true,
- RJ45_SUPPORT: true,
- HAS_VOICE: true,
+ RJ45_SUPPORT: false,
+ HAS_VOICE: false,
NETWORK_MODES : [ {
name : '802.11 b/g/n/ax',
value : '6'
@@ -35,6 +35,7 @@
value: '6'
} ],
HAS_PHONEBOOK: false,
+ HAS_USSD: false,
//station¼ÓÃÜģʽ
AUTH_MODES_ALL: [{
name: 'NO ENCRYPTION',
diff --git a/lynq/S300AI/ap/app/zte_webui/js/net.js b/lynq/S300AI/ap/app/zte_webui/js/net.js
index 95efd6a..cd9f144 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/net.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/net.js
@@ -2390,7 +2390,6 @@
target.hasSms = config.HAS_SMS;
target.hasPhonebook = config.HAS_PHONEBOOK;
target.isSupportSD = config.SD_CARD_SUPPORT;
- target.hasUssd = config.HAS_USSD;
target.hasVoice = config.HAS_VOICE;
if (config.WIFI_SUPPORT_QR_SWITCH == false) {
target.showQRCode = config.WIFI_SUPPORT_QR_CODE;
diff --git a/lynq/S300AI/ap/app/zte_webui/js/sim_device.js b/lynq/S300AI/ap/app/zte_webui/js/sim_device.js
index e680e53..1f427b0 100755
--- a/lynq/S300AI/ap/app/zte_webui/js/sim_device.js
+++ b/lynq/S300AI/ap/app/zte_webui/js/sim_device.js
@@ -38,7 +38,6 @@
target.hasSms = config.HAS_SMS;
target.hasPhonebook = config.HAS_PHONEBOOK;
target.isSupportSD = config.SD_CARD_SUPPORT;
- target.hasUssd = config.HAS_USSD;
target.hasVoice = config.HAS_VOICE;
if (config.WIFI_SUPPORT_QR_SWITCH) {
var wifiInfo = service.getWifiBasic();