_

Justonice2019 · Justonice2019 · commit 8c486f4158dc · 2026-01-21T10:11:07.000+08:00
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt
@@ -3,10 +3,6 @@ package app.aaps.core.nssdk.localmodel.treatment
 import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 data class NSBolus(
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?,
     override var date: Long?,
     override val device: String? = null,
     override val identifier: String?,
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt
@@ -22,8 +22,4 @@ data class NSBolusWizard(
     override var app: String? = null,
     val bolusCalculatorResult: String?,
     val glucose: Double?,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?
 ) : NSTreatment
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt
@@ -22,8 +22,4 @@ data class NSCarbs(
     override var app: String? = null,
     val carbs: Double,
     val duration: Long?,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?
 ) : NSTreatment
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt
@@ -28,9 +28,4 @@ data class NSEffectiveProfileSwitch(
     val originalPercentage: Int,
     val originalDuration: Long,
     val originalEnd: Long,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?
-
 ) : NSTreatment
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt
@@ -24,8 +24,4 @@ data class NSExtendedBolus(
     val enteredinsulin: Double,
     val isEmulatingTempBasal: Boolean?,
     val rate: Double?,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?
 ) : NSTreatment
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSOfflineEvent.kt
@@ -20,10 +20,6 @@ data class NSOfflineEvent(
     override val pumpType: String?,
     override val pumpSerial: String?,
     override var app: String? = null,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?,
     val duration: Long,
     val reason: Reason
 ) : NSTreatment {
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSProfileSwitch.kt
@@ -21,10 +21,6 @@ data class NSProfileSwitch(
     override val pumpType: String?,
     override val pumpSerial: String?,
     override var app: String? = null,
-    override val _remoteEventType: RemoteEventType?,
-    override val _phoneNumber: String?,
-    override val _insulin: Double?,
-    override var _status: String?,
     val profileJson: JSONObject?,
     val profile: String,
     val originalProfileName: String?,
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt
@@ -4,12 +4,6 @@ import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
 
 interface NSTreatment {
-    ///////////////////////////////
-    val _remoteEventType: RemoteEventType?
-    val _phoneNumber: String?
-    val _insulin: Double?
-    var _status: String?
-    ///////////////////////////////
     var date: Long?
     val device: String?
     val identifier: String?
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/RemoteNSBolus.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/RemoteNSBolus.kt
@@ -0,0 +1,42 @@
+package app.aaps.core.nssdk.localmodel.treatment
+
+import app.aaps.core.nssdk.localmodel.entry.NsUnits
+
+data class RemoteNSBolus(
+    val _remoteEventType: RemoteEventType?,
+    val _phoneNumber: String?,
+    val _insulin: Double?,
+    var _status: String?,
+    override var date: Long?,
+    override val device: String? = null,
+    override val identifier: String?,
+    override val units: NsUnits? = null,
+    override val srvModified: Long? = null,
+    override val srvCreated: Long? = null,
+    override var utcOffset: Long?,
+    override val subject: String? = null,
+    override var isReadOnly: Boolean = false,
+    override val isValid: Boolean,
+    override val eventType: EventType,
+    override val notes: String?,
+    override val pumpId: Long?,
+    override val endId: Long?,
+    override val pumpType: String?,
+    override val pumpSerial: String?,
+    override var app: String? = null,
+    val insulin: Double?,
+    val type: BolusType,
+    val isBasalInsulin: Boolean,
+) : NSTreatment {
+
+    enum class BolusType {
+        NORMAL,
+        SMB,
+        PRIMING;
+
+        companion object {
+
+            fun fromString(name: String?) = entries.firstOrNull { it.name == name } ?: NORMAL
+        }
+    }
+}
diff --git a/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt b/core/nssdk/src/main/kotlin/app/aaps/core/nssdk/mapper/TreatmentMapper.kt
@@ -14,6 +14,7 @@ import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryTarget
 import app.aaps.core.nssdk.localmodel.treatment.NSTherapyEvent
 import app.aaps.core.nssdk.localmodel.treatment.NSTreatment
 import app.aaps.core.nssdk.localmodel.treatment.RemoteEventType
+import app.aaps.core.nssdk.localmodel.treatment.RemoteNSBolus
 import app.aaps.core.nssdk.remotemodel.RemoteTreatment
 import com.google.gson.Gson
 import org.json.JSONObject
@@ -35,7 +36,7 @@ internal fun RemoteTreatment.toTreatment(): NSTreatment? {
     val treatmentTimestamp = timestamp()
     when {
         _remoteEventType === RemoteEventType.MEAL_BOLUS && _insulin !== null && _insulin > 0 ->
-            return NSBolus(
+            return RemoteNSBolus(
                 date = treatmentTimestamp,
                 device = this.device,
                 identifier = this.identifier,
@@ -52,9 +53,14 @@ internal fun RemoteTreatment.toTreatment(): NSTreatment? {
                 endId = this.endId,
                 pumpType = this.pumpType,
                 pumpSerial = this.pumpSerial,
-                _insulin = this._insulin,
-                type = NSBolus.BolusType.fromString(this.type),
+                type = RemoteNSBolus.BolusType.fromString(this.type),
                 isBasalInsulin = isBasalInsulin == true,
+                _remoteEventType = this._remoteEventType,
+                _insulin = this._insulin,
+                _phoneNumber = this._phoneNumber,
+                _status = this._status,
+                app = this._status,
+                insulin = this.insulin,
             )
         insulin != null && insulin > 0                                     ->
             return NSBolus(
@@ -77,10 +83,6 @@ internal fun RemoteTreatment.toTreatment(): NSTreatment? {
                 insulin = this.insulin,
                 type = NSBolus.BolusType.fromString(this.type),
                 isBasalInsulin = isBasalInsulin == true,
-                _remoteEventType = this._remoteEventType,
-                _phoneNumber = this._phoneNumber,
-                _insulin = this._insulin,
-                _status = this._status,
                 app = this.app
             )
 
diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/services/NSClientV3Service.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/services/NSClientV3Service.kt
@@ -48,6 +48,7 @@ import java.net.URISyntaxException
 import javax.inject.Inject
 import app.aaps.core.interfaces.constraints.ConstraintsChecker
 import app.aaps.core.nssdk.localmodel.treatment.RemoteEventType
+import app.aaps.core.nssdk.localmodel.treatment.RemoteNSBolus
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -275,7 +276,7 @@ class NSClientV3Service : DaggerService() {
 
     lateinit var  remoteTreatment: NSTreatment;
     @OptIn(DelicateCoroutinesApi::class)
-    private fun processRemoteInject(operation: String, treatment: NSTreatment) {
+    private fun processRemoteInject(operation: String, treatment: RemoteNSBolus) {
         val _phoneNumber = treatment._phoneNumber
         val _insulin = treatment._insulin
         if (allowedNumbers.contains(_phoneNumber)) {
@@ -332,6 +333,7 @@ class NSClientV3Service : DaggerService() {
         // }
     }
 
+    @SuppressLint("SuspiciousIndentation")
     private fun handleDataOperation(args: Array<Any>, operation: String) {
         Log.d("justonice", "handleDataOperation....")
         val response = args[0] as JSONObject
@@ -356,8 +358,8 @@ class NSClientV3Service : DaggerService() {
             "treatments"   -> {
                 docString.toNSTreatment()?.let {
                     val treatments = listOf(it)
-                    val treatment = treatments.first()
-                    if (treatment._remoteEventType != null && treatment._remoteEventType == RemoteEventType.MEAL_BOLUS) {
+                    val treatment = treatments.first() as RemoteNSBolus
+                        if (treatment._remoteEventType != null && treatment._remoteEventType == RemoteEventType.MEAL_BOLUS) {
                         processRemoteInject(operation, treatment)
                     }
                     Log.d("justonice", "treatments: $treatments")
