Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Android): 🐛 修复安卓启动配置 #191

Merged
merged 1 commit into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"css.customData": [".vscode/tailwindcss.json"],
}
"css.customData": [
".vscode/tailwindcss.json"
],
"java.configuration.updateBuildConfiguration": "disabled",
}
2 changes: 1 addition & 1 deletion src-tauri/gen/android/app/.gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/gen/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.hula.app
package com.hula_app.app

class MainActivity : TauriActivity()
Binary file modified src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src-tauri/tauri.windows.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"language": "zh-CN"
},
"nsis": {
"installerIcon": "./icons/windows/icon.ico",
"installerIcon": "./icons/icon.ico",
"displayLanguageSelector": true,
"languages": [
"SimpChinese"
Expand Down
14 changes: 8 additions & 6 deletions src/stores/chat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading