color

ad9e8103 · wangqinghua · 1d8a2caf · ad9e8103 · ad9e8103 · ad9e8103
Commit ad9e8103 authored Oct 30, 2018 by wangqinghua
23 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /plugins
 /platforms
 /resources
+/*.apk




--- a/.idea/SmartIM/debug/smartqq_2018-09-26.log
+++ b/.idea/SmartIM/debug/smartqq_2018-09-26.log
--- a/.idea/SmartIM/info/smartqq_2018-09-26.log
+++ b/.idea/SmartIM/info/smartqq_2018-09-26.log
--- a/config.xml
+++ b/config.xml
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.3.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter2" version="1.3.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
    <name>智汇19号(测)</name>
    <description>An awesome Ionic/Cordova app.</description>
    <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "ionic-demo",
-  "version": "0.0.1",
+  "version": "0.0.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -126,6 +126,11 @@
      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-4.11.0.tgz",
      "integrity": "sha512-LLvj5vtLZ1zP2vCX/Im9aweWAhQSilvL2mfo7PbavQyYbRcEOCTWTz36mkpo3GpctnM8idHJsGBo+6bnH0+JJw=="
    },
+    "@ionic-native/geolocation": {
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-4.15.0.tgz",
+      "integrity": "sha512-ZIbGrroDCEYIsjcwQXUnjjYCfkRbPQKknLFr59HmkL+KkKwTP/ejXZVQWp87M5OXwX0icz2Df670VsxAb76e6Q=="
+    },
    "@ionic-native/keyboard": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-4.6.0.tgz",
@@ -1471,45 +1476,1028 @@
      "requires": {
        "configstore": "2.1.0",
        "cordova-common": "2.2.1",
-        "cordova-lib": "8.0.0",
-        "editor": "1.0.0",
-        "insight": "0.8.4",
-        "nopt": "3.0.1",
-        "update-notifier": "0.5.0"
+        "cordova-lib": "8.0.0",
+        "editor": "1.0.0",
+        "insight": "0.8.4",
+        "nopt": "3.0.1",
+        "update-notifier": "0.5.0"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
+          "integrity": "sha1-vOXEJEajKR9HYio3CrvxWPu6y/0=",
+          "requires": {
+            "abbrev": "1.1.1"
+          }
+        }
+      }
+    },
+    "cordova-android": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.0.0.tgz",
+      "integrity": "sha1-yVvt/PvDhjsYDE0p7/7E95Nh0Z0=",
+      "requires": {
+        "android-versions": "1.2.1",
+        "cordova-common": "2.2.0",
+        "elementtree": "0.1.6",
+        "nopt": "3.0.6",
+        "properties-parser": "0.2.3",
+        "q": "1.5.1",
+        "shelljs": "0.5.3"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "android-versions": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "ansi": {
+          "version": "0.3.1",
+          "bundled": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "big-integer": {
+          "version": "1.6.26",
+          "bundled": true
+        },
+        "bplist-parser": {
+          "version": "0.1.1",
+          "bundled": true,
+          "requires": {
+            "big-integer": "1.6.26"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.8",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "cordova-common": {
+          "version": "2.2.0",
+          "bundled": true,
+          "requires": {
+            "ansi": "0.3.1",
+            "bplist-parser": "0.1.1",
+            "cordova-registry-mapper": "1.1.15",
+            "elementtree": "0.1.6",
+            "glob": "5.0.15",
+            "minimatch": "3.0.4",
+            "osenv": "0.1.4",
+            "plist": "1.2.0",
+            "q": "1.5.1",
+            "semver": "5.4.1",
+            "shelljs": "0.5.3",
+            "underscore": "1.8.3",
+            "unorm": "1.4.1"
+          }
+        },
+        "cordova-registry-mapper": {
+          "version": "1.1.15",
+          "bundled": true
+        },
+        "elementtree": {
+          "version": "0.1.6",
+          "bundled": true,
+          "requires": {
+            "sax": "0.3.5"
+          }
+        },
+        "glob": {
+          "version": "5.0.15",
+          "bundled": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "bundled": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "bundled": true,
+          "requires": {
+            "abbrev": "1.1.1"
+          }
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "plist": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "base64-js": "0.0.8",
+            "util-deprecate": "1.0.2",
+            "xmlbuilder": "4.0.0",
+            "xmldom": "0.1.27"
+          }
+        },
+        "properties-parser": {
+          "version": "0.2.3",
+          "bundled": true
+        },
+        "q": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "sax": {
+          "version": "0.3.5",
+          "bundled": true
+        },
+        "semver": {
+          "version": "5.4.1",
+          "bundled": true
+        },
+        "shelljs": {
+          "version": "0.5.3",
+          "bundled": true
+        },
+        "underscore": {
+          "version": "1.8.3",
+          "bundled": true
+        },
+        "unorm": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "xmlbuilder": {
+          "version": "4.0.0",
+          "bundled": true,
+          "requires": {
+            "lodash": "3.10.1"
+          }
+        },
+        "xmldom": {
+          "version": "0.1.27",
+          "bundled": true
+        }
+      }
+    },
+    "cordova-app-hello-world": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz",
+      "integrity": "sha1-Jw4Gtnsq6UvP7mWS7TnrQjA9GG8="
+    },
+    "cordova-browser": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
+      "integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+      "requires": {
+        "abbrev": "1.1.1",
+        "accepts": "1.3.5",
+        "ansi": "0.3.1",
+        "ansi-regex": "2.1.1",
+        "ansi-styles": "2.2.1",
+        "array-flatten": "1.1.1",
+        "balanced-match": "1.0.0",
+        "base64-js": "1.2.0",
+        "big-integer": "1.6.32",
+        "body-parser": "1.18.2",
+        "bplist-parser": "0.1.1",
+        "brace-expansion": "1.1.11",
+        "bytes": "3.0.0",
+        "chalk": "1.1.3",
+        "compressible": "2.0.14",
+        "compression": "1.7.2",
+        "concat-map": "0.0.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "cordova-common": "2.2.5",
+        "cordova-registry-mapper": "1.1.15",
+        "cordova-serve": "2.0.1",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "destroy": "1.0.4",
+        "ee-first": "1.1.1",
+        "elementtree": "0.1.6",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "escape-string-regexp": "1.0.5",
+        "etag": "1.8.1",
+        "express": "4.16.3",
+        "finalhandler": "1.1.1",
+        "forwarded": "0.1.2",
+        "fresh": "0.5.2",
+        "glob": "5.0.15",
+        "has-ansi": "2.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.19",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "ipaddr.js": "1.6.0",
+        "is-wsl": "1.1.0",
+        "media-typer": "0.3.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "mime": "1.4.1",
+        "mime-db": "1.33.0",
+        "mime-types": "2.1.18",
+        "minimatch": "3.0.4",
+        "ms": "2.0.0",
+        "negotiator": "0.6.1",
+        "nopt": "3.0.6",
+        "on-finished": "2.3.0",
+        "on-headers": "1.0.1",
+        "once": "1.4.0",
+        "opn": "5.3.0",
+        "parseurl": "1.3.2",
+        "path-is-absolute": "1.0.1",
+        "path-to-regexp": "0.1.7",
+        "plist": "2.1.0",
+        "proxy-addr": "2.0.3",
+        "q": "1.5.1",
+        "qs": "6.5.1",
+        "range-parser": "1.2.0",
+        "raw-body": "2.3.2",
+        "safe-buffer": "5.1.1",
+        "sax": "0.3.5",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "shelljs": "0.5.3",
+        "statuses": "1.4.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0",
+        "type-is": "1.6.16",
+        "underscore": "1.9.1",
+        "unorm": "1.4.1",
+        "unpipe": "1.0.0",
+        "utils-merge": "1.0.1",
+        "vary": "1.1.2",
+        "wrappy": "1.0.2",
+        "xmlbuilder": "8.2.2",
+        "xmldom": "0.1.27"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "accepts": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "mime-types": "2.1.18",
+            "negotiator": "0.6.1"
+          }
+        },
+        "ansi": {
+          "version": "0.3.1",
+          "bundled": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "bundled": true
+        },
+        "array-flatten": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "big-integer": {
+          "version": "1.6.32",
+          "bundled": true
+        },
+        "body-parser": {
+          "version": "1.18.2",
+          "bundled": true,
+          "requires": {
+            "bytes": "3.0.0",
+            "content-type": "1.0.4",
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "http-errors": "1.6.3",
+            "iconv-lite": "0.4.19",
+            "on-finished": "2.3.0",
+            "qs": "6.5.1",
+            "raw-body": "2.3.2",
+            "type-is": "1.6.16"
+          }
+        },
+        "bplist-parser": {
+          "version": "0.1.1",
+          "bundled": true,
+          "requires": {
+            "big-integer": "1.6.32"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "bytes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "compressible": {
+          "version": "2.0.14",
+          "bundled": true,
+          "requires": {
+            "mime-db": "1.34.0"
+          },
+          "dependencies": {
+            "mime-db": {
+              "version": "1.34.0",
+              "bundled": true
+            }
+          }
+        },
+        "compression": {
+          "version": "1.7.2",
+          "bundled": true,
+          "requires": {
+            "accepts": "1.3.5",
+            "bytes": "3.0.0",
+            "compressible": "2.0.14",
+            "debug": "2.6.9",
+            "on-headers": "1.0.1",
+            "safe-buffer": "5.1.1",
+            "vary": "1.1.2"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "content-disposition": {
+          "version": "0.5.2",
+          "bundled": true
+        },
+        "content-type": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "cookie": {
+          "version": "0.3.1",
+          "bundled": true
+        },
+        "cookie-signature": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "cordova-common": {
+          "version": "2.2.5",
+          "bundled": true,
+          "requires": {
+            "ansi": "0.3.1",
+            "bplist-parser": "0.1.1",
+            "cordova-registry-mapper": "1.1.15",
+            "elementtree": "0.1.6",
+            "glob": "5.0.15",
+            "minimatch": "3.0.4",
+            "plist": "2.1.0",
+            "q": "1.5.1",
+            "shelljs": "0.5.3",
+            "underscore": "1.9.1",
+            "unorm": "1.4.1"
+          }
+        },
+        "cordova-registry-mapper": {
+          "version": "1.1.15",
+          "bundled": true
+        },
+        "cordova-serve": {
+          "version": "2.0.1",
+          "bundled": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "compression": "1.7.2",
+            "express": "4.16.3",
+            "opn": "5.3.0",
+            "shelljs": "0.5.3"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "depd": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "destroy": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "ee-first": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "elementtree": {
+          "version": "0.1.6",
+          "bundled": true,
+          "requires": {
+            "sax": "0.3.5"
+          }
+        },
+        "encodeurl": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "escape-html": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "etag": {
+          "version": "1.8.1",
+          "bundled": true
+        },
+        "express": {
+          "version": "4.16.3",
+          "bundled": true,
+          "requires": {
+            "accepts": "1.3.5",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.18.2",
+            "content-disposition": "0.5.2",
+            "content-type": "1.0.4",
+            "cookie": "0.3.1",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
+            "finalhandler": "1.1.1",
+            "fresh": "0.5.2",
+            "merge-descriptors": "1.0.1",
+            "methods": "1.1.2",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "2.0.3",
+            "qs": "6.5.1",
+            "range-parser": "1.2.0",
+            "safe-buffer": "5.1.1",
+            "send": "0.16.2",
+            "serve-static": "1.13.2",
+            "setprototypeof": "1.1.0",
+            "statuses": "1.4.0",
+            "type-is": "1.6.16",
+            "utils-merge": "1.0.1",
+            "vary": "1.1.2"
+          }
+        },
+        "finalhandler": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.4.0",
+            "unpipe": "1.0.0"
+          }
+        },
+        "forwarded": {
+          "version": "0.1.2",
+          "bundled": true
+        },
+        "fresh": {
+          "version": "0.5.2",
+          "bundled": true
+        },
+        "glob": {
+          "version": "5.0.15",
+          "bundled": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-ansi": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "bundled": true,
+          "requires": {
+            "depd": "1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": "1.4.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.19",
+          "bundled": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ipaddr.js": {
+          "version": "1.6.0",
+          "bundled": true
+        },
+        "is-wsl": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "media-typer": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "merge-descriptors": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "methods": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "mime": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "mime-db": {
+          "version": "1.33.0",
+          "bundled": true
+        },
+        "mime-types": {
+          "version": "2.1.18",
+          "bundled": true,
+          "requires": {
+            "mime-db": "1.33.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "negotiator": {
+          "version": "0.6.1",
+          "bundled": true
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "bundled": true,
+          "requires": {
+            "abbrev": "1.1.1"
+          }
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "bundled": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "on-headers": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "opn": {
+          "version": "5.3.0",
+          "bundled": true,
+          "requires": {
+            "is-wsl": "1.1.0"
+          }
+        },
+        "parseurl": {
+          "version": "1.3.2",
+          "bundled": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "bundled": true
+        },
+        "plist": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "base64-js": "1.2.0",
+            "xmlbuilder": "8.2.2",
+            "xmldom": "0.1.27"
+          }
+        },
+        "proxy-addr": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "forwarded": "0.1.2",
+            "ipaddr.js": "1.6.0"
+          }
+        },
+        "q": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "qs": {
+          "version": "6.5.1",
+          "bundled": true
+        },
+        "range-parser": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "raw-body": {
+          "version": "2.3.2",
+          "bundled": true,
+          "requires": {
+            "bytes": "3.0.0",
+            "http-errors": "1.6.2",
+            "iconv-lite": "0.4.19",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "depd": {
+              "version": "1.1.1",
+              "bundled": true
+            },
+            "http-errors": {
+              "version": "1.6.2",
+              "bundled": true,
+              "requires": {
+                "depd": "1.1.1",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.0.3",
+                "statuses": "1.4.0"
+              }
+            },
+            "setprototypeof": {
+              "version": "1.0.3",
+              "bundled": true
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true
+        },
+        "sax": {
+          "version": "0.3.5",
+          "bundled": true
+        },
+        "send": {
+          "version": "0.16.2",
+          "bundled": true,
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "1.6.3",
+            "mime": "1.4.1",
+            "ms": "2.0.0",
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.4.0"
+          }
+        },
+        "serve-static": {
+          "version": "1.13.2",
+          "bundled": true,
+          "requires": {
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "parseurl": "1.3.2",
+            "send": "0.16.2"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "shelljs": {
+          "version": "0.5.3",
+          "bundled": true
+        },
+        "statuses": {
+          "version": "1.4.0",
+          "bundled": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "type-is": {
+          "version": "1.6.16",
+          "bundled": true,
+          "requires": {
+            "media-typer": "0.3.0",
+            "mime-types": "2.1.18"
+          }
+        },
+        "underscore": {
+          "version": "1.9.1",
+          "bundled": true
+        },
+        "unorm": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "unpipe": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "vary": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "xmlbuilder": {
+          "version": "8.2.2",
+          "bundled": true
+        },
+        "xmldom": {
+          "version": "0.1.27",
+          "bundled": true
+        }
+      }
+    },
+    "cordova-common": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz",
+      "integrity": "sha1-cAm8WRcpyqcoWliM/Wp7VM2DTww=",
+      "requires": {
+        "ansi": "0.3.1",
+        "bplist-parser": "0.1.1",
+        "cordova-registry-mapper": "1.1.15",
+        "elementtree": "0.1.6",
+        "glob": "5.0.15",
+        "minimatch": "3.0.4",
+        "osenv": "0.1.5",
+        "plist": "1.2.0",
+        "q": "1.5.1",
+        "semver": "5.5.0",
+        "shelljs": "0.5.3",
+        "underscore": "1.8.3",
+        "unorm": "1.4.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "cordova-create": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz",
+      "integrity": "sha1-g7CScbN40cA7x9mnhv7dYEhcPM8=",
+      "requires": {
+        "cordova-app-hello-world": "3.12.0",
+        "cordova-common": "2.2.1",
+        "cordova-fetch": "1.3.0",
+        "q": "1.0.1",
+        "shelljs": "0.3.0",
+        "valid-identifier": "0.0.1"
+      },
+      "dependencies": {
+        "q": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+          "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ="
+        },
+        "shelljs": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+          "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
+        }
+      }
+    },
+    "cordova-fetch": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz",
+      "integrity": "sha1-SYbQd5s26yOYIsKrQTpH/58Jf+o=",
+      "requires": {
+        "cordova-common": "2.2.1",
+        "dependency-ls": "1.1.1",
+        "hosted-git-info": "2.6.0",
+        "is-url": "1.2.2",
+        "q": "1.5.1",
+        "shelljs": "0.7.8"
      },
      "dependencies": {
-        "nopt": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
-          "integrity": "sha1-vOXEJEajKR9HYio3CrvxWPu6y/0=",
+        "shelljs": {
+          "version": "0.7.8",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
+          "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
          "requires": {
-            "abbrev": "1.1.1"
+            "glob": "7.1.2",
+            "interpret": "1.1.0",
+            "rechoir": "0.6.2"
          }
        }
      }
    },
-    "cordova-android": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.0.0.tgz",
-      "integrity": "sha1-yVvt/PvDhjsYDE0p7/7E95Nh0Z0=",
+    "cordova-ios": {
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz",
+      "integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==",
      "requires": {
-        "android-versions": "1.2.1",
-        "cordova-common": "2.2.0",
+        "abbrev": "1.1.1",
+        "ansi": "0.3.1",
+        "balanced-match": "1.0.0",
+        "base64-js": "1.2.0",
+        "big-integer": "1.6.32",
+        "bplist-creator": "0.0.7",
+        "bplist-parser": "0.1.1",
+        "brace-expansion": "1.1.11",
+        "concat-map": "0.0.1",
+        "cordova-common": "2.2.5",
+        "cordova-registry-mapper": "1.1.15",
        "elementtree": "0.1.6",
+        "glob": "5.0.15",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "ios-sim": "6.1.3",
+        "minimatch": "3.0.4",
        "nopt": "3.0.6",
-        "properties-parser": "0.2.3",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1",
+        "plist": "2.1.0",
        "q": "1.5.1",
-        "shelljs": "0.5.3"
+        "sax": "0.3.5",
+        "shelljs": "0.5.3",
+        "simctl": "1.1.1",
+        "simple-plist": "0.2.1",
+        "stream-buffers": "2.2.0",
+        "tail": "0.4.0",
+        "underscore": "1.9.1",
+        "unorm": "1.4.1",
+        "uuid": "3.0.1",
+        "wrappy": "1.0.2",
+        "xcode": "0.9.3",
+        "xml-escape": "1.1.0",
+        "xmlbuilder": "8.2.2",
+        "xmldom": "0.1.27"
      },
      "dependencies": {
        "abbrev": {
          "version": "1.1.1",
          "bundled": true
        },
-        "android-versions": {
-          "version": "1.2.1",
-          "bundled": true
-        },
        "ansi": {
          "version": "0.3.1",
          "bundled": true
@@ -1519,22 +2507,29 @@
          "bundled": true
        },
        "base64-js": {
-          "version": "0.0.8",
+          "version": "1.2.0",
          "bundled": true
        },
        "big-integer": {
-          "version": "1.6.26",
+          "version": "1.6.32",
          "bundled": true
        },
+        "bplist-creator": {
+          "version": "0.0.7",
+          "bundled": true,
+          "requires": {
+            "stream-buffers": "2.2.0"
+          }
+        },
        "bplist-parser": {
          "version": "0.1.1",
          "bundled": true,
          "requires": {
-            "big-integer": "1.6.26"
+            "big-integer": "1.6.32"
          }
        },
        "brace-expansion": {
-          "version": "1.1.8",
+          "version": "1.1.11",
          "bundled": true,
          "requires": {
            "balanced-match": "1.0.0",
@@ -1546,7 +2541,7 @@
          "bundled": true
        },
        "cordova-common": {
-          "version": "2.2.0",
+          "version": "2.2.5",
          "bundled": true,
          "requires": {
            "ansi": "0.3.1",
@@ -1555,12 +2550,10 @@
            "elementtree": "0.1.6",
            "glob": "5.0.15",
            "minimatch": "3.0.4",
-            "osenv": "0.1.4",
-            "plist": "1.2.0",
+            "plist": "2.1.0",
            "q": "1.5.1",
-            "semver": "5.4.1",
            "shelljs": "0.5.3",
-            "underscore": "1.8.3",
+            "underscore": "1.9.1",
            "unorm": "1.4.1"
          }
        },
@@ -1598,15 +2591,34 @@
          "version": "2.0.3",
          "bundled": true
        },
-        "lodash": {
-          "version": "3.10.1",
-          "bundled": true
+        "ios-sim": {
+          "version": "6.1.3",
+          "bundled": true,
+          "requires": {
+            "bplist-parser": "0.0.6",
+            "nopt": "1.0.9",
+            "plist": "2.1.0",
+            "simctl": "1.1.1"
+          },
+          "dependencies": {
+            "bplist-parser": {
+              "version": "0.0.6",
+              "bundled": true
+            },
+            "nopt": {
+              "version": "1.0.9",
+              "bundled": true,
+              "requires": {
+                "abbrev": "1.1.1"
+              }
+            }
+          }
        },
        "minimatch": {
          "version": "3.0.4",
          "bundled": true,
          "requires": {
-            "brace-expansion": "1.1.8"
+            "brace-expansion": "1.1.11"
          }
        },
        "nopt": {
@@ -1623,40 +2635,19 @@
            "wrappy": "1.0.2"
          }
        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
        "path-is-absolute": {
          "version": "1.0.1",
          "bundled": true
        },
        "plist": {
-          "version": "1.2.0",
+          "version": "2.1.0",
          "bundled": true,
          "requires": {
-            "base64-js": "0.0.8",
-            "util-deprecate": "1.0.2",
-            "xmlbuilder": "4.0.0",
+            "base64-js": "1.2.0",
+            "xmlbuilder": "8.2.2",
            "xmldom": "0.1.27"
          }
        },
-        "properties-parser": {
-          "version": "0.2.3",
-          "bundled": true
-        },
        "q": {
          "version": "1.5.1",
          "bundled": true
@@ -1665,132 +2656,95 @@
          "version": "0.3.5",
          "bundled": true
        },
-        "semver": {
-          "version": "5.4.1",
-          "bundled": true
-        },
        "shelljs": {
          "version": "0.5.3",
          "bundled": true
        },
+        "simctl": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "shelljs": "0.2.6",
+            "tail": "0.4.0"
+          },
+          "dependencies": {
+            "shelljs": {
+              "version": "0.2.6",
+              "bundled": true
+            }
+          }
+        },
+        "simple-plist": {
+          "version": "0.2.1",
+          "bundled": true,
+          "requires": {
+            "bplist-creator": "0.0.7",
+            "bplist-parser": "0.1.1",
+            "plist": "2.0.1"
+          },
+          "dependencies": {
+            "base64-js": {
+              "version": "1.1.2",
+              "bundled": true
+            },
+            "plist": {
+              "version": "2.0.1",
+              "bundled": true,
+              "requires": {
+                "base64-js": "1.1.2",
+                "xmlbuilder": "8.2.2",
+                "xmldom": "0.1.27"
+              }
+            }
+          }
+        },
+        "stream-buffers": {
+          "version": "2.2.0",
+          "bundled": true
+        },
+        "tail": {
+          "version": "0.4.0",
+          "bundled": true
+        },
        "underscore": {
-          "version": "1.8.3",
+          "version": "1.9.1",
          "bundled": true
        },
        "unorm": {
          "version": "1.4.1",
          "bundled": true
        },
-        "util-deprecate": {
-          "version": "1.0.2",
+        "uuid": {
+          "version": "3.0.1",
          "bundled": true
        },
        "wrappy": {
          "version": "1.0.2",
          "bundled": true
        },
-        "xmlbuilder": {
-          "version": "4.0.0",
+        "xcode": {
+          "version": "0.9.3",
          "bundled": true,
          "requires": {
-            "lodash": "3.10.1"
+            "pegjs": "0.10.0",
+            "simple-plist": "0.2.1",
+            "uuid": "3.0.1"
          }
        },
+        "xml-escape": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "xmlbuilder": {
+          "version": "8.2.2",
+          "bundled": true
+        },
        "xmldom": {
          "version": "0.1.27",
          "bundled": true
        }
      }
    },
-    "cordova-app-hello-world": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz",
-      "integrity": "sha1-Jw4Gtnsq6UvP7mWS7TnrQjA9GG8="
-    },
-    "cordova-common": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz",
-      "integrity": "sha1-cAm8WRcpyqcoWliM/Wp7VM2DTww=",
-      "requires": {
-        "ansi": "0.3.1",
-        "bplist-parser": "0.1.1",
-        "cordova-registry-mapper": "1.1.15",
-        "elementtree": "0.1.6",
-        "glob": "5.0.15",
-        "minimatch": "3.0.4",
-        "osenv": "0.1.5",
-        "plist": "1.2.0",
-        "q": "1.5.1",
-        "semver": "5.5.0",
-        "shelljs": "0.5.3",
-        "underscore": "1.8.3",
-        "unorm": "1.4.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "cordova-create": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz",
-      "integrity": "sha1-g7CScbN40cA7x9mnhv7dYEhcPM8=",
-      "requires": {
-        "cordova-app-hello-world": "3.12.0",
-        "cordova-common": "2.2.1",
-        "cordova-fetch": "1.3.0",
-        "q": "1.0.1",
-        "shelljs": "0.3.0",
-        "valid-identifier": "0.0.1"
-      },
-      "dependencies": {
-        "q": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
-          "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ="
-        },
-        "shelljs": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-          "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
-        }
-      }
-    },
-    "cordova-fetch": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz",
-      "integrity": "sha1-SYbQd5s26yOYIsKrQTpH/58Jf+o=",
-      "requires": {
-        "cordova-common": "2.2.1",
-        "dependency-ls": "1.1.1",
-        "hosted-git-info": "2.6.0",
-        "is-url": "1.2.2",
-        "q": "1.5.1",
-        "shelljs": "0.7.8"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.7.8",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-          "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-          "requires": {
-            "glob": "7.1.2",
-            "interpret": "1.1.0",
-            "rechoir": "0.6.2"
-          }
-        }
-      }
-    },
    "cordova-js": {
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz",
@@ -1890,15 +2844,35 @@
      "resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.9.tgz",
      "integrity": "sha1-nbBgeGMzenEEiTAuX1CpBPFEm9s="
    },
+    "cordova-plugin-badge": {
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.7.tgz",
+      "integrity": "sha512-s+s4yusKdeJ4sMPhQs4zR3lR2UuROzSy14GFAp00pTHPiBfCtxeINSUYAZYnpuO3RGx6PPlVCwSJpVG0IdM58g=="
+    },
    "cordova-plugin-device": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.1.tgz",
      "integrity": "sha1-m54jE+aCEZ/4QC9oCWo4vMUBNZM="
    },
-    "cordova-plugin-ionic-keyboard": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.0.5.tgz",
-      "integrity": "sha512-ygwK+U7Vs7OJJYsDrWAxhegHfvuRRpMC3Y8RhQSVLfv4ELrXtkCUjD+UfsDQ3aObpvxGLTvcVrOw5p04dPXy3w=="
+    "cordova-plugin-file": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.1.tgz",
+      "integrity": "sha1-SWBrjBWlaI1HKPkuSnMloGHeB/U="
+    },
+    "cordova-plugin-file-opener2": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-2.0.19.tgz",
+      "integrity": "sha1-yjrhIlOVt3qx/lsgrMv+zGiOJJM="
+    },
+    "cordova-plugin-file-transfer": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1.tgz",
+      "integrity": "sha1-p12L4uvDu5sjxbG70ZkhTsJnWGs="
+    },
+    "cordova-plugin-geolocation": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.1.tgz",
+      "integrity": "sha1-RwP6ZJ0kBdJamnMsmev4aHVKLAQ="
    },
    "cordova-plugin-ionic-webview": {
      "version": "1.1.16",
@@ -1910,6 +2884,11 @@
      "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz",
      "integrity": "sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0="
    },
+    "cordova-plugin-statusbar": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz",
+      "integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY="
+    },
    "cordova-plugin-whitelist": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
@@ -3964,6 +4943,14 @@
      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
      "dev": true
    },
+    "ion2-calendar": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ion2-calendar/-/ion2-calendar-2.2.0.tgz",
+      "integrity": "sha512-SYNOWVGDNzwwFOs59VBt4MObwPKTB2wJnkLiMiqiXVVJzfKD2Onu/s82+vUQhqzVPTIYAbJ14Hscj4n0qpQrhA==",
+      "requires": {
+        "moment": "2.22.2"
+      }
+    },
    "ionic-angular": {
      "version": "3.9.2",
      "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.9.2.tgz",
@@ -3979,6 +4966,11 @@
      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz",
      "integrity": "sha1-QLja9P16MRUL0AIWD2ZJbiKpjDw="
    },
+    "ios": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/ios/-/ios-0.0.1.tgz",
+      "integrity": "sha1-TG93TYsMLpu1PDQRps3wCsUd2S0="
+    },
    "ipaddr.js": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
@@ -4860,6 +5852,11 @@
        }
      }
    },
+    "moment": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+    },
    "ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

--- a/package.json
+++ b/package.json
 {
  "name": "ionic-demo",
-  "version": "0.0.1",
+  "version": "0.0.5",
  "author": "Ionic Framework",
  "homepage": "http://ionicframework.com/",
  "private": true,
@@ -27,21 +27,32 @@
    "@ionic-native/file": "^4.11.0",
    "@ionic-native/file-opener": "^4.11.0",
    "@ionic-native/file-transfer": "^4.11.0",
+    "@ionic-native/geolocation": "^4.15.0",
    "@ionic-native/keyboard": "^4.6.0",
    "@ionic-native/splash-screen": "4.4.0",
    "@ionic-native/status-bar": "4.4.0",
    "@ionic/storage": "2.1.3",
    "cordova": "^8.0.0",
    "cordova-android": "7.0.0",
+    "cordova-browser": "5.0.4",
+    "cordova-ios": "4.5.5",
    "cordova-plugin-app-version": "^0.1.9",
+    "cordova-plugin-badge": "^0.8.7",
    "cordova-plugin-device": "^2.0.1",
-    "cordova-plugin-ionic-keyboard": "^2.0.5",
+    "cordova-plugin-file": "^6.0.1",
+    "cordova-plugin-file-opener2": "^2.0.19",
+    "cordova-plugin-file-transfer": "^1.7.1",
+    "cordova-plugin-geolocation": "^4.0.1",
    "cordova-plugin-ionic-webview": "^1.1.16",
    "cordova-plugin-splashscreen": "^5.0.2",
+    "cordova-plugin-statusbar": "^2.4.2",
    "cordova-plugin-whitelist": "^1.3.3",
+    "ion2-calendar": "^2.2.0",
    "ionic-angular": "3.9.2",
    "ionic-plugin-keyboard": "^2.2.1",
    "ionicons": "3.0.0",
+    "ios": "0.0.1",
+    "moment": "^2.22.2",
    "rxjs": "5.5.2",
    "sw-toolbox": "3.6.0",
    "zone.js": "0.8.18"
@@ -57,10 +68,22 @@
      "cordova-plugin-device": {},
      "cordova-plugin-splashscreen": {},
      "cordova-plugin-ionic-webview": {},
-      "cordova-plugin-ionic-keyboard": {},
+      "cordova-plugin-app-version": {},
+      "cordova-plugin-badge": {},
+      "cordova-plugin-file": {},
+      "cordova-plugin-file-transfer": {},
+      "cordova-plugin-geolocation": {
+        "GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
+      },
      "ionic-plugin-keyboard": {},
-      "cordova-plugin-app-version": {}
+      "cordova-plugin-file-opener2": {},
+      "cordova-plugin-ionic-keyboard": {},
+      "cordova-plugin-statusbar": {}
    },
-    "platforms": []
+    "platforms": [
+      "ios",
+      "browser",
+      "android"
+    ]
  }
-}
+}
\ No newline at end of file
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -23,34 +23,92 @@
    "is_top_level": true,
    "variables": {}
  },
-  "cordova-plugin-ionic-keyboard": {
+  "cordova-plugin-device": {
    "source": {
      "type": "registry",
-      "id": "cordova-plugin-ionic-keyboard@^2.0.5"
+      "id": "cordova-plugin-device@^2.0.1"
    },
    "is_top_level": true,
    "variables": {}
  },
-  "cordova-plugin-device": {
+  "cordova-plugin-app-version": {
    "source": {
      "type": "registry",
-      "id": "cordova-plugin-device@^2.0.1"
+      "id": "cordova-plugin-app-version"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-plugin-badge": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-badge"
    },
    "is_top_level": true,
    "variables": {}
  },
+  "cordova-plugin-file": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-file@6.0.1"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-plugin-file-transfer": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-file-transfer"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-plugin-geolocation": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-geolocation@^4.0.1"
+    },
+    "is_top_level": true,
+    "variables": {
+      "GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
+    }
+  },
  "ionic-plugin-keyboard": {
    "source": {
      "type": "registry",
-      "id": "ionic-plugin-keyboard@^2.2.1"
+      "id": "ionic-plugin-keyboard"
    },
    "is_top_level": true,
    "variables": {}
  },
-  "cordova-plugin-app-version": {
+  "cordova-plugin-file-opener2": {
    "source": {
      "type": "registry",
-      "id": "cordova-plugin-app-version"
+      "id": "cordova-plugin-file-opener2@^2.0.19"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-plugin-ionic-keyboard": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-ionic-keyboard@^2.0.5"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-hot-code-push-plugin": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-hot-code-push-plugin@^1.5.3"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-plugin-statusbar": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-statusbar@2.4.2"
    },
    "is_top_level": true,
    "variables": {}

--- a/src/pages/activity-track/joinDetail/joinDetail.html
+++ b/src/pages/activity-track/joinDetail/joinDetail.html
@@ -38,7 +38,13 @@
                <ion-item *ngFor="let item of allList">
                    <div class="group">
                        <div class="inner-group">
-                            <img src="./assets/imgs/head.png" class="person-photo">
+                            <ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+                                <img src="{{picture+item?.picUrl}}" class="contact-img">
+                            </ng-container>
+                            <ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+                                <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+                                <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+                            </ng-container>
                            <div class="item-box">
                                <p class="person-name">{{item?.name}}
                                    <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null"
@@ -84,7 +90,13 @@
                <ion-item *ngFor="let item of notSignList">
                <div class="group">
                    <div class="inner-group">
-                        <img src="./assets/imgs/head.png" class="person-photo">
+                        <ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+                            <img src="{{picture+item.picUrl}}" class="contact-img">
+                        </ng-container>
+                        <ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+                            <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+                            <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+                        </ng-container>
                        <div class="item-box">
                            <p class="person-name">{{item?.name}}
                                <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null"
@@ -107,25 +119,27 @@
                </ion-item>
            </ng-container>
            <ng-container *ngIf="type == 3">
-                <ion-item *ngFor="let item of signList">
+                <ion-item *ngFor="let item of signList" style="position: relative">
                <div class="group">
                    <div class="inner-group">
-                        <img src="./assets/imgs/head.png" class="person-photo">
+                        <ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+                            <img src="{{picture+item.picUrl}}" class="contact-img">
+                        </ng-container>
+                        <ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+                            <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+                            <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+                        </ng-container>
                        <div class="item-box">
                            <p class="person-name">{{item?.name}}
                                <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null"
                                          name="male"></ion-icon>
                                <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'"
                                          name="female"></ion-icon>
+                                <span (click)="cancelSignUp(item)" ion-button round class="cancelButton btn color3 blue-btn">取消报名</span>
                            </p>
                            <span class="person-batch">批次：{{item?.batchNames}}</span>
                        </div>
                    </div>
-                    <button disabled ion-button round class="btn color2" *ngIf="item?.orderstate	== 1">已报名</button>
-                    <button disabled ion-button round class="btn color1" *ngIf="item?.orderstate	== 2">待确认</button>
-                    <button disabled ion-button round class="btn color5" *ngIf="item?.orderstate	== 3">未出行</button>
-                    <button disabled ion-button round class="btn color4" *ngIf="item?.orderstate	== 4">已出行</button>
-                    <button disabled ion-button round class="btn color3" *ngIf="item?.orderstate  == 0">未报名</button>
                </div>
                </ion-item>
            </ng-container>
@@ -133,7 +147,13 @@
                <ion-item *ngFor="let item of noJoinList">
                <div class="group">
                    <div class="inner-group">
-                        <img src="./assets/imgs/head.png" class="person-photo">
+                        <ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+                            <img src="{{picture+item.picUrl}}" class="contact-img">
+                        </ng-container>
+                        <ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+                            <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+                            <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+                        </ng-container>
                        <div class="item-box">
                            <p class="person-name">{{item?.name}}
                                <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null"

--- a/src/pages/activity-track/joinDetail/joinDetail.scss
+++ b/src/pages/activity-track/joinDetail/joinDetail.scss
@@ -139,12 +139,12 @@ page-joinDetail {

    .item-box{
        display: inline-block;
+        margin-left: 20px;
    }

    .person-name{
        font-size: 18px;
        color: black;
-
    }

    .person-sex-male{
@@ -191,5 +191,15 @@ page-joinDetail {
            color: #fff;
            border: 2px solid #34b4fc;
    }
+    .contact-img{
+        width: 4rem;
+        height: 4rem;
+        border-radius: 2px;
+    }

+    .cancelButton{
+        position: absolute;
+        right: 10px;
+        top: 10px;
+    }
 }
--- a/src/pages/activity-track/joinDetail/joinDetail.ts
+++ b/src/pages/activity-track/joinDetail/joinDetail.ts
@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController} f

 import {Http, Response,} from '@angular/http';

-import {AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/appHttpService';
 import {ActivityStatisticService} from '../../../service/activityStatisticService';
 import {ReplaceApplyPage} from "../replace-apply/replace-apply";
 import {message} from "../../../app/main";
@@ -39,6 +39,7 @@ export class JoinDetailPage {
    //未报名
    notSign: number;
    notSignList = [];
+    picture: string = AppGlobal.picture;

    constructor(public navCtrl: NavController,
                public navParams: NavParams,
@@ -180,6 +181,11 @@ export class JoinDetailPage {
            );
    }

+    //取消报名
+    cancelSignUp(item){
+
+    }
+
    search() {
        this.navCtrl.push('ActivitySearchPage', {id: this.acitivityid});
    }

--- a/src/pages/dutyALl/duty-apply/duty-apply.html
+++ b/src/pages/dutyALl/duty-apply/duty-apply.html
@@ -16,7 +16,8 @@
    </ion-item>
    <ion-item class="margin-top-15">
      <ion-label>换班原因</ion-label>
-      <ion-textarea placeholder="请输入换班原因" class="duty-textarea" [(ngModel)]="reason"></ion-textarea>
+      <ion-textarea placeholder="请在此处输入换班原因" class="duty-textarea" [(ngModel)]="reason"></ion-textarea>
+      <ion-label class="textarea-tips">100/200</ion-label>
    </ion-item>
  </ion-list>
  <button class="submit-btn submit" (click)="submit()">申请</button>

--- a/src/pages/dutyALl/duty-apply/duty-apply.scss
+++ b/src/pages/dutyALl/duty-apply/duty-apply.scss
@@ -15,4 +15,11 @@ page-duty-apply {
  .list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
    border-bottom: none;
  }
+  .textarea-tips{
+    position: absolute;
+    bottom: -5px;
+    right: 10px;
+    color: #808080;
+    font-size: 12px;
+  }
 }
--- a/src/pages/dutyALl/duty-apply/duty-apply.ts
+++ b/src/pages/dutyALl/duty-apply/duty-apply.ts
@@ -11,7 +11,7 @@ export class DutyApplyPage {

    id;
    date;
-    reason;
+    reason = '';
  constructor(public navCtrl: NavController, public navParams: NavParams,
              public appService: AppService) {
  }
@@ -26,10 +26,13 @@ export class DutyApplyPage {
        scheduleId:this.id,
        reason:this.reason
    };
-    this.appService.ObserverHttpPost('/wisdomgroup/changeApply/app/apply',data)
-        .subscribe((res )=>{
-           this.navCtrl.pop();
-        })
+    this.appService.alert('确定提交该申请?',res=>{
+        this.appService.ObserverHttpPost('/wisdomgroup/changeApply/app/apply',data)
+            .subscribe((res )=>{
+                this.appService.popToastView('提交该申请成功!','middle',1000);
+                this.navCtrl.pop();
+            })
+    });
  }

 }
--- a/src/pages/dutyALl/duty-detail/duty-detail.ts
+++ b/src/pages/dutyALl/duty-detail/duty-detail.ts
@@ -29,13 +29,14 @@ export class DutyDetailPage {
    }

    submitOrder() {
-        console.log(this.dutyDetail);
        const id = this.dutyDetail.id;
-        this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/deleteApply', {'id': id})
-            .subscribe((res) => {
-                this.navCtrl.pop();
-                // this.dutyDetail = res;
-            })
+        this.appService.alert('确定撤销该申请?', (res) => {
+            this.appService.ObserverHttpGetOption('/wisdomgroup/changeApply/app/deleteApply', {'id': id})
+                .subscribe((res) => {
+                    this.appService.popToastView('撤销申请成功!','middle',1500);
+                    this.navCtrl.pop();
+                })
+        });
    }

 }
--- a/src/pages/dutyALl/duty-sign-up/duty-sign-up.html
+++ b/src/pages/dutyALl/duty-sign-up/duty-sign-up.html
@@ -7,16 +7,9 @@

 </ion-header>

-
-<!--<ion-content class="text-center">-->
-  <!--<p *ngIf="signState == 0">未签到</p>-->
-  <!--<p *ngIf="signState == 1">已签到</p>-->
-
-<!--</ion-content>-->
-
 <ion-content class="bgc-e7e8ed">
    <!--没有值班-->
-    <ng-container *ngIf="signState == 0">
+    <ng-container *ngIf="!signInfo">
        <div text-center class="bgc-fff" style="padding: 5rem;">
            <img style="width: 20%;" src="./assets/imgs/no-info.png">
            <p text-center class="color-666">
@@ -43,10 +36,12 @@
            </div>
        </div>
    </ng-container>
-    <ng-container *ngIf="signState == 1">
+    <ng-container *ngIf="signInfo">
        <div class="padding-10-20 bgc-fff detail-title">
            <div class="title-left">
                <span>{{nowDay | date:'yyyy-MM-dd'}}</span>
+                <span class="dayType" *ngIf="signInfo.type == 0">白班</span>
+                <span class="dayType" *ngIf="signInfo.type == 1">夜班</span>
            </div>
            <div class="title-right">
                <ng-container *ngIf="signStatus == 'success'">
@@ -61,25 +56,25 @@
        </div>
        <div class="detail-item">
            <p class="detail-title1"><span class="color-666">签到：</span>规定签到时间10：00之前</p>
-            <ng-container>
-                <p>尚未签到</p>
+            <ng-container *ngIf="!signInfo?.signInTime">
+                <p class="not-sign">尚未签到</p>
+            </ng-container>
+            <ng-container *ngIf="signInfo?.signInTime">
+                <p class="sign-in">签到时间：{{signInfo?.signInTime | date:'yyyy-MM-dd HH:mm:ss'}}</p>
+                <p class="sign-in">签到地点：上海市委组织部</p>
            </ng-container>
-            <!--<ng-container>-->
-                <!--<p>签到时间</p>-->
-                <!--<p>签到地点：上海市委组织部</p>-->
-            <!--</ng-container>-->
        </div>
-        <button class="submit-btn submit" (click)="signIn()">定位签到</button>
+        <button class="submit-btn submit" (click)="calcuDistance()">定位签到</button>

        <div class="detail-item">
            <p class="detail-title2"> <span class="color-666">签退：</span>规定签到时间10：00之前</p>
-            <ng-container>
-                <p>尚未签退</p>
+            <ng-container *ngIf="!signInfo?.signOutTime">
+                <p class="not-sign">尚未签退</p>
+            </ng-container>
+            <ng-container *ngIf="signInfo?.signOutTime">
+                <p class="sign-in">签退时间：{{signInfo?.signOutTime | date:'yyyy-MM-dd HH:mm:ss'}}</p>
+                <p class="sign-in">签退地点：上海市委组织部</p>
            </ng-container>
-            <!--<ng-container>-->
-                <!--<p>签退时间</p>-->
-                <!--<p>签退地点：上海市委组织部</p>-->
-            <!--</ng-container>-->
        </div>
        <button class="submit-btn submit" (click)="signBack()">定位签退</button>
    </ng-container>

--- a/src/pages/dutyALl/duty-sign-up/duty-sign-up.scss
+++ b/src/pages/dutyALl/duty-sign-up/duty-sign-up.scss
@@ -9,12 +9,18 @@ page-duty-sign-up {
    margin: 10px;
    border-radius: 4px;
    padding-bottom: 10px;
-    p:not(:first-child){
+    .not-sign{
      margin:20px 10px;
      height: 5rem;
      text-align: center;
      line-height: 5rem;
    }
+    .sign-in{
+      margin:20px 10px;
+      height: 2rem;
+      line-height: 2rem;
+      padding-left: 20px;
+    }
    .detail-title1{
      background-color: #f4f4f4;
      color: #999999;
@@ -62,4 +68,11 @@ page-duty-sign-up {
      margin: 5px 0;
    }
  }
+  .dayType{
+    background-color: #34b4fc;
+    color: #fff;
+    border-radius: 2px;
+    font-size: 12px;
+    padding: 2px 5px;
+  }
 }
--- a/src/pages/dutyALl/duty-sign-up/duty-sign-up.ts
+++ b/src/pages/dutyALl/duty-sign-up/duty-sign-up.ts
@@ -14,7 +14,9 @@ export class DutySignUpPage {
    id;
    signState;
    signStatus = 'fail';
-
+    signInfo = {
+        id:''
+    };
    //市委组织部坐标
    mainLat = 31.205033;   //纬度
    // mainLat = 31.231871;   //纬度test    31.231871, 121.393319
@@ -27,23 +29,23 @@ export class DutySignUpPage {
    }

    ionViewDidLoad() {
-
        this.nowDay = moment().format('l');
        console.log(this.nowDay);
-
-        this.appService.ObserverHttpGet('/wisdomgroup/schedule/mySchedleOfToday', null)
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/myScheduleOfToday', null)
            .subscribe((res) => {
-                this.signState = res.json();
+               if(res){
+                   this.signInfo = res.json();
+               }
            })
    }

    //签到
    signIn() {
        const data = {
-            id: this.id,  //值班记录id,
+            id: this.signInfo.id,  //值班记录id,
            address: '上海市委组织部'   //签到地址
        };
-        this.appService.ObserverHttpGet('/wisdomgroup/schedule/signIn', data)
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/signIn', data)
            .subscribe((res) => {
                console.log(res);
            })
@@ -53,7 +55,7 @@ export class DutySignUpPage {
    signBack() {
        this.calcuDistance();
        const data = {
-            id:this.id,  //值班记录id,
+            id:this.signInfo.id,  //值班记录id,
            address:'上海市委组织部'   //签到地址
        };
        this.appService.ObserverHttpGet('/wisdomgroup/schedule/signOut',data)

--- a/src/pages/report/report-search/report-search.html
+++ b/src/pages/report/report-search/report-search.html
@@ -13,7 +13,13 @@
    <ion-item *ngFor="let item of items">
      <div class="group">
        <div class="inner-group">
-          <img src="./assets/imgs/head.png" class="person-photo">
+          <ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+            <img src="{{picture+item.picUrl}}" class="contact-img">
+          </ng-container>
+          <ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+            <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+            <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+          </ng-container>
          <div class="item-box">
            <p class="person-name">{{item.name}}
              <ion-icon class="person-sex-male" *ngIf="item.gender === 1" name="male"></ion-icon>

--- a/src/pages/report/report-search/report-search.scss
+++ b/src/pages/report/report-search/report-search.scss
@@ -135,6 +135,7 @@ page-report-search {

  .item-box {
    display: inline-block;
+    margin-left: 10px;
  }

  .person-name {
@@ -172,4 +173,9 @@ page-report-search {
  .text-input::-webkit-input-placeholder{
    color:#fff;
  }
+  .contact-img{
+    width: 4rem;
+    height: 4rem;
+    border-radius: 2px;
+  }
 }
--- a/src/pages/report/report-search/report-search.ts
+++ b/src/pages/report/report-search/report-search.ts
 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../service/appHttpService";
 import {Storage} from "@ionic/storage";

 @IonicPage()
@@ -14,6 +14,7 @@ export class ReportSearchPage {
    searchValue = '';
    items;
    id;
+    picture: string = AppGlobal.picture;

    constructor(public navCtrl: NavController, public navParams: NavParams,
                public appService: AppService, public storage: Storage) {

--- a/src/pages/report/reportDetail/reportDetail.html
+++ b/src/pages/report/reportDetail/reportDetail.html
@@ -33,7 +33,13 @@
 		<ion-item *ngFor="let item of items">
 			<div class="group">
 				<div class="inner-group">
-					<img src="./assets/imgs/head.png" class="person-photo">
+					<ng-container *ngIf="item?.picUrl && item?.picUrl != ''">
+						<img src="{{picture+item.picUrl}}" class="contact-img">
+					</ng-container>
+					<ng-container *ngIf="!item?.picUrl || item?.picUrl == ''">
+						<img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+						<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
+					</ng-container>
 					<div class="item-box">
 						<p class="person-name">{{item.name}}
 							<ion-icon class="person-sex-male" *ngIf="item.gender === 1" name="male"></ion-icon>

--- a/src/pages/report/reportDetail/reportDetail.scss
+++ b/src/pages/report/reportDetail/reportDetail.scss
 page-reportDetail {
+  .contact-img{
+    width: 4rem;
+    height: 4rem;
+    border-radius: 2px;
+  }
  .searchToolBar {
    display: flex;
    flex-direction: row;
@@ -112,6 +117,7 @@ page-reportDetail {

  .item-box {
    display: inline-block;
+    margin-left: 10px;
  }

  .person-name {

--- a/src/pages/report/reportDetail/reportDetail.ts
+++ b/src/pages/report/reportDetail/reportDetail.ts
@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController} f

 import {Http, Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
-import {AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/appHttpService';
 import {ReportSearchPage} from "../report-search/report-search";

 @IonicPage()
@@ -20,6 +20,7 @@ export class ReportDetailPage {
    title: string;
    type: number;
    id;
+    picture: string = AppGlobal.picture;
    premanager; //报备信息

    constructor(public navCtrl: NavController,