From 088be961ea1e91fe7e1edcf693e4cea10ae37d0d Mon Sep 17 00:00:00 2001 From: Tony Dokyoon Kim Date: Sat, 12 Oct 2024 05:29:12 +0900 Subject: [PATCH] do some chores [#85] --- .../local/datastore/AppPreferencesSerializer.kt | 2 +- presenter/src/main/res/values/strings.xml | 9 +++++++++ util/src/main/java/com/foke/together/util/AppPolicy.kt | 7 +++---- util/src/main/java/com/foke/together/util/TimeUtil.kt | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt b/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt index 36b95f8..3ab0ee0 100644 --- a/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt +++ b/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt @@ -15,7 +15,7 @@ class AppPreferencesSerializer @Inject constructor(): Serializer // You need to check default value of each types from link below // https://protobuf.dev/programming-guides/proto3/ // e.g. isDebugMode = true - externalCameraIp = AppPolicy.DEFAULT_EXTERNAL_CAMERA_IP + externalCameraIp = AppPolicy.EXTERNAL_CAMERA_DEFAULT_SERVER_URL build() } diff --git a/presenter/src/main/res/values/strings.xml b/presenter/src/main/res/values/strings.xml index f389370..aed64be 100644 --- a/presenter/src/main/res/values/strings.xml +++ b/presenter/src/main/res/values/strings.xml @@ -2,4 +2,13 @@ presenter 시작하기 +   선택 〉 + + 🕑 + Timer + 👋 + Gesture + 준비중입니다. + + 촬영 시 움직이지 마세요 \ No newline at end of file diff --git a/util/src/main/java/com/foke/together/util/AppPolicy.kt b/util/src/main/java/com/foke/together/util/AppPolicy.kt index 2b7b502..86eb38f 100644 --- a/util/src/main/java/com/foke/together/util/AppPolicy.kt +++ b/util/src/main/java/com/foke/together/util/AppPolicy.kt @@ -3,8 +3,6 @@ package com.foke.together.util object AppPolicy { const val isDebugMode = true - const val DEFAULT_EXTERNAL_CAMERA_IP = "192.168.0.71:5000" - // network const val WEB_SERVER_URL = "https://4cuts.store/" const val WEB_CONNECT_TIMEOUT = 10L @@ -12,18 +10,19 @@ object AppPolicy { const val WEB_WRITE_TIMEOUT = 10L const val WEB_FILE_MAX_CONTENT_LENGTH = 20971520 - const val EXTERNAL_CAMERA_DEFAULT_SERVER_URL = "http://192.168.0.71:5000" + const val EXTERNAL_CAMERA_DEFAULT_SERVER_URL = "http://0.0.0.0" const val EXTERNAL_CAMERA_CONNECT_TIMEOUT = 10L const val EXTERNAL_CAMERA_READ_TIMEOUT = 10L const val EXTERNAL_CAMERA_WRITE_TIMEOUT = 10L + // capture settings const val CAPTURE_INTERVAL = 10000L const val CAPTURE_COUNT = 4 const val COUNTDOWN_INTERVAL = 10L + // file settings const val CAPTURED_FOUR_CUT_IMAGE_NAME = "capture" const val SINGLE_ROW_FINAL_IMAGE_NAME = "final_single_row" const val TWO_ROW_FINAL_IMAGE_NAME = "final_two_row" - const val DEFAULT_QR_CODE_IMAGE_NAME = "qrcode" } \ No newline at end of file diff --git a/util/src/main/java/com/foke/together/util/TimeUtil.kt b/util/src/main/java/com/foke/together/util/TimeUtil.kt index 4323ad9..3d579bc 100644 --- a/util/src/main/java/com/foke/together/util/TimeUtil.kt +++ b/util/src/main/java/com/foke/together/util/TimeUtil.kt @@ -6,6 +6,7 @@ import java.util.Date object TimeUtil { fun getCurrentDisplayTime(): String { val dateFormat = "yyyy.MM.dd" + // TODO: LocalDate로 변경 val date = Date(System.currentTimeMillis()) val simpleDateFormat = SimpleDateFormat(dateFormat) val simpleDate: String = simpleDateFormat.format(date)