Quellcode durchsuchen

:art: 移动端支持多工作空间 https://github.com/siyuan-note/siyuan/issues/4642

Liang Ding vor 2 Jahren
Ursprung
Commit
02a2934909
3 geänderte Dateien mit 6 neuen und 10 gelöschten Zeilen
  1. 3 3
      kernel/mobile/kernel.go
  2. 0 3
      kernel/util/working.go
  3. 3 4
      kernel/util/working_mobile.go

+ 3 - 3
kernel/mobile/kernel.go

@@ -32,16 +32,16 @@ import (
 	_ "golang.org/x/mobile/bind"
 )
 
-func StartKernelFast(container, appDir, workspaceDir, nativeLibDir, privateDataDir, localIP string) {
+func StartKernelFast(container, appDir, workspaceBaseDir, localIPs string) {
 	go server.Serve(true)
 }
 
-func StartKernel(container, appDir, workspaceDir, nativeLibDir, privateDataDir, timezoneID, localIPs, lang string) {
+func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang string) {
 	SetTimezone(container, appDir, timezoneID)
 	util.Mode = "prod"
 
 	util.LocalIPs = strings.Split(localIPs, ",")
-	util.BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, lang)
+	util.BootMobile(container, appDir, workspaceBaseDir, lang)
 
 	model.InitConf()
 	go server.Serve(false)

+ 0 - 3
kernel/util/working.go

@@ -176,9 +176,6 @@ var (
 	IconsPath      string        // 配置目录下的外观目录下的 icons/ 路径
 	SnippetsPath   string        // 数据目录下的 snippets/ 路径
 
-	AndroidNativeLibDir   string // Android 库路径
-	AndroidPrivateDataDir string // Android 私有数据路径
-
 	UIProcessIDs = sync.Map{} // UI 进程 ID
 
 	IsNewbie bool // 是否是第一次安装

+ 3 - 4
kernel/util/working_mobile.go

@@ -28,13 +28,14 @@ import (
 	"github.com/siyuan-note/logging"
 )
 
-func BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, lang string) {
+func BootMobile(container, appDir, workspaceBaseDir, lang string) {
 	IncBootProgress(3, "Booting...")
 	rand.Seed(time.Now().UTC().UnixNano())
 	initMime()
 	initHttpClient()
 
-	HomeDir = filepath.Join(workspaceDir, "home")
+	workspaceDir := filepath.Join(workspaceBaseDir, "siyuan")
+	HomeDir = filepath.Join(workspaceBaseDir, "home")
 	userHomeConfDir := filepath.Join(HomeDir, ".config", "siyuan")
 	if !gulu.File.IsExist(userHomeConfDir) {
 		os.MkdirAll(userHomeConfDir, 0755)
@@ -54,8 +55,6 @@ func BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, l
 	DBPath = filepath.Join(TempDir, DBName)
 	HistoryDBPath = filepath.Join(TempDir, "history.db")
 	BlockTreePath = filepath.Join(TempDir, "blocktree.msgpack")
-	AndroidNativeLibDir = nativeLibDir
-	AndroidPrivateDataDir = privateDataDir
 	LogPath = filepath.Join(TempDir, "siyuan.log")
 	logging.SetLogPath(LogPath)
 	AppearancePath = filepath.Join(ConfDir, "appearance")