Commit 3377c57d by zeven

云值守店刷脸设备无需黑屏

parent f2f2f145
{ {
"name": "zm-face-counter", "name": "zm-face-counter",
"version": "1.3.16", "version": "1.3.17",
"private": true, "private": true,
"scripts": { "scripts": {
"android": "react-native run-android", "android": "react-native run-android",
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"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 ../fcounter.apk", "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.16'", "android-staging": "code-push release-react ZmFaceCounter-android android -t '1.0.0' --des '1.3.17'",
"android-product": "code-push promote ZmFaceCounter-android Staging Production --des '1.3.16'", "android-product": "code-push promote ZmFaceCounter-android Staging Production --des '1.3.17'",
"android-history": "code-push deployment history ZmFaceCounter-android Production", "android-history": "code-push deployment history ZmFaceCounter-android Production",
"android-rollback": "code-push rollback ZmFaceCounter-android Production" "android-rollback": "code-push rollback ZmFaceCounter-android Production"
}, },
......
...@@ -979,6 +979,7 @@ class FacePage extends Component { ...@@ -979,6 +979,7 @@ class FacePage extends Component {
goTipsModal, goTipsModal,
type, type,
code, code,
stype,
} = this.state; } = this.state;
let flag = ''; let flag = '';
if (type === 'over' && (code === -9 || code === -10)) { if (type === 'over' && (code === -9 || code === -10)) {
...@@ -995,7 +996,7 @@ class FacePage extends Component { ...@@ -995,7 +996,7 @@ class FacePage extends Component {
styles.footer = {...styles.footer, backgroundColor: '#1b7dc7'}; styles.footer = {...styles.footer, backgroundColor: '#1b7dc7'};
styles.onCall = {...styles.onCall, backgroundColor: '#1b7dc7'}; styles.onCall = {...styles.onCall, backgroundColor: '#1b7dc7'};
} }
return sleep && !orderDetailMini ? ( return sleep && !orderDetailMini && stype !== 'guard' ? (
<Screensaver onPress={this.wakeUp} /> <Screensaver onPress={this.wakeUp} />
) : ( ) : (
<View style={styles.content}> <View style={styles.content}>
......
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