caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cloud log upload bug fix

Browse source
This commit is contained in:
miyeongkim 2022-09-01 08:54:05 +09:00
parent d87ab2d8a5
commit b8e332e9d7
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
View file

@ -293,7 +293,7 @@ class DiaconnG8Service : DaggerService() {
// pump log loop size // pump log loop size
val pumpLogPageSize = 11 val pumpLogPageSize = 11
val (start, end, loopSize) = getLogLoopCount(apsLastLogNum, apsWrappingCount, pumpLastNum, pumpWrappingCount, false) val (start, end, loopSize) = getLogLoopCount(apsLastLogNum, apsWrappingCount, pumpLastNum, pumpWrappingCount)
aapsLogger.debug(LTag.PUMPCOMM, "loopinfo start : $start, end : $end, loopSize : $loopSize") aapsLogger.debug(LTag.PUMPCOMM, "loopinfo start : $start, end : $end, loopSize : $loopSize")
// log sync start! // log sync start!
if (loopSize > 0) { if (loopSize > 0) {
@ -326,7 +326,7 @@ class DiaconnG8Service : DaggerService() {
aapsLogger.debug(LTag.PUMPCOMM, "platformLogNo: $platformLogNo, platformWrappingCount: $platformWrappingCount") aapsLogger.debug(LTag.PUMPCOMM, "platformLogNo: $platformLogNo, platformWrappingCount: $platformWrappingCount")
// 페이지 사이즈로 처리할 때 루핑 횟수 계산 // 페이지 사이즈로 처리할 때 루핑 횟수 계산
val (platformStart, platformEnd, platformLoopSize) = getLogLoopCount(platformLogNo, platformWrappingCount, pumpLastNum, pumpWrappingCount, true) val (platformStart, platformEnd, platformLoopSize) = getCloudLogLoopCount(platformLastNo.toInt(), platformLogNo, platformWrappingCount, pumpLastNum, pumpWrappingCount)
if(platformLoopSize > 0) { if(platformLoopSize > 0) {
diaconnG8Pump.isPlatformUploadStarted = true diaconnG8Pump.isPlatformUploadStarted = true
for (i in 0 until platformLoopSize) { for (i in 0 until platformLoopSize) {
@ -347,22 +347,39 @@ class DiaconnG8Service : DaggerService() {
return result return result
} }
private fun getLogLoopCount(lastLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int, isPlatform: Boolean): Triple<Int, Int, Int> { private fun getLogLoopCount(lastLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int): Triple<Int, Int, Int> {
val start: Int// log sync start number val start: Int// log sync start number
val end: Int // log sync end number1311 val end: Int // log sync end number1311
aapsLogger.debug(LTag.PUMPCOMM, "lastLogNum : $lastLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount : $pumpWrappingCount") aapsLogger.debug(LTag.PUMPCOMM, "lastLogNum : $lastLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount : $pumpWrappingCount")
if ((pumpWrappingCount * 10000 + pumpLastNum - lastLogNum > 10000 && isPlatform)) { if (pumpWrappingCount > wrappingCount && lastLogNum < 9999) {
start = pumpLastNum
end = 10000
} else if (pumpWrappingCount > wrappingCount && lastLogNum < 9999) {
start = (lastLogNum + 1) start = (lastLogNum + 1)
end = 10000 end = 10000
} else if (pumpWrappingCount > wrappingCount && lastLogNum >= 9999 && isPlatform) { } else {
start = (lastLogNum + 1)
end = pumpLastNum
}
val size = ceil((end - start) / 11.0).toInt()
//
return Triple(start, end, size)
}
private fun getCloudLogLoopCount(platformLastNo:Int, PlatformPumpLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int): Triple<Int, Int, Int> {
val start: Int// log sync start number
val end: Int // log sync end number1311
aapsLogger.debug(LTag.PUMPCOMM, "platformLastNo: $platformLastNo, PlatformPumpLogNum : $PlatformPumpLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount :$pumpWrappingCount")
if ((pumpWrappingCount * 10000 + pumpLastNum - platformLastNo > 10000 )) {
start = pumpLastNum
end = 10000
} else if (pumpWrappingCount > wrappingCount && PlatformPumpLogNum < 9999) {
start = (PlatformPumpLogNum + 1)
end = 10000
} else if (pumpWrappingCount > wrappingCount && PlatformPumpLogNum >= 9999 ) {
start = 0 // 처음부터 시작 start = 0 // 처음부터 시작
end = pumpLastNum end = pumpLastNum
} else { } else {
start = (lastLogNum + 1) start = (PlatformPumpLogNum + 1)
end = pumpLastNum end = pumpLastNum
} }
val size = ceil((end - start) / 11.0).toInt() val size = ceil((end - start) / 11.0).toInt()