From 94e1ac6262a5b7bd511d8e9c704600521d0c3824 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 8 Jul 2022 11:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E5=A0=86?= =?UTF-8?q?=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 54 +++++++++++++------------- package.json | 10 +++-- src/navigation/components/PactModal.js | 3 +- src/utils/errorHandle.js | 2 +- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index b447729..79f7dcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lx-music-mobile", - "version": "0.14.1-beta.2", + "version": "0.14.1-beta.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "lx-music-mobile", - "version": "0.14.1-beta.2", + "version": "0.14.1-beta.3", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -17,20 +17,20 @@ "buffer": "^6.0.3", "console-browserify": "^1.2.0", "events": "^3.3.0", - "i18next": "^21.8.12", + "i18next": "^21.8.13", "js-htmlencode": "^0.3.0", "lrc-file-parser": "^2.0.0", "pako": "^2.0.4", "process": "^0.11.10", "prop-types": "^15.8.1", "react": "17.0.2", - "react-i18next": "^11.17.4", + "react-i18next": "^11.18.0", "react-native": "0.68.2", "react-native-background-timer": "^2.4.1", "react-native-crypto": "^2.2.0", "react-native-exception-handler": "^2.10.10", "react-native-fs": "^2.20.0", - "react-native-navigation": "^7.28.0", + "react-native-navigation": "^7.28.1", "react-native-pager-view": "^5.4.25", "react-native-randombytes": "^3.6.1", "react-native-splash-screen": "^3.3.0", @@ -7386,7 +7386,8 @@ "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true }, "node_modules/html-parse-stringify": { "version": "3.0.1", @@ -7509,9 +7510,9 @@ } }, "node_modules/i18next": { - "version": "21.8.12", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.12.tgz", - "integrity": "sha512-BCJsQq9DtmLb88ksPZgpjbXhPAhFmDTNrY2Jh8VvgwnTHvL8xbuSribdTsi2WPRk1kbhjtbkoqyCVr12w2XTCA==", + "version": "21.8.13", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.13.tgz", + "integrity": "sha512-DpzwrJq7Y8tjUHxx6ByOkUIjrGYdQI5Mfv4XEI7q2RWdknQ7TaO9bKi8hS/LqYD6pBV5YGxJLReyLkOCxIpouA==", "funding": [ { "type": "individual", @@ -11503,12 +11504,11 @@ } }, "node_modules/react-i18next": { - "version": "11.17.4", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.17.4.tgz", - "integrity": "sha512-LswEIl8KNDTP4Wk3c22XDstbR++Vc4BZyNwvGFGaYbYDjdDLkHDLwrgd7DN28f8jufFHaYhQvCG5YWLxFhRt/g==", + "version": "11.18.0", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.0.tgz", + "integrity": "sha512-coJujU20xJ5Wa5rHjTyB5LFKZb1yfXo2A+40RRSyAF0FlZRHyy+3C1Mr92x1JPfS7W7v2TWNn8mRhpDFGJwXVg==", "dependencies": { "@babel/runtime": "^7.14.5", - "html-escaper": "^2.0.2", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { @@ -11669,9 +11669,9 @@ "integrity": "sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg==" }, "node_modules/react-native-navigation": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-7.28.0.tgz", - "integrity": "sha512-rHLuJLzheUY5JYP0UuuNNz5f3yh3kmmwj+sZIQyDh+WksJqtREgmTqxuSs2X8SnE5QoEcm5WsNuw3P9HuyWbJw==", + "version": "7.28.1", + "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-7.28.1.tgz", + "integrity": "sha512-wSV+Zk/um0CwqTvXMizU9qfUNhyuCsqSCNnFcGrC2gsLZYAsq1em8HQIqwfdijf0wLl22g6URD/piG/SjQXBkA==", "dependencies": { "hoist-non-react-statics": "3.x.x", "lodash": "4.17.x", @@ -19716,7 +19716,8 @@ "html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true }, "html-parse-stringify": { "version": "3.0.1", @@ -19807,9 +19808,9 @@ "dev": true }, "i18next": { - "version": "21.8.12", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.12.tgz", - "integrity": "sha512-BCJsQq9DtmLb88ksPZgpjbXhPAhFmDTNrY2Jh8VvgwnTHvL8xbuSribdTsi2WPRk1kbhjtbkoqyCVr12w2XTCA==", + "version": "21.8.13", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.13.tgz", + "integrity": "sha512-DpzwrJq7Y8tjUHxx6ByOkUIjrGYdQI5Mfv4XEI7q2RWdknQ7TaO9bKi8hS/LqYD6pBV5YGxJLReyLkOCxIpouA==", "requires": { "@babel/runtime": "^7.17.2" } @@ -22866,12 +22867,11 @@ } }, "react-i18next": { - "version": "11.17.4", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.17.4.tgz", - "integrity": "sha512-LswEIl8KNDTP4Wk3c22XDstbR++Vc4BZyNwvGFGaYbYDjdDLkHDLwrgd7DN28f8jufFHaYhQvCG5YWLxFhRt/g==", + "version": "11.18.0", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.0.tgz", + "integrity": "sha512-coJujU20xJ5Wa5rHjTyB5LFKZb1yfXo2A+40RRSyAF0FlZRHyy+3C1Mr92x1JPfS7W7v2TWNn8mRhpDFGJwXVg==", "requires": { "@babel/runtime": "^7.14.5", - "html-escaper": "^2.0.2", "html-parse-stringify": "^3.0.1" } }, @@ -22985,9 +22985,9 @@ "integrity": "sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg==" }, "react-native-navigation": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-7.28.0.tgz", - "integrity": "sha512-rHLuJLzheUY5JYP0UuuNNz5f3yh3kmmwj+sZIQyDh+WksJqtREgmTqxuSs2X8SnE5QoEcm5WsNuw3P9HuyWbJw==", + "version": "7.28.1", + "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-7.28.1.tgz", + "integrity": "sha512-wSV+Zk/um0CwqTvXMizU9qfUNhyuCsqSCNnFcGrC2gsLZYAsq1em8HQIqwfdijf0wLl22g6URD/piG/SjQXBkA==", "requires": { "hoist-non-react-statics": "3.x.x", "lodash": "4.17.x", diff --git a/package.json b/package.json index 083f824..4c73de6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-mobile", - "version": "0.14.1-beta.2", + "version": "0.14.1-beta.3", "versionCode": 43, "scripts": { "ar": "react-native run-android", @@ -11,6 +11,8 @@ "lint": "eslint .", "rd": "react-devtools", "menu": "adb shell input keyevent 82", + "bundle-android": "react-native bundle --platform android --dev true --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res", + "pack:android:debug": "./gradlew assembleDebug", "pack": "npm run pack:android", "pack:android": "./gradlew assembleRelease", "clear": "react-native clean-project", @@ -47,20 +49,20 @@ "buffer": "^6.0.3", "console-browserify": "^1.2.0", "events": "^3.3.0", - "i18next": "^21.8.12", + "i18next": "^21.8.13", "js-htmlencode": "^0.3.0", "lrc-file-parser": "^2.0.0", "pako": "^2.0.4", "process": "^0.11.10", "prop-types": "^15.8.1", "react": "17.0.2", - "react-i18next": "^11.17.4", + "react-i18next": "^11.18.0", "react-native": "0.68.2", "react-native-background-timer": "^2.4.1", "react-native-crypto": "^2.2.0", "react-native-exception-handler": "^2.10.10", "react-native-fs": "^2.20.0", - "react-native-navigation": "^7.28.0", + "react-native-navigation": "^7.28.1", "react-native-pager-view": "^5.4.25", "react-native-randombytes": "^3.6.1", "react-native-splash-screen": "^3.3.0", diff --git a/src/navigation/components/PactModal.js b/src/navigation/components/PactModal.js index 5d6f652..beeab4a 100644 --- a/src/navigation/components/PactModal.js +++ b/src/navigation/components/PactModal.js @@ -20,6 +20,7 @@ const VersionModal = ({ componentId }) => { } const handleConfirm = () => { + let _isAgreePact = isAgreePact if (!isAgreePact) setAgreePact(true) Navigation.dismissOverlay(componentId) setTimeout(() => { @@ -29,7 +30,7 @@ const VersionModal = ({ componentId }) => { [{ text: Buffer.from('e5a5bde79a8420284f4b29', 'hex').toString(), onPress: () => { - checkVersion() + if (!_isAgreePact) checkVersion() }, }], ) diff --git a/src/utils/errorHandle.js b/src/utils/errorHandle.js index 420a997..7576a2a 100644 --- a/src/utils/errorHandle.js +++ b/src/utils/errorHandle.js @@ -21,7 +21,7 @@ ${isFatal ? 'Fatal:' : ''} ${e.name} ${e.message} }], ) } - log.error(e.message) + log.error(e.stack) } if (process.env.NODE_ENV !== 'development') {