From 69df1e27f4562adecdc5acf68831631af717ecf2 Mon Sep 17 00:00:00 2001 From: "karl.hudgell" Date: Sat, 25 Apr 2020 14:54:31 +0100 Subject: [PATCH] added quit --- lib/inquirer.js | 1 + pages/pages.js | 58 ++++++++++++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/lib/inquirer.js b/lib/inquirer.js index 2f543c6..6aad2e8 100644 --- a/lib/inquirer.js +++ b/lib/inquirer.js @@ -13,6 +13,7 @@ module.exports = { "Remove Xiaomi Apps", "Restore Xiaomi Apps", "Install Compatible Apps", + "Quit" ], filter: function (val) { return val.toLowerCase(); diff --git a/pages/pages.js b/pages/pages.js index ea2a618..d923a74 100644 --- a/pages/pages.js +++ b/pages/pages.js @@ -3,6 +3,7 @@ const common = require('../lib/common'); const inquirer = require('../lib/inquirer'); const shellExec = require('shell-exec') const files = require('../lib/files') +const fs = require('fs') module.exports = { removeApps: async () => { @@ -30,29 +31,40 @@ module.exports = { module.exports.mainMenu() }, connectWifi: async () => { + const miwatchData = JSON.parse(fs.readFileSync('./data/MiWatch.json', 'utf8')); common.header('Connect Wifi') - const value = await inquirer.connectWifi(); - const miWatchIpaddress = value.connectWifi - shellExec('adb connect ' + miWatchIpaddress).then(async function (result) { - if (result.stdout.includes('unable to connect')) { - console.log(chalk.red('MiWatch not found')) - await common.pause(2000) - console.log(chalk.white('Try Again')) - await common.pause(1000) - module.exports.connectWifi() - } else if (result.stdout.includes('cannot connect')) { - console.log(chalk.red('MiWatch not found')) - await common.pause(2000) - console.log(chalk.white('Try Again')) - await common.pause(1000) - module.exports.connectWifi() - } else { - console.log(chalk.green('MiWatch Connected')) - files.writeIpAddress(miWatchIpaddress) - await common.pause(3000) - module.exports.mainMenu() - } - }).catch() + if (miwatchData.ipAddress !== "") { + console.log('pooooooo') + } else { + const value = await inquirer.connectWifi(); + const miWatchIpaddress = value.connectWifi + shellExec('adb connect ' + miWatchIpaddress).then(async function (result) { + if (result.stdout.includes('unable to connect')) { + console.log(chalk.red('MiWatch not found')) + await common.pause(2000) + console.log(chalk.white('Try Again')) + await common.pause(1000) + module.exports.connectWifi() + } else if (result.stdout.includes('cannot connect')) { + console.log(chalk.red('MiWatch not found')) + await common.pause(2000) + console.log(chalk.white('Try Again')) + await common.pause(1000) + module.exports.connectWifi() + } else if (result.stdout.includes('cannot resolve host')) { + console.log(chalk.red('MiWatch not found')) + await common.pause(2000) + console.log(chalk.white('Try Again')) + await common.pause(1000) + module.exports.connectWifi() + } else { + console.log(chalk.green('MiWatch Connected')) + files.writeIpAddress(miWatchIpaddress) + await common.pause(3000) + module.exports.mainMenu() + } + }).catch() + } }, mainMenu: async () => { common.header('Main Menu') @@ -67,6 +79,8 @@ module.exports = { case 'restore xiaomi apps': module.exports.restoreApps() break; + case 'quit': + break; default: // code block }