latest

lib/common.js

@@ -2,8 +2,12 @@ const chalk = require('chalk');
 const clear = require('clear');
 const figlet = require('figlet');
 
+
 module.exports = {
-    header: () => {
+    storeIp: (value) => {
+       let miWatchIpaddress = value
+    },
+    header: (page) => {
         clear();
         console.log(
             chalk.red(
@@ -20,8 +24,19 @@ module.exports = {
                 '-------------------------------------------------------------------------------------------------------'
             )
         )
+
+        console.log(chalk.blue(page))
+        module.exports.ipCheck()
+        console.log(chalk.red('----------'))
     },
     pause: async (time) => {
         await new Promise(resolve => setTimeout(resolve, time));
+    },
+    ipCheck: async () => {
+        if (module.exports.storeIp.miWatchIpaddress === undefined) {
+            console.log(chalk.white('Connected IP: ') + chalk.red('Not Connected'))
+        } else {
+            console.log(chalk.white('Connected IP: ' + chalk.green(module.defaults.storeIp.miWatchIpaddress)))
+        }
     }
 }

package.json

@@ -13,7 +13,6 @@
   "author": "Karl Hudgell",
   "license": "ISC",
   "dependencies": {
-    "adbkit": "^2.11.1",
     "chalk": "^4.0.0",
     "clear": "^0.1.0",
     "clui": "^0.3.6",
@@ -22,7 +21,6 @@
     "inquirer": "^7.1.0",
     "lodash": "^4.17.15",
     "minimist": "^1.2.5",
-    "node-adb": "^0.1.6",
     "pkg": "^4.4.7",
     "promise-android-tools": "^2.0.4",
     "shell-exec": "^1.0.2"

pages/pages.js

@@ -1,23 +1,17 @@
 const chalk = require('chalk');
-const clear = require('clear');
-const figlet = require('figlet');
 const common = require('../lib/common');
 const inquirer = require('../lib/inquirer');
 const shellExec = require('shell-exec')
-const mainMenu = require('../app')
 
 
 module.exports = {
     connectWifi: async () => {
-        common.header()
+        common.header('Connect Wifi')
-        console.log(chalk.blue('Connect Wifi'))
-        console.log(chalk.red('----------'))
-
         const miWatchIpaddress = await inquirer.connectWifi();
-        shellExec('adb connect ' + miWatchIpaddress.connectWifi).then(async function (result) {
+        this.miWatchIpaddress = miWatchIpaddress.connectWifi
-            if (result.stdout.includes('unable to connect')){
+        shellExec('adb connect ' + miWatchIpaddress).then(async function (result) {
+            if (result.stdout.includes('unable to connect')) {
                 console.log(chalk.red('MiWatch not found'))
-                // await new Promise(resolve => setTimeout(resolve, 5000));
                 await common.pause(3000)
                 module.exports.connectWifi()
             } else {
@@ -28,11 +22,8 @@ module.exports = {
         }).catch()
     },
     mainMenu: async () => {
-        common.header()
+        common.header('Main Menu')
-        console.log(chalk.blue('Main Menu'))
-        console.log(chalk.red('----------'))
         const mainMenuSelection = await inquirer.mainMenu();
-        console.log(mainMenuSelection);
         switch (mainMenuSelection.mainMenu) {
             case 'connect to miwatch via wifi':
                 module.exports.connectWifi()