Merge remote-tracking branch 'origin/master'

android @ 21bc5a47

-Subproject commit c7964e0d3839522728cfe0214dd174c246ebcb2a
+Subproject commit 21bc5a473cf6a5740b4f19f15f7291119977ffa0

package.json

@@ -5,7 +5,6 @@
   "scripts": {
     "android": "react-native run-android",
     "start": "react-native start --port 8082",
-    "test": "jest",
     "lint": "eslint --ext .js index.js src",
     "apk": "cd android && ./gradlew app:assembleRelease && cp ./app/build/outputs/apk/release/app-release.apk ../fcounter.apk",
     "android-staging": "code-push release-react ZmFaceCounter-android android -t '1.0.0' --des '1.3.20'",
@@ -13,9 +12,6 @@
     "android-history": "code-push deployment history ZmFaceCounter-android Production",
     "android-rollback": "code-push rollback ZmFaceCounter-android Production"
   },
-  "pre-commit": [
-    "lint"
-  ],
   "dependencies": {
     "@react-native-community/async-storage": "1.11.0",
     "antd-mobile-rn": "2.3.3",