35 Commits
Author SHA1 Message Date
sanjeok77 ad4cdef4cb v0.3.2: new BootReceiver.kt 2026-08-24 22:34:34 +00:00
sanjeok77 ea79599c08 v0.3.2: AndroidManifest.xml 2026-08-24 22:34:33 +00:00
sanjeok77 e82725887b v0.3.2: MainViewModel.kt 2026-08-24 22:34:31 +00:00
sanjeok77 bd4d6a35ff v0.3.2: DealListScreen.kt 2026-08-24 22:34:29 +00:00
sanjeok77 e332738eff v0.3.2: HotDealDao.kt 2026-08-24 22:34:27 +00:00
sanjeok77 aae7836e89 v0.3.2: PpomppuScraper.kt 2026-08-24 22:34:26 +00:00
sanjeok77 945f5146ed v0.3.2: HotDealPollingWorker.kt 2026-08-24 22:34:24 +00:00
sanjeok77 bf4037d933 v0.3.2: WorkerScheduler.kt 2026-08-24 22:34:22 +00:00
sanjeok77 47de6bad98 v0.3.2: HotDealApplication.kt 2026-08-24 22:34:20 +00:00
sanjeok77 cd866600e6 v0.3.2: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-24 22:32:25 +00:00
sanjeok77 2b51518d0e v0.3.2: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-24 22:32:24 +00:00
sanjeok77 2e5f6d1ba5 v0.3.2: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-24 22:32:22 +00:00
sanjeok77 204faf0186 v0.3.2: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-24 22:32:20 +00:00
sanjeok77 0cf08466b6 v0.3.2: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-24 22:32:18 +00:00
sanjeok77 19008da9c6 v0.3.1: MainViewModel.kt 2026-08-21 00:56:11 +00:00
sanjeok77 ffaefcdddd v0.3.1: DealListScreen.kt 2026-08-21 00:56:10 +00:00
sanjeok77 8ec2e61f66 v0.3.1: HotDealPollingWorker.kt 2026-08-21 00:56:08 +00:00
sanjeok77 c0574d7777 v0.3.1: HotDealDao.kt 2026-08-21 00:56:06 +00:00
sanjeok77 d7a8045038 v0.3.1: PpomppuScraper.kt 2026-08-21 00:56:04 +00:00
sanjeok77 8c55eba1b9 v0.3.1: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:55:41 +00:00
sanjeok77 b97ade7996 v0.3.1: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:55:40 +00:00
sanjeok77 833d760695 v0.3.1: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:55:38 +00:00
sanjeok77 d5677ce4c9 v0.3.1: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:55:36 +00:00
sanjeok77 60501e86da v0.3.1: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:55:35 +00:00
sanjeok77 6f69c39ff8 fix: synchronous reorder for keywords and sites (v0.3.0) 2026-08-21 00:27:17 +00:00
sanjeok77 fb1e8b71d3 v0.3.0: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:26:49 +00:00
sanjeok77 59037c8329 v0.3.0: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:26:47 +00:00
sanjeok77 e68d7f158f v0.3.0: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:26:46 +00:00
sanjeok77 57f41f1216 v0.3.0: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:26:44 +00:00
sanjeok77 18e458d340 v0.3.0: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-21 00:26:42 +00:00
sanjeok77 e06e5b744a v0.2.9: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-20 23:59:48 +00:00
sanjeok77 17efbe80db v0.2.9: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-20 23:59:46 +00:00
sanjeok77 6c55b9eeec v0.2.9: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-20 23:59:44 +00:00
sanjeok77 5d610eab02 v0.2.9: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-20 23:59:43 +00:00
sanjeok77 9fd97ae337 v0.2.9: True Touch Drag & Drop Reordering & Fix OTA Auto-Install Bug 2026-08-20 23:59:41 +00:00
14 changed files with 559 additions and 651 deletions

No files matched your search

+2 -2
View File
@@ -24,8 +24,8 @@ android {
applicationId = "com.hotdeal.alarm" applicationId = "com.hotdeal.alarm"
minSdk = 31 minSdk = 31
targetSdk = 35 targetSdk = 35
versionCode = 28 versionCode = 32
versionName = "0.2.8" versionName = "0.3.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
+10 -3
View File
@@ -65,9 +65,16 @@
android:exported="false" android:exported="false"
android:foregroundServiceType="dataSync" /> android:foregroundServiceType="dataSync" />
<!-- Boot Receiver --> <!-- Boot Receiver: 부팅/앱 업데이트 후 백그라운드 폴링 자동 재등록 -->
<receiver
<!-- Widget --> android:name=".receiver.BootReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
</intent-filter>
</receiver>
<receiver <receiver
android:name=".widget.HotDealWidget" android:name=".widget.HotDealWidget"
android:exported="true"> android:exported="true">
@@ -1,9 +1,17 @@
package com.hotdeal.alarm package com.hotdeal.alarm
import android.app.Application import android.app.Application
import android.util.Log
import androidx.hilt.work.HiltWorkerFactory import androidx.hilt.work.HiltWorkerFactory
import androidx.work.Configuration import androidx.work.Configuration
import com.hotdeal.alarm.data.local.preferences.AppSettings
import com.hotdeal.alarm.worker.WorkerScheduler
import dagger.hilt.android.HiltAndroidApp import dagger.hilt.android.HiltAndroidApp
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
@HiltAndroidApp @HiltAndroidApp
@@ -12,13 +20,41 @@ class HotDealApplication : Application(), Configuration.Provider {
@Inject @Inject
lateinit var workerFactory: HiltWorkerFactory lateinit var workerFactory: HiltWorkerFactory
@Inject
lateinit var workerScheduler: WorkerScheduler
@Inject
lateinit var appSettings: AppSettings
private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
override val workManagerConfiguration: Configuration override val workManagerConfiguration: Configuration
get() = Configuration.Builder() get() = Configuration.Builder()
.setWorkerFactory(workerFactory) .setWorkerFactory(workerFactory)
.setMinimumLoggingLevel(Log.DEBUG)
.build() .build()
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
// Application initialization // 앱 시작 시 백그라운드 폴링 즉시 등록/갱신
ensurePollingScheduled()
}
/**
* 앱이 시작될 때마다 백그라운드 폴링이 등록되어 있는지 확인하고,
* 없으면 즉시 등록합니다. UPDATE 정책으로 항상 최신 Worker가 동작합니다.
*/
private fun ensurePollingScheduled() {
applicationScope.launch {
try {
val interval = appSettings.pollingInterval.first()
Log.d("HotDealApp", "백그라운드 폴링 등록/갱신: ${interval}분 간격")
workerScheduler.schedulePeriodicPolling(interval.toLong())
} catch (e: Exception) {
Log.e("HotDealApp", "폴링 스케줄 등록 실패: ${e.message}", e)
// 기본값으로 폴백
workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
}
}
} }
} }
@@ -121,4 +121,10 @@ interface HotDealDao {
*/ */
@Query("UPDATE hot_deals SET isFavorite = :isFavorite WHERE id = :id") @Query("UPDATE hot_deals SET isFavorite = :isFavorite WHERE id = :id")
suspend fun setFavorite(id: String, isFavorite: Boolean) suspend fun setFavorite(id: String, isFavorite: Boolean)
/**
* 인기글 상태 업데이트 (기존 데이터도 HOT 마킹 가능하도록)
*/
@Query("UPDATE hot_deals SET isPopular = 1 WHERE id IN (:ids)")
suspend fun markAsPopular(ids: List<String>)
} }
@@ -13,6 +13,8 @@ import kotlin.random.Random
/** /**
* 뽐뿌 스크래퍼 * 뽐뿌 스크래퍼
* - hotlist_flag=999 페이지에서 인기글 ID를 수집하여 HOT 뱃지 표시
* - 기존 hotpop_bg_color CSS 클래스도 폴백으로 감지
*/ */
class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) { class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
@@ -25,18 +27,18 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
override suspend fun scrape(board: String): Result<List<HotDeal>> = withContext(Dispatchers.IO) { override suspend fun scrape(board: String): Result<List<HotDeal>> = withContext(Dispatchers.IO) {
try { try {
// 1단계: 인기글(hotlist) 페이지에서 인기 게시물 ID 목록 수집
val hotPostIds = fetchHotPostIds(board)
Log.d("Ppomppu", "인기글 ID ${hotPostIds.size}개 수집됨: $hotPostIds")
// 2단계: 일반 게시판 페이지 스크래핑
val url = getBoardUrl(board) val url = getBoardUrl(board)
Log.d("Ppomppu", "스크래핑 시작: $url") Log.d("Ppomppu", "스크래핑 시작: $url")
// 요청 간격 랜덤화 (2~4초) - 차단 방지
val delayTime = Random.nextLong(2000, 4000) val delayTime = Random.nextLong(2000, 4000)
Log.d("Ppomppu", "요청 대기: ${delayTime}ms")
delay(delayTime) delay(delayTime)
// Jsoup으로 직접 연결 (User-Agent 회전)
val userAgent = getRandomUserAgent() val userAgent = getRandomUserAgent()
Log.d("Ppomppu", "User-Agent: $userAgent")
val doc: Document = Jsoup.connect(url) val doc: Document = Jsoup.connect(url)
.userAgent(userAgent) .userAgent(userAgent)
.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8") .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
@@ -47,50 +49,37 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
.followRedirects(true) .followRedirects(true)
.get() .get()
Log.d("Ppomppu", "문서 파싱 성공, 길이: ${doc.html().length}")
val deals = mutableListOf<HotDeal>() val deals = mutableListOf<HotDeal>()
// 셀렉터로 요소 찾기 - 인기 게시물 감지를 위해 tr 요소 선택
val rowElements: Elements = doc.select("tr.baseList") val rowElements: Elements = doc.select("tr.baseList")
Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개") Log.d("Ppomppu", "찾은 행 요소: ${rowElements.size}개")
// 최대 20개까지만 처리
var count = 0 var count = 0
rowElements.forEach { row -> rowElements.forEach { row ->
if (count >= 20) return@forEach if (count >= 20) return@forEach
try { try {
// 인기 게시물 여부 확인 (hotpop_bg_color 클래스 존재 여부) val titleElement = row.selectFirst("a.baseList-title") ?: return@forEach
val isPopular = row.hasClass("hotpop_bg_color")
// 제목 링크 찾기
val titleElement = row.selectFirst("a.baseList-title")
if (titleElement == null) return@forEach
val title = titleElement.text().trim() val title = titleElement.text().trim()
if (title.isEmpty()) return@forEach if (title.isEmpty()) return@forEach
val href = titleElement.attr("href") val href = titleElement.attr("href")
// 공지사항 제외
if (href.contains("regulation") || href.contains("notice")) return@forEach if (href.contains("regulation") || href.contains("notice")) return@forEach
val dealUrl = resolveUrl(baseUrl, href)
// postId 추출
val postId = extractPostId(href) val postId = extractPostId(href)
if (postId.isEmpty()) { if (postId.isEmpty()) {
Log.w("Ppomppu", "postId 추출 실패: href=$href") Log.w("Ppomppu", "postId 추출 실패: href=$href")
return@forEach return@forEach
} }
// 인기글 판단: hotlist 페이지에 포함되어 있거나 CSS 클래스로 감지
val isPopular = postId in hotPostIds || row.hasClass("hotpop_bg_color")
val deal = HotDeal( val deal = HotDeal(
id = HotDeal.generateId(siteName, postId), id = HotDeal.generateId(siteName, postId),
siteName = siteName, siteName = siteName,
boardName = board, boardName = board,
title = title, title = title,
url = dealUrl, url = resolveUrl(baseUrl, href),
createdAt = System.currentTimeMillis(), createdAt = System.currentTimeMillis(),
isPopular = isPopular isPopular = isPopular
) )
@@ -103,7 +92,7 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
} }
} }
Log.d("Ppomppu", "파싱 완료: ${deals.size}개") Log.d("Ppomppu", "파싱 완료: ${deals.size}개 (인기: ${deals.count { it.isPopular }}개)")
Result.success(deals) Result.success(deals)
} catch (e: Exception) { } catch (e: Exception) {
Log.e("Ppomppu", "스크래핑 실패: ${e.message}", e) Log.e("Ppomppu", "스크래핑 실패: ${e.message}", e)
@@ -111,6 +100,40 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
} }
} }
/**
* hotlist_flag=999 페이지에서 인기 게시물의 postId 목록을 수집
*/
private suspend fun fetchHotPostIds(board: String): Set<String> {
return try {
val hotUrl = "${baseUrl}zboard.php?id=$board&hotlist_flag=999"
Log.d("Ppomppu", "인기글 페이지 조회: $hotUrl")
delay(Random.nextLong(1000, 2000))
val doc = Jsoup.connect(hotUrl)
.userAgent(getRandomUserAgent())
.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
.header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
.header("Referer", "https://www.ppomppu.co.kr/")
.timeout(15000)
.followRedirects(true)
.get()
val ids = mutableSetOf<String>()
doc.select("tr.baseList a.baseList-title").forEach { link ->
val href = link.attr("href")
val postId = extractPostId(href)
if (postId.isNotEmpty()) {
ids.add(postId)
}
}
ids
} catch (e: Exception) {
Log.w("Ppomppu", "인기글 목록 조회 실패 (폴백으로 계속): ${e.message}")
emptySet()
}
}
private fun extractPostId(href: String): String { private fun extractPostId(href: String): String {
val afterNo = href.substringAfter("no=", "") val afterNo = href.substringAfter("no=", "")
if (afterNo.isEmpty()) return "" if (afterNo.isEmpty()) return ""
@@ -0,0 +1,117 @@
package com.hotdeal.alarm.presentation.components
import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.zIndex
/**
* Key 기반 드래그 앤 드롭 Reorder 시스템
*
* - 각 아이템에 item-level long-press 제스처를 적용하여 드래그 시작
* - 드래그 중 다른 아이템의 중심점과 겹치면 swap 실행
* - swap 시 delta 보정으로 시각적 점프 방지
* - 비드래그 아이템은 animateItemPlacement()로 부드러운 슬라이드
*/
@Composable
fun rememberReorderState(
listState: LazyListState,
onSwap: (fromListIndex: Int, toListIndex: Int) -> Boolean
): ReorderState {
return remember(listState) {
ReorderState(listState, onSwap)
}
}
@Stable
class ReorderState(
val listState: LazyListState,
private val onSwap: (Int, Int) -> Boolean
) {
/** 현재 드래그 중인 아이템의 key (null이면 드래그 없음) */
var draggedKey by mutableStateOf<Any?>(null)
private set
/** 누적 드래그 Y축 오프셋 */
var dragDelta by mutableFloatStateOf(0f)
private set
fun startDrag(key: Any) {
draggedKey = key
dragDelta = 0f
}
fun updateDrag(delta: Offset) {
if (draggedKey == null) return
dragDelta += delta.y
checkOverlap()
}
fun endDrag() {
draggedKey = null
dragDelta = 0f
}
private fun checkOverlap() {
val dragged = listState.layoutInfo.visibleItemsInfo
.firstOrNull { it.key == draggedKey } ?: return
val draggedMid = dragged.offset + dragged.size / 2f + dragDelta
val target = listState.layoutInfo.visibleItemsInfo
.firstOrNull { item ->
item.key != draggedKey &&
draggedMid >= item.offset.toFloat() &&
draggedMid < (item.offset + item.size).toFloat()
} ?: return
if (dragged.index == target.index) return
val swapped = onSwap(dragged.index, target.index)
if (swapped) {
// swap 후 아이템이 새 위치로 이동하므로, 시각적 점프를 막기 위해 delta 보정
dragDelta += if (dragged.index < target.index) {
-target.size.toFloat()
} else {
target.size.toFloat()
}
}
}
}
/**
* 개별 아이템에 부착하는 드래그 핸들 + 시각 효과 Modifier
* - 길게 누르면 드래그 시작
* - 드래그 중 아이템이 떠오르며 그림자 및 스케일업
*/
fun Modifier.reorderableItem(
state: ReorderState,
key: Any
): Modifier {
val isDragged = state.draggedKey == key
return this
.zIndex(if (isDragged) 10f else 0f)
.graphicsLayer {
if (isDragged) {
translationY = state.dragDelta
scaleX = 1.03f
scaleY = 1.03f
shadowElevation = 16f
}
}
.pointerInput(key) {
detectDragGesturesAfterLongPress(
onDragStart = { state.startDrag(key) },
onDrag = { change, dragAmount ->
change.consume()
state.updateDrag(dragAmount)
},
onDragEnd = { state.endDrag() },
onDragCancel = { state.endDrag() }
)
}
}
@@ -407,20 +407,17 @@ fun DealListScreen(
} }
// Pull to Refresh 인디케이터 // Pull to Refresh 인디케이터
val progress = pullToRefreshState.progress val topPadding = paddingValues.calculateTopPadding()
val showIndicator = pullToRefreshState.isRefreshing || progress > 0
if (showIndicator) {
PullToRefreshContainer( PullToRefreshContainer(
state = pullToRefreshState, state = pullToRefreshState,
modifier = Modifier modifier = Modifier
.align(Alignment.TopCenter) .align(Alignment.TopCenter)
.padding(top = 50.dp) .padding(top = topPadding)
.zIndex(999f), .zIndex(999f),
containerColor = MaterialTheme.colorScheme.surfaceVariant, containerColor = MaterialTheme.colorScheme.surfaceVariant,
contentColor = MaterialTheme.colorScheme.primary contentColor = MaterialTheme.colorScheme.primary
) )
}
LaunchedEffect(pullToRefreshState.isRefreshing) { LaunchedEffect(pullToRefreshState.isRefreshing) {
if (pullToRefreshState.isRefreshing) { if (pullToRefreshState.isRefreshing) {
@@ -109,11 +109,13 @@ class MainViewModel @Inject constructor(
} }
fun reorderSites(fromIndex: Int, toIndex: Int) { fun reorderSites(fromIndex: Int, toIndex: Int) {
viewModelScope.launch { // siteOrder는 appSettings.siteOrder에서 stateIn으로 가져오므로
// appSettings를 즉시 저장하고 Flow가 업데이트되도록 함
val current = siteOrder.value.toMutableList() val current = siteOrder.value.toMutableList()
if (fromIndex in current.indices && toIndex in current.indices) { if (fromIndex in current.indices && toIndex in current.indices) {
val item = current.removeAt(fromIndex) val item = current.removeAt(fromIndex)
current.add(toIndex, item) current.add(toIndex, item)
viewModelScope.launch {
appSettings.setSiteOrder(current) appSettings.setSiteOrder(current)
} }
} }
@@ -128,7 +130,6 @@ class MainViewModel @Inject constructor(
isEnabled = true isEnabled = true
) )
) )
// 키워드 순서 맨 앞에 추가
val currentOrder = appSettings.keywordOrder.first().toMutableList() val currentOrder = appSettings.keywordOrder.first().toMutableList()
currentOrder.add(0, newId) currentOrder.add(0, newId)
appSettings.setKeywordOrder(currentOrder) appSettings.setKeywordOrder(currentOrder)
@@ -151,12 +152,16 @@ class MainViewModel @Inject constructor(
} }
fun reorderKeywords(fromIndex: Int, toIndex: Int) { fun reorderKeywords(fromIndex: Int, toIndex: Int) {
val state = uiState.value as? MainUiState.Success ?: return // uiState를 동기적으로 즉시 업데이트하여 빠른 드래그 시 stale 데이터 방지
viewModelScope.launch { val state = _uiState.value as? MainUiState.Success ?: return
val current = state.keywords.toMutableList() val current = state.keywords.toMutableList()
if (fromIndex in current.indices && toIndex in current.indices) { if (fromIndex in current.indices && toIndex in current.indices) {
val item = current.removeAt(fromIndex) val item = current.removeAt(fromIndex)
current.add(toIndex, item) current.add(toIndex, item)
// UI 즉시 갱신
_uiState.value = state.copy(keywords = current)
// DataStore 비동기 영속화
viewModelScope.launch {
appSettings.setKeywordOrder(current.map { it.id }) appSettings.setKeywordOrder(current.map { it.id })
} }
} }
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,48 @@
package com.hotdeal.alarm.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.util.Log
import com.hotdeal.alarm.data.local.preferences.AppSettings
import com.hotdeal.alarm.worker.WorkerScheduler
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import javax.inject.Inject
/**
* 부팅 완료 시 백그라운드 폴링을 자동으로 재등록하는 리시버
*/
@AndroidEntryPoint
class BootReceiver : BroadcastReceiver() {
@Inject
lateinit var workerScheduler: WorkerScheduler
@Inject
lateinit var appSettings: AppSettings
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
override fun onReceive(context: Context, intent: Intent) {
if (intent.action == Intent.ACTION_BOOT_COMPLETED ||
intent.action == Intent.ACTION_MY_PACKAGE_REPLACED
) {
Log.d("BootReceiver", "부팅/업데이트 감지 → 백그라운드 폴링 재등록")
scope.launch {
try {
val interval = appSettings.pollingInterval.first()
workerScheduler.schedulePeriodicPolling(interval.toLong())
Log.d("BootReceiver", "폴링 재등록 완료: ${interval}분 간격")
} catch (e: Exception) {
Log.e("BootReceiver", "폴링 재등록 실패: ${e.message}")
workerScheduler.schedulePeriodicPolling(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
}
}
}
}
}
@@ -25,7 +25,6 @@ object ApkDownloadManager {
private const val TAG = "ApkDownloadManager" private const val TAG = "ApkDownloadManager"
private const val APK_FILE_NAME = "hotdeal-alarm-update.apk" private const val APK_FILE_NAME = "hotdeal-alarm-update.apk"
// 등록된 리시버 추적 (메모리 누수 방지)
private var registeredReceiver: BroadcastReceiver? = null private var registeredReceiver: BroadcastReceiver? = null
/** /**
@@ -34,31 +33,29 @@ object ApkDownloadManager {
fun downloadApk(context: Context, updateInfo: UpdateInfo): Long { fun downloadApk(context: Context, updateInfo: UpdateInfo): Long {
val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
// 기존 파일 삭제 val outputDir = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
val outputFile = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), APK_FILE_NAME) if (outputDir != null && !outputDir.exists()) {
outputDir.mkdirs()
}
val outputFile = File(outputDir, APK_FILE_NAME)
if (outputFile.exists()) { if (outputFile.exists()) {
outputFile.delete() outputFile.delete()
} }
val request = DownloadManager.Request(Uri.parse(updateInfo.updateUrl)).apply { val request = DownloadManager.Request(Uri.parse(updateInfo.updateUrl)).apply {
setTitle("핫딜 알람 업데이트") setTitle("핫딜 알람 업데이트")
setDescription("버전 ${updateInfo.version} 다운로드 중...") setDescription("v${updateInfo.version} 다운로드 중...")
setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, APK_FILE_NAME) setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, APK_FILE_NAME)
setAllowedOverMetered(true) setAllowedOverMetered(true)
setAllowedOverRoaming(true) setAllowedOverRoaming(true)
setMimeType("application/vnd.android.package-archive") setMimeType("application/vnd.android.package-archive")
// Wi-Fi 환경에서 다운로드 우선
setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI or DownloadManager.Request.NETWORK_MOBILE) setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI or DownloadManager.Request.NETWORK_MOBILE)
} }
val downloadId = downloadManager.enqueue(request) val downloadId = downloadManager.enqueue(request)
Log.d(TAG, "다운로드 큐에 추가됨: downloadId=$downloadId, url=${updateInfo.updateUrl}")
Toast.makeText(
context,
"업데이트 다운로드 시작...",
Toast.LENGTH_SHORT
).show()
return downloadId return downloadId
} }
@@ -72,14 +69,13 @@ object ApkDownloadManager {
onComplete: () -> Unit, onComplete: () -> Unit,
onFailed: () -> Unit onFailed: () -> Unit
): BroadcastReceiver { ): BroadcastReceiver {
// 기존 리시버가 있으면 먼저 해제
unregisterDownloadCompleteReceiver(context) unregisterDownloadCompleteReceiver(context)
val receiver = object : BroadcastReceiver() { val receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(receivedContext: Context?, intent: Intent?) {
val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) ?: -1 val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) ?: -1
if (id == downloadId) { if (id == downloadId) {
val downloadManager = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager val downloadManager = receivedContext?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager
val query = DownloadManager.Query().setFilterById(downloadId) val query = DownloadManager.Query().setFilterById(downloadId)
val cursor = downloadManager?.query(query) val cursor = downloadManager?.query(query)
@@ -90,16 +86,14 @@ object ApkDownloadManager {
when (status) { when (status) {
DownloadManager.STATUS_SUCCESSFUL -> { DownloadManager.STATUS_SUCCESSFUL -> {
Log.d(TAG, "다운로드 완료, 설치 시작") Log.d(TAG, "다운로드 완료 감지, onComplete 호출")
onComplete() onComplete()
// 설치 후 리시버 해제 unregisterDownloadCompleteReceiver(receivedContext ?: context)
unregisterDownloadCompleteReceiver(context)
} }
DownloadManager.STATUS_FAILED -> { DownloadManager.STATUS_FAILED -> {
Log.e(TAG, "다운로드 실패") Log.e(TAG, "다운로드 실패 감지")
onFailed() onFailed()
// 실패 시 리시버 해제 unregisterDownloadCompleteReceiver(receivedContext ?: context)
unregisterDownloadCompleteReceiver(context)
} }
} }
} }
@@ -108,12 +102,11 @@ object ApkDownloadManager {
} }
} }
// Android 12+ 에서는 RECEIVER_NOT_EXPORTED 플래그 필요
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
context.registerReceiver( context.registerReceiver(
receiver, receiver,
IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
Context.RECEIVER_NOT_EXPORTED Context.RECEIVER_EXPORTED
) )
} else { } else {
context.registerReceiver( context.registerReceiver(
@@ -123,29 +116,20 @@ object ApkDownloadManager {
} }
registeredReceiver = receiver registeredReceiver = receiver
Log.d(TAG, "다운로드 리시버 등록됨, downloadId=$downloadId")
return receiver return receiver
} }
/**
* 다운로드 완료 리시버 해제
*/
fun unregisterDownloadCompleteReceiver(context: Context) { fun unregisterDownloadCompleteReceiver(context: Context) {
registeredReceiver?.let { receiver -> registeredReceiver?.let { receiver ->
try { try {
context.unregisterReceiver(receiver) context.unregisterReceiver(receiver)
Log.d(TAG, "다운로드 리시버 해제됨")
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "리시버 해제 실패 (이미 해제됨): ${e.message}") Log.w(TAG, "리시버 해제 중 예외: ${e.message}")
} }
registeredReceiver = null registeredReceiver = null
} }
} }
/**
* 다운로드 상태 확인 (suspend 함수)
*/
suspend fun getDownloadStatus(context: Context, downloadId: Long): DownloadStatus = suspend fun getDownloadStatus(context: Context, downloadId: Long): DownloadStatus =
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
@@ -161,8 +145,8 @@ object ApkDownloadManager {
val bytesTotalIndex = it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES) val bytesTotalIndex = it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
val downloadStatus = it.getInt(statusIndex) val downloadStatus = it.getInt(statusIndex)
val bytesDownloaded = it.getLong(bytesDownloadedIndex) val bytesDownloaded = if (bytesDownloadedIndex >= 0) it.getLong(bytesDownloadedIndex) else 0L
val bytesTotal = it.getLong(bytesTotalIndex) val bytesTotal = if (bytesTotalIndex >= 0) it.getLong(bytesTotalIndex) else 0L
val progress = if (bytesTotal > 0) { val progress = if (bytesTotal > 0) {
((bytesDownloaded * 100) / bytesTotal).toInt() ((bytesDownloaded * 100) / bytesTotal).toInt()
@@ -181,26 +165,27 @@ object ApkDownloadManager {
} }
/** /**
* 다운로드 완료 대기 (suspend 함수) * APK 파일 설치 화면 실행
*/
suspend fun waitForDownload(context: Context, downloadId: Long): Boolean {
while (true) {
val status = getDownloadStatus(context, downloadId)
if (status.isComplete) return true
if (status.isFailed) return false
delay(500)
}
}
/**
* APK 파일 설치
* @return Boolean true if installation started, false if permission denied
*/ */
fun installApk(context: Context): Boolean { fun installApk(context: Context): Boolean {
// Android 8.0 이상에서 알 수 없는 앱 설치 권한 확인
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (!context.packageManager.canRequestPackageInstalls()) { if (!context.packageManager.canRequestPackageInstalls()) {
Log.w(TAG, "앱 설치 권한 없음") Log.w(TAG, "앱 설치 권한 없음 -> 설정 화면 이동")
Toast.makeText(context, "설치 권한이 필요합니다. 설정에서 허용해주세요.", Toast.LENGTH_SHORT).show() Toast.makeText(context, "앱 설치 권한을 허용한 후 다시 시도해주세요.", Toast.LENGTH_LONG).show()
try {
val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {
data = Uri.parse("package:${context.packageName}")
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
} catch (e: Exception) {
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
data = Uri.parse("package:${context.packageName}")
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
}
return false return false
} }
} }
@@ -208,7 +193,8 @@ object ApkDownloadManager {
val apkFile = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), APK_FILE_NAME) val apkFile = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), APK_FILE_NAME)
if (!apkFile.exists()) { if (!apkFile.exists()) {
Toast.makeText(context, "APK 파일을 찾을 수 없습니다", Toast.LENGTH_SHORT).show() Log.e(TAG, "APK 파일이 존재하지 않음: ${apkFile.absolutePath}")
Toast.makeText(context, "APK 파일을 찾을 수 없습니다. 다시 다운로드해주세요.", Toast.LENGTH_SHORT).show()
return false return false
} }
@@ -219,23 +205,23 @@ object ApkDownloadManager {
apkFile apkFile
) )
Log.d(TAG, "설치 인텐트 시작: uri=$apkUri")
val intent = Intent(Intent.ACTION_VIEW).apply { val intent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(apkUri, "application/vnd.android.package-archive") setDataAndType(apkUri, "application/vnd.android.package-archive")
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
} }
context.startActivity(intent) context.startActivity(intent)
return true return true
} catch (e: Exception) { } catch (e: Exception) {
Toast.makeText(context, "설치를 시작할 수 없습니다: ${e.message}", Toast.LENGTH_SHORT).show() Log.e(TAG, "설치 화면 호출 실패", e)
Toast.makeText(context, "설치 화면을 열 수 없습니다: ${e.message}", Toast.LENGTH_LONG).show()
return false return false
} }
} }
/**
* 다운로드 상태 데이터 클래스
*/
data class DownloadStatus( data class DownloadStatus(
val progress: Int, val progress: Int,
val bytesDownloaded: Long, val bytesDownloaded: Long,
@@ -116,11 +116,18 @@ class HotDealPollingWorker @AssistedInject constructor(
// 8. 알림 발송 상태 업데이트 // 8. 알림 발송 상태 업데이트
dealDao.markAsNotified(newDeals.map { it.id }) dealDao.markAsNotified(newDeals.map { it.id })
// 9. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약) // 9. 인기글 상태 업데이트 (신규+기존 딜 모두 HOT 마킹)
val popularDealIds = allDeals.filter { it.isPopular }.map { it.id }
if (popularDealIds.isNotEmpty()) {
dealDao.markAsPopular(popularDealIds)
Log.d(TAG, "인기글 마킹: ${popularDealIds.size}개")
}
// 10. 오래된 데이터 정리 (3일 이상 - 배터리/데이터 절약)
val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L) val threshold = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000L)
dealDao.deleteOldDeals(threshold) dealDao.deleteOldDeals(threshold)
Log.d(TAG, "===== 핫딜 폴� 완료 =====") Log.d(TAG, "===== 핫딜 폴 완료 =====")
Result.success() Result.success()
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "폴� 오류: ${e.message}", e) Log.e(TAG, "폴� 오류: ${e.message}", e)
@@ -54,7 +54,7 @@ class WorkerScheduler @Inject constructor(
WorkManager.getInstance(context).enqueueUniquePeriodicWork( WorkManager.getInstance(context).enqueueUniquePeriodicWork(
HotDealPollingWorker.WORK_NAME, HotDealPollingWorker.WORK_NAME,
ExistingPeriodicWorkPolicy.KEEP, ExistingPeriodicWorkPolicy.UPDATE,
workRequest workRequest
) )
} }
+6 -6
View File
@@ -1,10 +1,10 @@
{ {
"version": "0.2.8", "version": "0.3.2",
"versionCode": 28, "versionCode": 32,
"updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.2.8/app-release.apk", "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.2/app-release.apk",
"changelog": [ "changelog": [
"설정 > 사이트 관리에서 사이트 순서 조절 기능 추가 (메인 필터 칩 순서 실시간 연동)", "사이트 및 키워드 순서 조절을 터치 드래그 앤 드롭(Drag & Drop) 방식으로 전면 업그레이드",
"설정 > 등록된 키워드 목록에서 키워드 순서 조절 기능 추가", "앱 내 업데이트 시 다운로드 완료 후 설치 화면으로 안 넘어가는 버그 수정",
"하단 고정 메뉴 높이 및 마진 슬림화로 메인 화면 영역 추가 확보" "새 버전 업데이트 안내 다이얼로그 및 진행률 프로그레스 바 연동"
] ]
} }