tyk/quectel-rgmii-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed network settings unsynced promises

Browse Source
This commit is contained in:
Russel Yasol
2024-05-09 08:39:36 +08:00
parent 0d4e19daf2
commit e56d521435
1 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
simpleadmin/www/network.html
View File

@@ -13,9 +13,9 @@
<!-- Import all the bootstrap css files from css folder --> <!-- Import all the bootstrap css files from css folder -->
<link rel="stylesheet" href="css/styles.css" /> <link rel="stylesheet" href="css/styles.css" />
<link rel="stylesheet" href="css/bootstrap.min.css" /> <link rel="stylesheet" href="css/bootstrap.min.css" />
<!-- Logo --> <!-- Logo -->
<link rel="simpleadmin-logo" href="favicon.ico"> <link rel="simpleadmin-logo" href="favicon.ico" />
<!-- Import BootStrap Javascript --> <!-- Import BootStrap Javascript -->
<script src="js/bootstrap.bundle.min.js"></script> <script src="js/bootstrap.bundle.min.js"></script>
@@ -449,6 +449,12 @@
bands[bandType] = numbers; bands[bandType] = numbers;
} }
// log all the bands
console.log("Bands", bands);
console.log("LTE Band: ", bands.lte_band);
console.log("NR5G Band NSA: ", bands.nsa_nr5g_band);
console.log("NR5G Band SA: ", bands.nr5g_band);
// Seperate the bands for each network mode // Seperate the bands for each network mode
const lte_bands = bands.lte_band.join(":"); const lte_bands = bands.lte_band.join(":");
const nsa_bands = bands.nsa_nr5g_band.join(":"); const nsa_bands = bands.nsa_nr5g_band.join(":");
@@ -497,22 +503,22 @@
}); });
} }
function getCurrentSettings() { // function getCurrentSettings() {
const atcmd = // const atcmd =
'AT+QUIMSLOT?;+CGCONTRDP=1;+QNWLOCK="common/4g";+QNWLOCK="common/5g";+QNWPREFCFG="mode_pref";+QNWPREFCFG="nr5g_disable_mode";+QCAINFO'; // 'AT+QUIMSLOT?;+CGCONTRDP=1;+QNWLOCK="common/4g";+QNWLOCK="common/5g";+QNWPREFCFG="mode_pref";+QNWPREFCFG="nr5g_disable_mode";+QCAINFO';
return requestATInfo(atcmd).then((rawdata) => { // return requestATInfo(atcmd).then((rawdata) => {
const settings = parseCurrentSettings(rawdata); // const settings = parseCurrentSettings(rawdata);
return { // return {
sim: settings.sim, // sim: settings.sim,
apn: settings.apn, // apn: settings.apn,
cellLockStatus: settings.cellLockStatus, // cellLockStatus: settings.cellLockStatus,
prefNetwork: settings.prefNetwork, // prefNetwork: settings.prefNetwork,
nrModeControl: settings.nrModeControl, // nrModeControl: settings.nrModeControl,
bands: settings.bands, // bands: settings.bands,
}; // };
}); // });
} // }
function cellLocking() { function cellLocking() {
return { return {
@@ -560,12 +566,13 @@
newSim: null, newSim: null,
cellLockStatus: "Unknown", cellLockStatus: "Unknown",
bands: "Fetching Bands...", bands: "Fetching Bands...",
isGettingBands: false,
init() { init() {
// Function to populate checkboxes // Function to populate checkboxes
const showPopulateCheckboxes = () => { const showPopulateCheckboxes = () => {
this.isLoading = true;
Promise.all([getSupportedBands(), getLockedBands()]) Promise.all([getSupportedBands(), getLockedBands()])
.then(([supportedBandsData, lockedBandsData]) => { .then(([supportedBandsData, lockedBandsData]) => {
this.isGettingBands = true;
this.lte_bands = supportedBandsData.lte_bands; this.lte_bands = supportedBandsData.lte_bands;
this.nsa_bands = supportedBandsData.nsa_bands; this.nsa_bands = supportedBandsData.nsa_bands;
this.sa_bands = supportedBandsData.sa_bands; this.sa_bands = supportedBandsData.sa_bands;
@@ -584,11 +591,13 @@
this this
); );
// Set isLoading to false after populating checkboxes this.isGettingBands = false;
this.isLoading = false;
// Add event listeners to checkboxes after populating them // Add event listeners to checkboxes after populating them
addCheckboxListeners(this); addCheckboxListeners(this);
// Call current settings
this.getCurrentSettings();
}) })
.catch((error) => { .catch((error) => {
console.error("Error:", error); console.error("Error:", error);
@@ -616,17 +625,17 @@
this.updatedLockedBands = newCheckedValues; this.updatedLockedBands = newCheckedValues;
}; };
// Function to get the current settings // // Function to get the current settings
const getCurrentSettingsData = () => { // const getCurrentSettingsData = () => {
getCurrentSettings().then((settings) => { // getCurrentSettings().then((settings) => {
this.sim = settings.sim; // this.sim = settings.sim;
this.apn = settings.apn; // this.apn = settings.apn;
this.cellLockStatus = settings.cellLockStatus; // this.cellLockStatus = settings.cellLockStatus;
this.prefNetwork = settings.prefNetwork; // this.prefNetwork = settings.prefNetwork;
this.nrModeControl = settings.nrModeControl; // this.nrModeControl = settings.nrModeControl;
this.bands = settings.bands; // this.bands = settings.bands;
}); // });
}; // };
// Function to add event listener to network mode dropdown // Function to add event listener to network mode dropdown
const addNetworkModeListener = () => { const addNetworkModeListener = () => {
@@ -640,7 +649,21 @@
// Execute necessary functions on initialization // Execute necessary functions on initialization
showPopulateCheckboxes(); showPopulateCheckboxes();
addNetworkModeListener(); addNetworkModeListener();
getCurrentSettingsData(); },
getCurrentSettings() {
const atcmd =
'AT+QUIMSLOT?;+CGCONTRDP=1;+QNWLOCK="common/4g";+QNWLOCK="common/5g";+QNWPREFCFG="mode_pref";+QNWPREFCFG="nr5g_disable_mode";+QCAINFO';
this.sendATcommand(atcmd).then((rawdata) => {
const settings = parseCurrentSettings(rawdata);
this.sim = settings.sim;
this.apn = settings.apn;
this.cellLockStatus = settings.cellLockStatus;
this.prefNetwork = settings.prefNetwork;
this.nrModeControl = settings.nrModeControl;
this.bands = settings.bands;
});
}, },
lockSelectedBands() { lockSelectedBands() {
// Get the updated this.currentNetworkMode = selectedMode; and this.updatedLockedBands = newCheckedValues; // Get the updated this.currentNetworkMode = selectedMode; and this.updatedLockedBands = newCheckedValues;
@@ -796,7 +819,7 @@
let atcmd = `AT+QNWLOCK="common/4g",${cellNum},${validPairs let atcmd = `AT+QNWLOCK="common/4g",${cellNum},${validPairs
.map((pair) => `${pair.earfcn},${pair.pci}`) .map((pair) => `${pair.earfcn},${pair.pci}`)
.join(",")}`; .join(",")}`;
// Mock data // Mock data
this.showModal = true; this.showModal = true;