From 7405d5dd49c7169bbafc7b38337f5964095f5d11 Mon Sep 17 00:00:00 2001 From: akashtl Date: Fri, 29 May 2020 17:51:30 +0800 Subject: [PATCH] event electron-latest-version added and menu updated in SPA --- lib/desktop_updater.js | 24 +++++++++++++++++++++++- src/containers/ActionMenu/ActionMenu.js | 4 ++-- src/root.js | 12 ++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 31657976c..071ed5951 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -562,7 +562,29 @@ if (process.env.currentVersion) { */ var app_ver_split = process.env.currentVersion.split('.'); if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ - getAppVesrion(); + /* + * Listerner to receive latest version + * Send this information to native app to show + */ + document.addEventListener('electron-latest-version', function (e) { + try { + console.log('[DTU]', 'latest-version DATA', e.data); + 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; + } + getAppVesrion(); + } else { + console.log('[DTU]', 'latest-version', 'else condition'); + } + } catch (err) { + console.error('[DTU]', 'latest-version err', err); + + } + }); + setInterval(function(){ console.log('[DTU] CHECK APP VERSION AFTER 10 MINS') getAppVesrion(); diff --git a/src/containers/ActionMenu/ActionMenu.js b/src/containers/ActionMenu/ActionMenu.js index eb514591f..d8aee7ea5 100644 --- a/src/containers/ActionMenu/ActionMenu.js +++ b/src/containers/ActionMenu/ActionMenu.js @@ -197,11 +197,11 @@ class LeftMenu extends Component { - + {/* - + */} diff --git a/src/root.js b/src/root.js index 79e1f121c..01b785d31 100644 --- a/src/root.js +++ b/src/root.js @@ -5,9 +5,21 @@ import { syncHistoryWithStore } from 'react-router-redux' import routes from './routes'; import { appInitActions as actions } from './core/resource/app'; +import NynjaCommunicator from './core/SDK/nynjaCommunicator.sdk'; +import constants from './core/configs/Constants.config'; class Root extends Component { componentDidMount() { this.props.store.dispatch(actions.appInit()); + + /*@akash: start call NynjaCommunicator instance for notify trigger to desktop_update listner */ + const facade = NynjaCommunicator.getInstance(); + const data = { + version: constants.version, + buildNumber: constants.buildNumber, + } + facade.notify('electron-latest-version', data); + /*@akash: end call NynjaCommunicator instance for notify trigger desktop_update listner */ + } render() { -- GitLab