Commit cadf0c0e by 修福龙

Merge remote-tracking branch 'origin/master'

parents ba38a958 b8f3938d
android @ ec483800
Subproject commit 24e88792277dde5f5560c1ae701ffbdcb9e47969 Subproject commit ec483800d0628a4bb42449e145a88caee190d2b6
{ {
"name": "zm-face-counter", "name": "zm-face-counter",
"version": "0.0.1", "version": "1.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"android": "react-native run-android", "android": "react-native run-android",
"start": "react-native start", "start": "react-native start",
"test": "jest", "test": "jest",
"lint": "eslint --ext .js index.js src", "lint": "eslint --ext .js index.js src",
"apk": "cd android && ./gradlew app:assembleRelease && cp ./app/build/outputs/apk/release/app-release.apk ../counter.apk" "apk": "cd android && ./gradlew app:assembleRelease && cp ./app/build/outputs/apk/release/app-release.apk ../fcounter.apk"
}, },
"pre-commit": [ "pre-commit": [
"lint" "lint"
......
...@@ -9,6 +9,7 @@ export async function counterInterval(dispatch, expiresIn, reload) { ...@@ -9,6 +9,7 @@ export async function counterInterval(dispatch, expiresIn, reload) {
window.socket || window.socket ||
new SocketIO(axios.defaults.baseURL, { new SocketIO(axios.defaults.baseURL, {
query: `token=${window.auth.token}`, query: `token=${window.auth.token}`,
single: true,
}); });
window.socket.connect(); window.socket.connect();
// window.socket = // window.socket =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment