From 873d219efcf1d9e321fc51f97927cfcf37b1de74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=9B=BD=E7=91=9E?= <zhuguorui1996@live.cn> Date: Mon, 30 May 2022 16:25:20 +0800 Subject: [PATCH] =?UTF-8?q?BFC-45=20BFAI=20-=E6=8F=92=E4=BB=B6=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9=E7=82=B9=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E7=AC=AC=E4=BA=8C=E8=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + .env.development | 3 +++ .env.production | 2 ++ .env.uat | 2 ++ package.json | 6 +++++- src/views/complete.vue | 14 ++++---------- src/views/index.vue | 36 +++++++++++++++++++++--------------- vite.config.js | 1 + 8 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 .env create mode 100644 .env.development create mode 100644 .env.production create mode 100644 .env.uat diff --git a/.env b/.env new file mode 100644 index 0000000..891161f --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VITE_TRACKING_ENV=testing \ No newline at end of file diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..5729f1d --- /dev/null +++ b/.env.development @@ -0,0 +1,3 @@ +NODE_ENV = development +VITE_OWNER=developer +VITE_TRACKING_ENV=testing \ No newline at end of file diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..40e3fe3 --- /dev/null +++ b/.env.production @@ -0,0 +1,2 @@ +VITE_OWNER=production +VITE_TRACKING_ENV=prod \ No newline at end of file diff --git a/.env.uat b/.env.uat new file mode 100644 index 0000000..3ee03e6 --- /dev/null +++ b/.env.uat @@ -0,0 +1,2 @@ +VITE_OWNER=uat +VITE_TRACKING_ENV=testing \ No newline at end of file diff --git a/package.json b/package.json index cae785b..dfa2d34 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,11 @@ "version": "0.0.0", "scripts": { "dev": "vite", + "dev:uat": "vite --mode uat", + "dev:prod": "vite --mode production", "build": "vite build", + "build:uat": "vite build --mode uat", + "build:prod": "vite build --mode production", "preview": "vite preview" }, "dependencies": { @@ -26,4 +30,4 @@ "vite": "^2.9.9", "vite-plugin-style-import": "^0.10.1" } -} +} \ No newline at end of file diff --git a/src/views/complete.vue b/src/views/complete.vue index eca26d1..ad79c6b 100644 --- a/src/views/complete.vue +++ b/src/views/complete.vue @@ -3,10 +3,6 @@ <div class="main_content"> <img class="page-bg" src="../assets/images/gesture/massage-entry-fullbg.png" alt srcset /> <div class="massage-complete-modal noBaby"> - <div class="nickname"> - Hey - <!-- <span>{{nikeName}}</span> --> - </div> <div class="title"> <!-- <image src="{{images.title}}"></image> --> <img class="icon" src="../assets/images/gesture/massage-complete-title-icon.png" /> @@ -86,11 +82,9 @@ export default { this.$i18n.locale = lang; } this._isMobile = isMobile(); - let finalBabyStatus = this.$route.query.finalBabyStatus; let lying = this.$route.query.lying; - let time = this.$route.query.total; - let total = this.$route.query.total; - this.finalBabyStatus = finalBabyStatus; + let time = this.$route.query.totalDuration; + let total = this.$route.query.totalDuration; this.lying = lying; this.time = time || 0; this.total = total || 0; @@ -129,7 +123,7 @@ export default { .massage-complete-modal { box-sizing: border-box; width: 330px; - min-height: 310px; + min-height: 210px; padding: 40px 0 62.5px; background: #fff; display: flex; @@ -217,7 +211,7 @@ export default { .massage-complete-modal { box-sizing: border-box; width: 8.8rem; - min-height: 8.2667rem; + min-height: 5.6rem; padding: 1.0667rem 0 1.6667rem; background: #fff; display: flex; diff --git a/src/views/index.vue b/src/views/index.vue index 6bc200f..6fa33da 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -295,7 +295,7 @@ export default { "Your images and videos will only be used for AI coach recognition. They will not be stored.", guidance: "Tips", briefSummaryTitleFront: - "Congratulations!You have completed the session in ", + "Congratulations! You have completed the session in ", briefSummaryTitleAfter: " seconds", sitMainPointsText1: "Keep baby's head in higher position so you can see baby's face", @@ -391,16 +391,14 @@ export default { posSuccess: "Votre posture est correcte. Vous pouvez continuer" }, strings: { - suggestTitle: - "Pendant l'allaitement:", + suggestTitle: "Pendant l'allaitement:", suggestText1: "Ajustez-vous à une posture confortable et gardez bébé très près de vous à tout moment", suggestText2: "Assurez-vous que le bébé prend correctement le sein (la bouche doit couvrir entièrement le mamelon et l'aréole); gardez le menton de bébé près de votre sein, sa bouche couvrant entièrement le mamelon et l'aréole", suggestText3: "Votre main, votre taille et vos pieds doivent être soutenus lorsque vous tenez bébé", - suggestText4: - "Restez détendu jusqu'à la fin de la séance", + suggestText4: "Restez détendu jusqu'à la fin de la séance", suggestConfirmText: "OK.", discardReasonTitle: "Raisons d'abandonner?", discardReason1: "Je ne sais pas comment l'utiliser", @@ -409,7 +407,8 @@ export default { mainTipsText: "Vos images et vidéos ne seront utilisées que pour la reconnaissance des coachs IA. Elles ne seront pas stockés.", guidance: "des astuces", - briefSummaryTitleFront: "Toutes nos félicitations! Vous avez terminé la session en ", + briefSummaryTitleFront: + "Toutes nos félicitations! Vous avez terminé la session en ", briefSummaryTitleAfter: " secondes", sitMainPointsText1: "Gardez la tête de bébé en position haute pour que vous puissiez voir le visage de bébé", @@ -468,8 +467,7 @@ export default { "Manténgase a un metro de distancia de la cámara y coloque su cuerpo en la lÃnea. La sesión comienza en 5 segundos..." }, sittingMsg: { - babyneckloc: - "Asegúrese de que el cuello del bebé esté sobre su codo", + babyneckloc: "Asegúrese de que el cuello del bebé esté sobre su codo", babyhead: "No restrinja la cabeza del bebé con las manos", babybackloc: "Asegúrese de que su antebrazo esté sosteniendo la espalda del bebé", @@ -485,8 +483,7 @@ export default { "Asegúrese de que el bebé esté frente al pecho a la altura adecuada" }, sittingMsgPart: { - babyneckloc: - "Asegúrese de que el cuello del bebé esté sobre su codo", + babyneckloc: "Asegúrese de que el cuello del bebé esté sobre su codo", babyhead: "No restrinja la cabeza del bebé con las manos.", babybackloc: "Asegúrese de que su antebrazo esté sosteniendo la espalda del bebé", @@ -522,7 +519,7 @@ export default { mainTipsText: "Sus imágenes y videos solo se utilizarán para el reconocimiento del asistente de IA. No se almacenarán.", guidance: "consejos", - briefSummaryTitleFront: "¡Felicidades!Has completado la sesión en ", + briefSummaryTitleFront: "¡Felicidades! Has completado la sesión en ", briefSummaryTitleAfter: " segundos", sitMainPointsText1: "Mantenga la cabeza del bebé en una posición más alta para que pueda ver la cara del bebé", @@ -586,16 +583,25 @@ export default { this.showNoCameraDialog = false; } let { camera } = await authCamera(0); - console.log(camera); + console.log(import.meta.env); + if (camera) { + let apiKey = "DLAB-customername-12345687"; + let env = import.meta.env.VITE_TRACKING_ENV; + console.log(env); + let trackingParams = { + env: env, + apiKey: apiKey + }; + localStorage.setItem("trackingParams", JSON.stringify(trackingParams)); let openDev = this.$route.query.openDev; localStorage.setItem( - "backUrl", + "completeUrl", "https://bfai-service-apac-uat.d-lab-services.danone.com/demo/#/complete" ); - localStorage.setItem("enterUrl", document.URL); + localStorage.setItem("incompleteUrl", document.URL); let url = - "https://bfai-service-apac-uat.d-lab-services.danone.com/sdk/#/?camera=1&lying=0"; + "https://bfai-service-apac-uat.d-lab-services.danone.com/sdk/#/"; if (openDev) { url = url + "&openDev=true"; } diff --git a/vite.config.js b/vite.config.js index 847d67e..796bee8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,6 +8,7 @@ const config = require('./config') // https://vitejs.dev/config/ export default defineConfig({ + envDir: "./", plugins: [vue()], css: { postcss: { -- 2.18.1