caspervk/AndroidAPS
1
Code Releases Activity

lint

Browse source
This commit is contained in:
Milos Kozak 2022-09-03 18:08:38 +02:00
parent 273b09b2c0
commit 1f52b299ce
3 changed files with 10 additions and 11 deletions
diaconn/src/main/java/info/nightscout/androidaps/diaconn
DiaconnG8Pump.kt
packet
BigLogInquireResponsePacket.kt
service
DiaconnG8Service.kt

2
diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
View file

@ -20,7 +20,7 @@ class DiaconnG8Pump @Inject constructor(
private val dateUtil: DateUtil private val dateUtil: DateUtil
) { ) {
var isPumplogUploadFailed: Boolean = false var isPumpLogUploadFailed: Boolean = false
//var bleResultInfo: Pair<Int?, Boolean> = Pair(null, false) //var bleResultInfo: Pair<Int?, Boolean> = Pair(null, false)
var bolusConfirmMessage: Byte = 0 var bolusConfirmMessage: Byte = 0

2
diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
View file

@ -847,7 +847,7 @@ class BigLogInquireResponsePacket(
} }
override fun onFailure(call: Call<ApiResponse>, t: Throwable) { override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
aapsLogger.error(LTag.PUMPCOMM, "api uploadPumplogs failed") aapsLogger.error(LTag.PUMPCOMM, "api uploadPumplogs failed")
diaconnG8Pump.isPumplogUploadFailed = true diaconnG8Pump.isPumpLogUploadFailed = true
t.printStackTrace() t.printStackTrace()
} }
} }

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

@ -18,7 +18,6 @@ import info.nightscout.androidaps.diaconn.api.DiaconnApiService
import info.nightscout.androidaps.diaconn.api.DiaconnLogUploader import info.nightscout.androidaps.diaconn.api.DiaconnLogUploader
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
import info.nightscout.androidaps.diaconn.packet.* import info.nightscout.androidaps.diaconn.packet.*
import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
import info.nightscout.androidaps.dialogs.BolusProgressDialog import info.nightscout.androidaps.dialogs.BolusProgressDialog
@ -330,7 +329,7 @@ class DiaconnG8Service : DaggerService() {
if(platformLoopSize > 0) { if(platformLoopSize > 0) {
diaconnG8Pump.isPlatformUploadStarted = true diaconnG8Pump.isPlatformUploadStarted = true
for (i in 0 until platformLoopSize) { for (i in 0 until platformLoopSize) {
if(diaconnG8Pump.isPumplogUploadFailed) { if(diaconnG8Pump.isPumpLogUploadFailed) {
break break
} }
rxBus.send(EventPumpStatusChanged("클라우드동기화 진행 중 : $i / $platformLoopSize")) rxBus.send(EventPumpStatusChanged("클라우드동기화 진행 중 : $i / $platformLoopSize"))
@ -341,7 +340,7 @@ class DiaconnG8Service : DaggerService() {
} }
SystemClock.sleep(1000) SystemClock.sleep(1000)
diaconnG8Pump.isPlatformUploadStarted = false diaconnG8Pump.isPlatformUploadStarted = false
diaconnG8Pump.isPumplogUploadFailed = false diaconnG8Pump.isPumpLogUploadFailed = false
} }
} }
} catch (e:Exception) { } catch (e:Exception) {
@ -368,22 +367,22 @@ class DiaconnG8Service : DaggerService() {
return Triple(start, end, size) return Triple(start, end, size)
} }
private fun getCloudLogLoopCount(platformLastNo:Int, PlatformPumpLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int): Triple<Int, Int, Int> { 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 start: Int// log sync start number
val end: Int // log sync end number1311 val end: Int // log sync end number1311
aapsLogger.debug(LTag.PUMPCOMM, "platformLastNo: $platformLastNo, PlatformPumpLogNum : $PlatformPumpLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount :$pumpWrappingCount") aapsLogger.debug(LTag.PUMPCOMM, "platformLastNo: $platformLastNo, PlatformPumpLogNum : $platformPumpLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount :$pumpWrappingCount")
if ((pumpWrappingCount * 10000 + pumpLastNum - platformLastNo > 10000 )) { if ((pumpWrappingCount * 10000 + pumpLastNum - platformLastNo > 10000 )) {
start = pumpLastNum start = pumpLastNum
end = 10000 end = 10000
} else if (pumpWrappingCount > wrappingCount && PlatformPumpLogNum < 9999) { } else if (pumpWrappingCount > wrappingCount && platformPumpLogNum < 9999) {
start = (PlatformPumpLogNum + 1) start = (platformPumpLogNum + 1)
end = 10000 end = 10000
} else if (pumpWrappingCount > wrappingCount && PlatformPumpLogNum >= 9999 ) { } else if (pumpWrappingCount > wrappingCount && platformPumpLogNum >= 9999 ) {
start = 0 // 처음부터 시작 start = 0 // 처음부터 시작
end = pumpLastNum end = pumpLastNum
} else { } else {
start = (PlatformPumpLogNum + 1) start = (platformPumpLogNum + 1)
end = pumpLastNum end = pumpLastNum
} }
val size = ceil((end - start) / 11.0).toInt() val size = ceil((end - start) / 11.0).toInt()