karl.hudgell 4 роки тому
батько
коміт
69df1e27f4
2 змінених файлів з 37 додано та 22 видалено
  1. 1 0
      lib/inquirer.js
  2. 36 22
      pages/pages.js

+ 1 - 0
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();

+ 36 - 22
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
         }