From 836610d16a33058bad4574b556a2631225cf12ba Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 20 Mar 2025 19:56:57 +0800 Subject: [PATCH 1/2] :art: Displays the data index message in the status bar on mobile https://github.com/siyuan-note/siyuan/issues/14404 --- kernel/model/index.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kernel/model/index.go b/kernel/model/index.go index 516e5ff1b..23d4ab5cb 100644 --- a/kernel/model/index.go +++ b/kernel/model/index.go @@ -362,21 +362,12 @@ func init() { func subscribeSQLEvents() { // 使用下面的 EvtSQLInsertBlocksFTS 就可以了 //eventbus.Subscribe(eventbus.EvtSQLInsertBlocks, func(context map[string]interface{}, current, total, blockCount int, hash string) { - // if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container { - // // Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392 - // return - // } // // msg := fmt.Sprintf(Conf.Language(89), current, total, blockCount, hash) // util.SetBootDetails(msg) // util.ContextPushMsg(context, msg) //}) eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) { - if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container || util.ContainerHarmony == util.Container { - // Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392 - return - } - current := context["current"].(int) total := context["total"] msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash) From 52eae8a09d2bafb4a744e434759f884a2e52123e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 20 Mar 2025 19:58:38 +0800 Subject: [PATCH 2/2] :hammer: Improve Android kernel building script --- .github/CONTRIBUTING.md | 2 +- .github/CONTRIBUTING_zh_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ca818d1f0..a0d1b2cf1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -55,7 +55,7 @@ Note: In the development environment, the kernel process will not be automatical ### Android * `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/` +* `set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8; gomobile bind --tags fts5 -ldflags "-s -w" -v -o kernel.aar -target=android/arm64 -androidapi 26 ./mobile/` * https://github.com/siyuan-note/siyuan-android ### Harmony diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index a3b593679..efbb04c4f 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -57,7 +57,7 @@ NPM 镜像: ### Android * `cd kernel` -* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/` +* `set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8; gomobile bind --tags fts5 -ldflags "-s -w" -v -o kernel.aar -target=android/arm64 -androidapi 26 ./mobile/` * https://github.com/siyuan-note/siyuan-android ### Harmony