[feat/lock_api]: 잠금화면 미션 실패 API 작업 #143
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/repository/DefaultUsageGoalsRepository.kt
kangyuri1114
changed the title
kez-lab
commented
Jan 19, 2024
Comment on lines
+19
to
21
| android:allowBackup="false" | ||
| android:dataExtractionRules="@xml/data_extraction_rules" | ||
| android:fullBackupContent="@xml/backup_rules" |
There was a problem hiding this comment.
앱 삭제시에도 Prefernce가 남아있어 allowBackup 을 false로 변경 했습니다.
Comment on lines
+6
to
+8
| companion object{ | ||
| const val UN_LOCK_PACKAGE_NAME = "UN_LOCK_PACKAGE_NAME" | ||
| } |
There was a problem hiding this comment.
IntentKey는 이런식 말고 더 좋은 방법으로 빼보면 좋을 것 같네요
Comment on lines
45
to
62
| private fun checkUsage(event: AccessibilityEvent): Job { | ||
| val packageName = event.packageName?.toString() ?: return Job() | ||
|
|
||
| val (startTime, endTime) = getCurrentDayStartEndEpochMillis() | ||
| val usageStats = getUsageStatFromPackageUseCase( | ||
| startTime = startTime, | ||
| endTime = endTime, | ||
| packageName = packageName | ||
| ) | ||
|
|
||
| ProcessLifecycleOwner.get().lifecycleScope.launch { | ||
| return ProcessLifecycleOwner.get().lifecycleScope.launch { | ||
| // 이벤트 처리 로직 | ||
| val usageGoals = getUsageGoalsUseCase().first() | ||
| val myGoal = usageGoals.find { it.packageName == packageName } ?: return@launch | ||
| if (usageStats > myGoal.goalTime) { | ||
| val intent = | ||
| LockActivity.getIntent(this@LockAccessibilityService, packageName).apply { | ||
| addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| } | ||
| startActivity(intent) | ||
| navigationProvider.toLock(packageName).apply { | ||
| addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| }.let(::startActivity) |
There was a problem hiding this comment.
코루틴 Scope이 지속적으로 재 생성되는 것을 방지하기 위해 변수 할당으로 변경했습니다.
Comment on lines
52
to
62
| LockScreen( | ||
| packageName = packageName, | ||
| onClickUnLock = { | ||
| navigationProvider.toMain().apply { | ||
| putExtra(NavigationProvider.UN_LOCK_PACKAGE_NAME, packageName) | ||
| addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) | ||
| }.let(::startActivity) | ||
| finish() | ||
| } | ||
| ) |
There was a problem hiding this comment.
이거 실행하면 Main도 같이 뜨는 이슈가 있어요 수정 계획
Comment on lines
23
to
28
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
Comment on lines
150
to
155
| Text( | ||
| stringResource(R.string.do_unlock), | ||
| modifier = Modifier.clickable(onClick = onClickUnLock), | ||
| text = stringResource(R.string.do_unlock), | ||
| style = HmhTypography.titleSmall, | ||
| color = WhiteText | ||
| ) |
There was a problem hiding this comment.
앱 진입 말고 백그라운드 Kill 및 Finish 로직이 빠져있네요
There was a problem hiding this comment.
시스템 컴포넌트의 경우 Finish가 안되네요 Data단에서 System App 은 불러오지 못하도록 처리하겠습니다.
kez-lab
added a commit
that referenced
this pull request
Nov 20, 2024
[feat/lock_api]: 잠금화면 미션 실패 API 작업
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
개요
작업 사항