diff --git a/.vscode/settings.json b/.vscode/settings.json index 5236c665..8cc5f9b5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,6 @@ { - "css.customData": [".vscode/tailwindcss.json"], -} \ No newline at end of file + "css.customData": [ + ".vscode/tailwindcss.json" + ], + "java.configuration.updateBuildConfiguration": "disabled", +} diff --git a/src-tauri/gen/android/app/.gitignore b/src-tauri/gen/android/app/.gitignore index 92ed6582..53288ae8 100644 --- a/src-tauri/gen/android/app/.gitignore +++ b/src-tauri/gen/android/app/.gitignore @@ -1,4 +1,4 @@ -/src/main/java/com/hula/app/generated +/src/main/java/com/hula_app/app/generated /src/main/jniLibs/**/*.so /src/main/assets/tauri.conf.json /tauri.build.gradle.kts diff --git a/src-tauri/gen/android/app/build.gradle.kts b/src-tauri/gen/android/app/build.gradle.kts index 9a27914f..320711a2 100644 --- a/src-tauri/gen/android/app/build.gradle.kts +++ b/src-tauri/gen/android/app/build.gradle.kts @@ -15,10 +15,10 @@ val tauriProperties = Properties().apply { android { compileSdk = 34 - namespace = "com.hula.app" + namespace = "com.hula_app.app" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" - applicationId = "com.hula.app" + applicationId = "com.hula_app.app" minSdk = 24 targetSdk = 34 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() diff --git a/src-tauri/gen/android/app/src/main/java/com/hula/app/MainActivity.kt b/src-tauri/gen/android/app/src/main/java/com/hula_app/app/MainActivity.kt similarity index 59% rename from src-tauri/gen/android/app/src/main/java/com/hula/app/MainActivity.kt rename to src-tauri/gen/android/app/src/main/java/com/hula_app/app/MainActivity.kt index 80f2d28c..8559a534 100644 --- a/src-tauri/gen/android/app/src/main/java/com/hula/app/MainActivity.kt +++ b/src-tauri/gen/android/app/src/main/java/com/hula_app/app/MainActivity.kt @@ -1,3 +1,3 @@ -package com.hula.app +package com.hula_app.app class MainActivity : TauriActivity() \ No newline at end of file diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index c738ccaa..28f1aa11 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index cca2c0a3..85d0c88a 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index c738ccaa..28f1aa11 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 3265abd4..73e48dbf 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index d83db7a0..13dd2147 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 3265abd4..73e48dbf 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index db5551cc..1d98044f 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 23ac3710..a888b336 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index db5551cc..1d98044f 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index a26b7d64..08183246 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index ccf6067b..a2a838e7 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index a26b7d64..08183246 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 39f200ea..b18bceb6 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index ed5e09bf..3f8a57f3 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 39f200ea..b18bceb6 100644 Binary files a/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/gen/android/buildSrc/src/main/java/com/hula/app/kotlin/BuildTask.kt b/src-tauri/gen/android/buildSrc/src/main/java/com/hula_app/app/kotlin/BuildTask.kt similarity index 100% rename from src-tauri/gen/android/buildSrc/src/main/java/com/hula/app/kotlin/BuildTask.kt rename to src-tauri/gen/android/buildSrc/src/main/java/com/hula_app/app/kotlin/BuildTask.kt diff --git a/src-tauri/gen/android/buildSrc/src/main/java/com/hula/app/kotlin/RustPlugin.kt b/src-tauri/gen/android/buildSrc/src/main/java/com/hula_app/app/kotlin/RustPlugin.kt similarity index 100% rename from src-tauri/gen/android/buildSrc/src/main/java/com/hula/app/kotlin/RustPlugin.kt rename to src-tauri/gen/android/buildSrc/src/main/java/com/hula_app/app/kotlin/RustPlugin.kt diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index acbe78a8..bba2af4e 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -41,7 +41,7 @@ "language": "zh-CN" }, "nsis": { - "installerIcon": "./icons/windows/icon.ico", + "installerIcon": "./icons/icon.ico", "displayLanguageSelector": true, "languages": [ "SimpChinese" diff --git a/src/stores/chat.ts b/src/stores/chat.ts index 05b207ba..19a7ce6f 100644 --- a/src/stores/chat.ts +++ b/src/stores/chat.ts @@ -428,12 +428,14 @@ export const useChatStore = defineStore( recallTime }) - // 使用 Worker 来处理定时器 - timerWorker.postMessage({ - type: 'startTimer', - msgId, - duration: RECALL_EXPIRATION_TIME - }) + if (message.fromUser.uid === userStore.userInfo.uid) { + // 使用 Worker 来处理定时器 + timerWorker.postMessage({ + type: 'startTimer', + msgId, + duration: RECALL_EXPIRATION_TIME + }) + } // 记录这个消息ID已经有了定时器 expirationTimers.set(msgId, true)