Andee lives on your phone or Mac and uses any app like you do—no integrations, no root, any model; memory and passwords never leave your device | Andee 住进你的手机或 Mac,像你一样操作任何 App——无需集成、无需 Root、支持任意模型,记忆和密码绝不离开设备。
build(core): add a platform-neutral :core module and move the pure files
booboosui88f3be0ffff8
diff --git a/app/build.gradle b/app/build.gradleindex db89b03..b72b9e8 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -1,6 +1,6 @@plugins {alias(libs.plugins.androidApplication)- id 'org.jetbrains.kotlin.android' version '1.9.22'+ id 'org.jetbrains.kotlin.android'}def localProps = new Properties()@@ -150,6 +150,8 @@ dependencies {implementation "androidx.camera:camera-view:$camerax_version"implementation 'com.google.mlkit:barcode-scanning:17.2.0'+ implementation project(':core')+testImplementation libs.junit// Unit tests run against android.jar's stubs, whose org.json throws// "not mocked" on construction. BrainTrace builds a JSONObject before itdiff --git a/build.gradle b/build.gradleindex e61198d..88e829f 100644--- a/build.gradle+++ b/build.gradle@@ -1,4 +1,6 @@// Top-level build file where you can add configuration options common to all sub-projects/modules.plugins {alias(libs.plugins.androidApplication) apply false+id 'org.jetbrains.kotlin.android' version '1.9.22' apply false+id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false}\ No newline at end of filediff --git a/core/build.gradle b/core/build.gradlenew file mode 100644index 0000000..d0ce3de--- /dev/null+++ b/core/build.gradle@@ -0,0 +1,34 @@+// Platform-neutral Kotlin shared by the Android app and the desktop app: the+// brain loop, the tool vocabulary, the turn guards, voice protocols, the wake+// DSP and the ball's model. Nothing here may import android.* — that is the+// whole point of the module, and the compiler enforces it because android.jar+// is not on this classpath.+plugins {+ id 'org.jetbrains.kotlin.jvm'+}++java {+ sourceCompatibility = JavaVersion.VERSION_1_8+ targetCompatibility = JavaVersion.VERSION_1_8+}++kotlin {+ jvmToolchain(17)+}++compileKotlin {+ kotlinOptions { jvmTarget = '1.8' }+}+compileTestKotlin {+ kotlinOptions { jvmTarget = '1.8' }+}++dependencies {+ // Android ships its own org.json in the framework, and the app must keep+ // using that one (R8 config and behaviour are tuned to it). So core only+ // compiles against it; the desktop app adds the real artifact.+ compileOnly 'org.json:json:20240303'++ testImplementation libs.junit+ testImplementation 'org.json:json:20240303'+}diff --git a/app/src/main/java/net/kuafuai/andee/asr/AsrEngine.kt b/core/src/main/kotlin/net/kuafuai/andee/asr/AsrEngine.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/asr/AsrEngine.ktrename to core/src/main/kotlin/net/kuafuai/andee/asr/AsrEngine.ktdiff --git a/app/src/main/java/net/kuafuai/andee/brain/SpeechMood.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/SpeechMood.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/brain/SpeechMood.ktrename to core/src/main/kotlin/net/kuafuai/andee/brain/SpeechMood.ktdiff --git a/app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.ktsimilarity index 99%rename from app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.ktrename to core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.ktindex 124b55d..967ae8c 100644--- a/app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.kt+++ b/core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.kt@@ -24,7 +24,7 @@ import org.json.JSONObject* Pure: no Android, no state, so the rules can be tested directly; see* `TopicSplitterTest`.*/-internal object TopicSplitter {+object TopicSplitter {/*** A silence at least this long is marked in the turn list as a likely seam.@@ -281,7 +281,7 @@ internal object TopicSplitter {* device chatter, and a screenshot payload inside a folded topic would be a* megabyte of base64 with the user's sentence nowhere in it.*/-internal fun renderTopicText(history: List<JSONObject>, from: Int, until: Int): String {+fun renderTopicText(history: List<JSONObject>, from: Int, until: Int): String {val sb = StringBuilder()for (i in from.coerceAtLeast(0) until until.coerceAtMost(history.size)) {val m = history[i]diff --git a/app/src/main/java/net/kuafuai/andee/config/CronExpr.kt b/core/src/main/kotlin/net/kuafuai/andee/config/CronExpr.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/config/CronExpr.ktrename to core/src/main/kotlin/net/kuafuai/andee/config/CronExpr.ktdiff --git a/app/src/main/java/net/kuafuai/andee/net/TurnGuards.kt b/core/src/main/kotlin/net/kuafuai/andee/net/TurnGuards.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/net/TurnGuards.ktrename to core/src/main/kotlin/net/kuafuai/andee/net/TurnGuards.ktdiff --git a/app/src/main/java/net/kuafuai/andee/screen/AimParts.kt b/core/src/main/kotlin/net/kuafuai/andee/screen/AimParts.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/screen/AimParts.ktrename to core/src/main/kotlin/net/kuafuai/andee/screen/AimParts.ktdiff --git a/app/src/main/java/net/kuafuai/andee/tts/TtsEngine.kt b/core/src/main/kotlin/net/kuafuai/andee/tts/TtsEngine.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/tts/TtsEngine.ktrename to core/src/main/kotlin/net/kuafuai/andee/tts/TtsEngine.ktdiff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/Mood.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/Mood.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/ui/ball/Mood.ktrename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/Mood.ktdiff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/Pose.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/Pose.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/ui/ball/Pose.ktrename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/Pose.ktdiff --git a/app/src/main/java/net/kuafuai/andee/wake/Dtw.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/Dtw.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/wake/Dtw.ktrename to core/src/main/kotlin/net/kuafuai/andee/wake/Dtw.ktdiff --git a/app/src/main/java/net/kuafuai/andee/wake/Mfcc.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/Mfcc.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/wake/Mfcc.ktrename to core/src/main/kotlin/net/kuafuai/andee/wake/Mfcc.ktdiff --git a/app/src/main/java/net/kuafuai/andee/wake/VoiceSegmenter.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/VoiceSegmenter.ktsimilarity index 100%rename from app/src/main/java/net/kuafuai/andee/wake/VoiceSegmenter.ktrename to core/src/main/kotlin/net/kuafuai/andee/wake/VoiceSegmenter.ktdiff --git a/app/src/test/java/net/kuafuai/andee/brain/SpeechMoodTest.kt b/core/src/test/kotlin/net/kuafuai/andee/brain/SpeechMoodTest.ktsimilarity index 100%rename from app/src/test/java/net/kuafuai/andee/brain/SpeechMoodTest.ktrename to core/src/test/kotlin/net/kuafuai/andee/brain/SpeechMoodTest.ktdiff --git a/app/src/test/java/net/kuafuai/andee/brain/TopicSplitterTest.kt b/core/src/test/kotlin/net/kuafuai/andee/brain/TopicSplitterTest.ktsimilarity index 100%rename from app/src/test/java/net/kuafuai/andee/brain/TopicSplitterTest.ktrename to core/src/test/kotlin/net/kuafuai/andee/brain/TopicSplitterTest.ktdiff --git a/app/src/test/java/net/kuafuai/andee/net/TurnGuardsTest.kt b/core/src/test/kotlin/net/kuafuai/andee/net/TurnGuardsTest.ktsimilarity index 100%rename from app/src/test/java/net/kuafuai/andee/net/TurnGuardsTest.ktrename to core/src/test/kotlin/net/kuafuai/andee/net/TurnGuardsTest.ktdiff --git a/app/src/test/java/net/kuafuai/andee/wake/WakeDspTest.kt b/core/src/test/kotlin/net/kuafuai/andee/wake/WakeDspTest.ktsimilarity index 100%rename from app/src/test/java/net/kuafuai/andee/wake/WakeDspTest.ktrename to core/src/test/kotlin/net/kuafuai/andee/wake/WakeDspTest.ktdiff --git a/settings.gradle b/settings.gradleindex 6e570d0..b14b2f2 100644--- a/settings.gradle+++ b/settings.gradle@@ -24,3 +24,4 @@ dependencyResolutionManagement {rootProject.name = "body"include ':app'+include ':core'