Android8 api26

README.md

@@ -1,3 +1,8 @@
+## 笔记
+````
+engineering_mode
+````
+
 ## 如何支持此项目？
 软件遵循GPL V3协议，是完全开源免费的，但开发者写代码、维护需要投入大量时间精力。
 大家的支持是项目得以延续的动力。

app/build.gradle.kts

@@ -191,7 +191,7 @@ android {
 
     }
 
-    useLibrary("org.apache.http.legacy")
+    // useLibrary("org.apache.http.legacy")
 
     //Deleting it causes a binding error
     buildFeatures {
@@ -281,7 +281,7 @@ println("-------------------")
 if (!gitAvailable()) {
     throw GradleException("GIT system is not available. On Windows try to run Android Studio as an Administrator. Check if GIT is installed and Studio have permissions to use it")
 }
-if (isMaster() && !allCommitted()) {
-    throw GradleException("There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update")
-}
+// if (isMaster() && !allCommitted()) {
+//     throw GradleException("There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update")
+// }
 

app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <!-- 添加uses-sdk配置 -->
+    <uses-sdk android:minSdkVersion="26"
+        tools:overrideLibrary="app.aaps.pump.eopatch.core,app.aaps.shared.impl,app.aaps.core.interfaces,app.aaps.core.ui,app.aaps.core.main,app.aaps.database,app.aaps.plugins.main,app.aaps.plugins.aps,app.aaps.plugins.pump,app.aaps.plugins.sms,app.aaps.plugins.constraints,app.aaps.plugins.general,app.aaps.plugins.source,app.aaps.implementation,com.joanzapata.iconify" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
@@ -40,7 +43,9 @@
         android:restoreAnyVersion="true"
         android:roundIcon="${appIconRound}"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Launcher">
+        android:theme="@style/AppTheme.Launcher"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true">
 
         <meta-data
             android:name="com.google.android.gms.version"

app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt

@@ -42,6 +42,8 @@ import java.util.Calendar
 import java.util.GregorianCalendar
 import javax.inject.Inject
 import kotlin.math.min
+import android.graphics.Point
+import android.os.Build
 
 class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
 
@@ -128,7 +130,33 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
                 .show(supportFragmentManager, "history_date_picker")
         }
 
-        windowManager.currentWindowMetrics
+        // windowManager.currentWindowMetrics
+        // 如果需要屏幕尺寸，使用兼容性代码
+        val screenWidth: Int
+        val screenHeight: Int
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            // Android 11 (API 30+) 使用currentWindowMetrics
+            val wm = windowManager.currentWindowMetrics
+            screenWidth = wm.bounds.width()
+            screenHeight = wm.bounds.height()
+        } else {
+            // Android 10及以下使用defaultDisplay
+            val display = windowManager.defaultDisplay
+            val size = Point()
+            display.getSize(size)
+            screenWidth = size.x
+            screenHeight = size.y
+        }
+
+        axisWidth = when {
+            resources.displayMetrics.densityDpi <= 120 -> 3
+            resources.displayMetrics.densityDpi <= 160 -> 10
+            resources.displayMetrics.densityDpi <= 320 -> 35
+            resources.displayMetrics.densityDpi <= 420 -> 50
+            resources.displayMetrics.densityDpi <= 560 -> 70
+            else                                       -> 80
+        }
 
         axisWidth = when {
             resources.displayMetrics.densityDpi <= 120 -> 3

app/src/main/kotlin/app/aaps/di/PluginsListModule.kt

@@ -27,6 +27,7 @@ import app.aaps.plugins.main.general.persistentNotification.PersistentNotificati
 import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
 import app.aaps.plugins.main.general.themes.ThemeSwitcherPlugin
 import app.aaps.plugins.main.iob.iobCobCalculator.IobCobCalculatorPlugin
+import app.aaps.plugins.main.profile.NotePlugin
 import app.aaps.plugins.main.profile.ProfilePlugin
 import app.aaps.plugins.sensitivity.SensitivityAAPSPlugin
 import app.aaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -501,4 +502,11 @@ abstract class PluginsListModule {
 
     @Qualifier
     annotation class Unfinished
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(6) // 使用一个未使用的key值
+    abstract fun bindNotePlugin(plugin: NotePlugin): PluginBase
+
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -10,9 +10,9 @@ object Versions {
     const val ndkVersion = "21.1.6352462"
 
     const val compileSdk = 35
-    const val minSdk = 30
+    const val minSdk = 26
     const val targetSdk = 30
-    const val wearMinSdk = 28
+    const val wearMinSdk = 26
     const val wearTargetSdk = 29
 
     val javaVersion = JavaVersion.VERSION_21

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/ConfigBuilder.kt

@@ -49,7 +49,7 @@ interface ConfigBuilder {
         pluginViewHolders: ArrayList<PluginViewHolderInterface>,
         activity: FragmentActivity,
         parent: LinearLayout,
-        showExpanded: Boolean = false
+        showExpanded: Boolean = true
     )
 
     fun interface PluginViewHolderInterface {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolus.kt

@@ -22,8 +22,7 @@ data class NSBolus(
     override var app: String? = null,
     val insulin: Double,
     val type: BolusType,
-    val isBasalInsulin: Boolean
-
+    val isBasalInsulin: Boolean,
 ) : NSTreatment {
 
     enum class BolusType {

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSBolusWizard.kt

@@ -21,5 +21,5 @@ data class NSBolusWizard(
     override val pumpSerial: String?,
     override var app: String? = null,
     val bolusCalculatorResult: String?,
-    val glucose: Double?
+    val glucose: Double?,
 ) : NSTreatment

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSCarbs.kt

@@ -21,5 +21,5 @@ data class NSCarbs(
     override val pumpSerial: String?,
     override var app: String? = null,
     val carbs: Double,
-    val duration: Long?
+    val duration: Long?,
 ) : NSTreatment

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSEffectiveProfileSwitch.kt

@@ -27,6 +27,5 @@ data class NSEffectiveProfileSwitch(
     val originalTimeshift: Long,
     val originalPercentage: Int,
     val originalDuration: Long,
-    val originalEnd: Long
-
+    val originalEnd: Long,
 ) : NSTreatment

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSExtendedBolus.kt

@@ -23,5 +23,5 @@ data class NSExtendedBolus(
     val duration: Long,
     val enteredinsulin: Double,
     val isEmulatingTempBasal: Boolean?,
-    val rate: Double?
+    val rate: Double?,
 ) : NSTreatment

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/NSTreatment.kt

@@ -2,6 +2,7 @@ package app.aaps.core.nssdk.localmodel.treatment
 
 import app.aaps.core.nssdk.localmodel.entry.NsUnits
 
+
 interface NSTreatment {
     var date: Long?
     val device: String?

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/RemoteEventType.kt

@@ -0,0 +1,44 @@
+package app.aaps.core.nssdk.localmodel.treatment
+
+import com.google.gson.annotations.SerializedName
+
+@Suppress("unused")
+enum class RemoteEventType(val text: String) {
+    @SerializedName("Meal Bolus") MEAL_BOLUS("Meal Bolus"),
+    // @SerializedName("Site Change") CANNULA_CHANGE("Site Change"),
+    // @SerializedName("Insulin Change") INSULIN_CHANGE("Insulin Change"),
+    // @SerializedName("Pump Battery Change") PUMP_BATTERY_CHANGE("Pump Battery Change"),
+    // @SerializedName("Sensor Change") SENSOR_CHANGE("Sensor Change"),
+    // @SerializedName("Sensor Start") SENSOR_STARTED("Sensor Start"),
+    // @SerializedName("Sensor Stop") SENSOR_STOPPED("Sensor Stop"),
+    // @SerializedName("BG Check") FINGER_STICK_BG_VALUE("BG Check"),
+    // @SerializedName("Exercise") EXERCISE("Exercise"),
+    // @SerializedName("Announcement") ANNOUNCEMENT("Announcement"),
+    // @SerializedName("SettingsExport") SETTINGS_EXPORT("Settings Export"),
+    // @SerializedName("Question") QUESTION("Question"),
+    // @SerializedName("Note") NOTE("Note"),
+    // @SerializedName("OpenAPS Offline") APS_OFFLINE("OpenAPS Offline"),
+    // @SerializedName("D.A.D. Alert") DAD_ALERT("D.A.D. Alert"),
+    // @SerializedName("Mbg") NS_MBG("Mbg"),
+    //
+    // // Used but not as a Therapy Event (use constants only)
+    // @SerializedName("Carb Correction") CARBS_CORRECTION("Carb Correction"),
+    // @SerializedName("Bolus Wizard") BOLUS_WIZARD("Bolus Wizard"),
+    // @SerializedName("Correction Bolus") CORRECTION_BOLUS("Correction Bolus"),
+    //
+    // @SerializedName("Combo Bolus") COMBO_BOLUS("Combo Bolus"),
+    // @SerializedName("Temporary Target") TEMPORARY_TARGET("Temporary Target"),
+    // @SerializedName("Temporary Target Cancel") TEMPORARY_TARGET_CANCEL("Temporary Target Cancel"),
+    // @SerializedName("Profile Switch") PROFILE_SWITCH("Profile Switch"),
+    // @SerializedName("Snack Bolus") SNACK_BOLUS("Snack Bolus"),
+    // @SerializedName("Temp Basal") TEMPORARY_BASAL("Temp Basal"),
+    // @SerializedName("Temp Basal Start") TEMPORARY_BASAL_START("Temp Basal Start"),
+    // @SerializedName("Temp Basal End") TEMPORARY_BASAL_END("Temp Basal End"),
+    //
+    // @SerializedName("") ERROR(""),
+    @SerializedName("<none>") NONE("<none>");
+
+    companion object {
+        fun fromString(text: String?) = entries.firstOrNull { it.text == text } ?: NONE
+    }
+}

core/nssdk/src/main/kotlin/app/aaps/core/nssdk/localmodel/treatment/RemoteNSBolus.kt

@@ -0,0 +1,43 @@
+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?,
+    var _verifyCode: 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
+        }
+    }
+}