改进代码目录结构

.gitignore

@@ -0,0 +1 @@
+__pycache__

OlivOS/__init__.py

@@ -18,63 +18,63 @@
 
 import platform
 
-from . import infoAPI
-from . import L10NAPI
-from . import L10NDataAPI
-from . import bootAPI
-from . import bootDataAPI
-from . import data
+from .core.info import infoAPI
+from .core.L10N import L10NAPI
+from .core.L10N import L10NDataAPI
+from .core.boot import bootAPI
+from .core.boot import bootDataAPI
+from .core.inlineData import data
 from . import hook
-from . import contentAPI
-from . import messageAPI
-from . import metadataAPI
-from . import API
+from .core.core import contentAPI
+from .core.core import messageAPI
+from .core.core import metadataAPI
+from .core.core import API
 from . import thirdPartyModule
-from . import accountAPI
-from . import diagnoseAPI
-from . import flaskServerAPI
-from . import onebotV12SDK
-from . import onebotV12LinkServerAPI
-from . import pluginAPI
-from . import onebotSDK
-from . import virtualTerminalSDK
-from . import virtualTerminalLinkServerAPI
-from . import qqGuildSDK
-from . import qqGuildLinkServerAPI
-from . import qqGuildv2SDK
-from . import qqGuildv2LinkServerAPI
-from . import qqRedSDK
-from . import qqRedLinkServerAPI
-from . import telegramSDK
-from . import telegramPollServerAPI
-from . import discordSDK
-from . import discordLinkServerAPI
-from . import hackChatSDK
-from . import hackChatLinkServerAPI
-from . import dodobotEAServerAPI
-from . import dodobotEATXAPI
-from . import dodobotEASDK
-from . import dodoSDK
-from . import dodoPollServerAPI
-from . import dodoLinkSDK
-from . import dodoLinkServerAPI
-from . import dingtalkSDK
-from . import dingtalkLinkServerAPI
-from . import fanbookSDK
-from . import fanbookPollServerAPI
-from . import kaiheilaSDK
-from . import kaiheilaLinkServerAPI
-from . import mhyVilaSDK
-from . import mhyVilaLinkServerAPI
-from . import biliLiveSDK
-from . import biliLiveLinkServerAPI
-from . import updateAPI
-from . import webTool
+from .core.core import accountAPI
+from .core.core import diagnoseAPI
+from .adapter.onebotV11 import flaskServerAPI
+from .adapter.onebotV12 import onebotV12SDK
+from .adapter.onebotV12 import onebotV12LinkServerAPI
+from .core.core import pluginAPI
+from .adapter.onebotV11 import onebotSDK
+from .adapter.virtualTerminal import virtualTerminalSDK
+from .adapter.virtualTerminal import virtualTerminalLinkServerAPI
+from .adapter.qqGuild import qqGuildSDK
+from .adapter.qqGuild import qqGuildLinkServerAPI
+from .adapter.qqGuild import qqGuildv2SDK
+from .adapter.qqGuild import qqGuildv2LinkServerAPI
+from .adapter.red import qqRedSDK
+from .adapter.red import qqRedLinkServerAPI
+from .adapter.telegram import telegramSDK
+from .adapter.telegram import telegramPollServerAPI
+from .adapter.discord import discordSDK
+from .adapter.discord import discordLinkServerAPI
+from .adapter.hackChat import hackChatSDK
+from .adapter.hackChat import hackChatLinkServerAPI
+from .adapter.dodo import dodobotEAServerAPI
+from .adapter.dodo import dodobotEATXAPI
+from .adapter.dodo import dodobotEASDK
+from .adapter.dodo import dodoSDK
+from .adapter.dodo import dodoPollServerAPI
+from .adapter.dodo import dodoLinkSDK
+from .adapter.dodo import dodoLinkServerAPI
+from .adapter.dingtalk import dingtalkSDK
+from .adapter.dingtalk import dingtalkLinkServerAPI
+from .adapter.fanbook import fanbookSDK
+from .adapter.fanbook import fanbookPollServerAPI
+from .adapter.kaiheila import kaiheilaSDK
+from .adapter.kaiheila import kaiheilaLinkServerAPI
+from .adapter.mhyVila import mhyVilaSDK
+from .adapter.mhyVila import mhyVilaLinkServerAPI
+from .adapter.biliLive import biliLiveSDK
+from .adapter.biliLive import biliLiveLinkServerAPI
+from .core.web import updateAPI
+from .core.web import webTool
 if platform.system() == 'Windows':
-    from . import multiLoginUIAPI
-    from . import libEXEModelAPI
-    from . import libWQEXEModelAPI
-    from . import libCWCBEXEModelAPI
-    from . import nativeWinUIAPI
-    from . import webviewUIAPI
+    from .nativeGUI import multiLoginUIAPI
+    from .libBooter import libEXEModelAPI
+    from .libBooter import libWQEXEModelAPI
+    from .libBooter import libCWCBEXEModelAPI
+    from .nativeGUI import nativeWinUIAPI
+    from .nativeGUI import webviewUIAPI
 from . import userModule

OlivOS/hackChatLinkServerAPI.py → OlivOS/adapter/hackChat/hackChatLinkServerAPI.py

@@ -21,8 +21,6 @@
 import threading
 
 import OlivOS
-from OlivOS import hackChatSDK
-from OlivOS.qqGuildSDK import PAYLOAD
 
 modelName = 'hackChatLinkServerAPI'
 

OlivOS/infoAPI.py → OlivOS/core/info/infoAPI.py

@@ -17,8 +17,8 @@
 import OlivOS
 
 
-OlivOS_Version = '0.11.25'
-OlivOS_SVN = 145
+OlivOS_Version = '0.11.26'
+OlivOS_SVN = 146
 
 # Compatible    <= Plugin[compatible_svn]                 : Compatible
 # OldCompatible <= Plugin[compatible_svn] < Compatible    : OldCompatible Warn