From 463291f929a65bfb995394db1b8a0c1aed47d5e3 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 14:24:37 +0800 Subject: [PATCH] changed buildNumber to version for web update --- lib/desktop_updater.js | 32 ++++++++++++++++++++--- lib/releaseNotes/releaseNotesDesktop.json | 6 ++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 071ed5951..d925f8cea 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -572,8 +572,9 @@ if (process.env.currentVersion) { var version_data = e.data; if (version_data) { console.log('[DTU]', 'latest-version', 'if condition', process.env.currentBuild); - if(process.env.currentBuild===0) { - process.env.currentBuild = version_data.buildNumber; + if(process.env.currentBuild==='0') { + process.env.currentBuild = version_data.version; + // process.env.currentBuild = version_data.buildNumber; } getAppVesrion(); } else { @@ -628,11 +629,34 @@ if (process.env.currentVersion) { // }; console.log('[DTU] current build',process.env.currentBuild); - console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > parseInt(process.env.currentBuild))); + // console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > parseInt(process.env.currentBuild))); if(process.env.currentBuild){ - if(appversionObj.build > parseInt(process.env.currentBuild)) { + var api_build_split = appversionObj.build.split('.'); + var app_env_curr_build_split = process.env.currentBuild.split('.'); + // if(appversionObj.build > parseInt(process.env.currentBuild)) { + // isBuildUpdate = true; + // } + console.log('[DTU] check build major ',api_build_split[0],'>',app_env_curr_build_split[0]); + console.log('[DTU] check build minor ',api_build_split[1],'>',app_env_curr_build_split[1]); + console.log('[DTU] check build patch ',api_build_split[2],'>',app_env_curr_build_split[2]); + // check major + if(parseInt(api_build_split[0])>parseInt(app_env_curr_build_split[0])){ isBuildUpdate = true; + }else{ + // check minor + if(parseInt(api_build_split[1])>parseInt(app_env_curr_build_split[1])){ + isBuildUpdate = true; + }else{ + // check patch + if(parseInt(api_build_split[2])>parseInt(app_env_curr_build_split[2])){ + isBuildUpdate = true; + }else{ + + isBuildUpdate = false; + } + } } + } console.log('[DTU] current version',process.env.currentVersion); if(process.env.currentVersion){ diff --git a/lib/releaseNotes/releaseNotesDesktop.json b/lib/releaseNotes/releaseNotesDesktop.json index f90059a8f..5f5c74a9a 100644 --- a/lib/releaseNotes/releaseNotesDesktop.json +++ b/lib/releaseNotes/releaseNotesDesktop.json @@ -1,11 +1,11 @@ { "0.4.1": { - "1589451878": [ + "0.34.0": [ "Stability improvements" ] }, "0.4.0": { - "1589451878": [ + "0.34.0": [ "Electron Framework updated to latest version 8.0.1", "Fixed select all keyboard shortcut (command + A) issue in Mac OS", "Handled mic and camera permission issue on Mac OS", @@ -19,7 +19,7 @@ ] }, "0.3.8": { - "1589451878": [ + "content": [ "Updated login page design.", "Added download guideline in app update process.", "Added release notes in update popup.", -- GitLab