Merge remote-tracking branch 'origin/master'

tj

2 天以前 93775e1f3d79a1e11b839abbf24201dafcd9e646

 app/src/main/java/com/example/firstapp/database/repository/CodeRepository.kt

@@ -29,8 +29,8 @@
    }

    @WorkerThread
    fun queryByTypeAndCodeAndDate(content: String, code: String, dateString: String): Code? {
        return codeDao.queryByTypeAndCodeAndDate(content, code, dateString)
    fun queryByTypeAndCodeAndDate(content: String, code: String, smsTimestamp: Long): Code? {
        return codeDao.queryByTypeAndCodeAndDate(content, code, smsTimestamp)
    }

    @WorkerThread
@@ -45,9 +45,9 @@
        }
    }

    fun getPackagesUnread(date: Long, dateType: String): Flow<List<Code>> {
    fun getPackagesReaded(date: Long, dateType: String): Flow<List<Code>> {
        return when (dateType) {
            "DAY" -> codeDao.getPackagesByDayUnread(date)
            "DAY" -> codeDao.getPackagesByDayReaded(date)
            "WEEK" -> codeDao.getPackagesByWeek(date)
            else -> codeDao.getPackagesByDay(date)
        }
@@ -101,5 +101,6 @@

    fun getCurrentWeekStats2(startDateCur: String, endDateCur: String) = codeDao.getCurrentWeekStats2(startDateCur,endDateCur)
    fun getWeeklyStatsChart(startDateCur: String, endDateCur: String): Flow<List<DailyStat>> = codeDao.getWeeklyStatsChart(startDateCur,endDateCur)
    fun getDateStatsByType(startDateCur: String, endDateCur: String, type: String) = codeDao.getDateStatsByType(startDateCur,endDateCur,type)

}