删除compose相关代码;优化换气扇控制逻辑

This commit is contained in:
BBIT-Kai
2026-08-10 11:33:38 +08:00
parent 090b120365
commit 381605cf70
16 changed files with 166 additions and 998 deletions
+3 -24
View File
@@ -1,7 +1,6 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
}
android {
@@ -10,8 +9,8 @@ android {
applicationId "com.example.iot_controlhost"
minSdkVersion 25
targetSdkVersion 30
versionCode 163
versionName "3.5.0.163"
versionCode 164
versionName "3.5.0.164"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
moduleName "mcu"
@@ -66,7 +65,6 @@ android {
buildFeatures {
viewBinding true
dataBinding true
compose true
}
kotlinOptions {
jvmTarget = '17'
@@ -76,30 +74,11 @@ android {
abortOnError false
checkReleaseBuilds false
}
composeOptions {
kotlinCompilerExtensionVersion rootProject.composeVersion
}
}
apply plugin: 'com.android.application'
apply plugin: 'org.greenrobot.greendao'
dependencies {
// Compose
implementation "androidx.activity:activity-compose:$rootProject.composeVersion"
implementation "androidx.compose.runtime:runtime:$rootProject.composeVersion"
implementation "androidx.compose.ui:ui:$rootProject.composeVersion"
implementation "androidx.compose.foundation:foundation:$rootProject.composeVersion"
implementation "androidx.compose.foundation:foundation-layout:$rootProject.composeVersion"
implementation "androidx.compose.material:material:$rootProject.composeVersion"
implementation "androidx.compose.runtime:runtime-livedata:$rootProject.composeVersion"
implementation "androidx.compose.ui:ui-tooling:$rootProject.composeVersion"
implementation("androidx.compose.material3:material3:1.4.0-alpha12")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("io.github.ltttttttttttt:ComposeViews:1.6.0.1")
implementation ("io.github.ehsannarmani:compose-charts:0.1.2")
// implementation "com.google.android.material:compose-theme-adapter:$rootProject.composeVersion"
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -196,4 +175,4 @@ dependencies {
//
// // optional - Test helpers for Lifecycle runtime
// testImplementation "androidx.lifecycle:lifecycle-runtime-testing:$lifecycle_version"
}
}