diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go index 012b4b31c..b308b5a68 100644 --- a/kernel/mobile/kernel.go +++ b/kernel/mobile/kernel.go @@ -18,13 +18,13 @@ package mobile import ( "fmt" - "github.com/siyuan-note/siyuan/kernel/cache" - "github.com/siyuan-note/siyuan/kernel/job" "os" "path/filepath" "strings" "time" + "github.com/siyuan-note/siyuan/kernel/cache" + "github.com/siyuan-note/siyuan/kernel/job" "github.com/siyuan-note/siyuan/kernel/model" "github.com/siyuan-note/siyuan/kernel/server" "github.com/siyuan-note/siyuan/kernel/sql" @@ -36,10 +36,10 @@ func StartKernelFast(container, appDir, workspaceBaseDir, localIPs string) { go server.Serve(true) } -func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang string) { +func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang, osVer string) { SetTimezone(container, appDir, timezoneID) util.Mode = "prod" - + util.MobileOSVer = osVer util.LocalIPs = strings.Split(localIPs, ",") util.BootMobile(container, appDir, workspaceBaseDir, lang) diff --git a/kernel/util/os_mobile.go b/kernel/util/os_mobile.go index dc48ac4b1..41a1d5b3f 100644 --- a/kernel/util/os_mobile.go +++ b/kernel/util/os_mobile.go @@ -20,10 +20,10 @@ package util func GetOSPlatform() (plat, ver string) { if ContainerIOS == Container { - return "iOS", "" + return "iOS", MobileOSVer } if ContainerAndroid == Container { - return "Android", "" + return "Android", MobileOSVer } - return "Unknown", "" + return "Unknown", MobileOSVer } diff --git a/kernel/util/runtime.go b/kernel/util/runtime.go index 6ebea7786..336b7e310 100644 --- a/kernel/util/runtime.go +++ b/kernel/util/runtime.go @@ -45,11 +45,14 @@ const ( // IsExiting 是否正在退出程序。 var IsExiting = false +// MobileOSVer 移动端操作系统版本。 +var MobileOSVer string + func logBootInfo() { plat, platVer := GetOSPlatform() osInfo := plat if "" != platVer { - osInfo += "/" + platVer + osInfo += " " + platVer } logging.LogInfof("kernel is booting:\n"+ " * ver [%s]\n"+