From 9aa4c373542258cd7f830badc4f7cb18ab4f4f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9C=9F=E5=BF=83?= Date: Mon, 1 Jan 2024 19:00:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20WebSocket=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=9C=AA=E6=AD=A3=E5=B8=B8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20(close=20#182)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle.kts | 2 +- .../remote/action/handlers/GetGuildServiceProfile.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 113d4fe..21af189 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) repositories { google() mavenCentral() diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildServiceProfile.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildServiceProfile.kt index 7c6fa91..3cfc41e 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildServiceProfile.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildServiceProfile.kt @@ -4,16 +4,19 @@ import com.tencent.mobileqq.qqguildsdk.api.IGPSService import kotlinx.serialization.json.JsonElement import moe.fuqiuluo.shamrock.remote.action.ActionSession import moe.fuqiuluo.shamrock.remote.action.IActionHandler +import moe.fuqiuluo.shamrock.tools.EmptyJsonObject import moe.fuqiuluo.shamrock.tools.EmptyJsonString import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher -import mqq.app.MobileQQ -internal object GetGuildServiceProfile: IActionHandler() { +internal object GetGuildServiceProfile : IActionHandler() { override suspend fun internalHandle(session: ActionSession): String { - TODO("Not yet implemented") + return invoke(echo = session.echo) } operator fun invoke(echo: JsonElement = EmptyJsonString): String { + // TODO: get_guild_service_profile + return ok(EmptyJsonObject, echo, "此功能尚未实现") + val service = AppRuntimeFetcher.appRuntime .getRuntimeService(IGPSService::class.java, "all") if (!service.isGProSDKInitCompleted) { From a31fe92c0b555471836a54df1fca8aaeb1525485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9C=9F=E5=BF=83?= Date: Mon, 1 Jan 2024 19:01:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E9=A2=91?= =?UTF-8?q?=E9=81=93=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=20(TODO=20?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E8=BF=94=E5=9B=9E=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shamrock/remote/action/ActionManager.kt | 2 +- .../remote/action/handlers/GetGuildList.kt | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildList.kt diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt index 18546f2..e262478 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt @@ -46,7 +46,7 @@ internal object ActionManager { SetFriendAddRequest, SetGroupAddRequest, // GUILD - GetGuildServiceProfile, + GetGuildServiceProfile, GetGuildList, // WEATHER GetWeatherCityCode, GetWeather, diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildList.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildList.kt new file mode 100644 index 0000000..68f559b --- /dev/null +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGuildList.kt @@ -0,0 +1,20 @@ +package moe.fuqiuluo.shamrock.remote.action.handlers + +import kotlinx.serialization.json.JsonElement +import moe.fuqiuluo.shamrock.remote.action.ActionSession +import moe.fuqiuluo.shamrock.remote.action.IActionHandler +import moe.fuqiuluo.shamrock.tools.EmptyJsonArray +import moe.fuqiuluo.shamrock.tools.EmptyJsonString + +internal object GetGuildList : IActionHandler() { + override suspend fun internalHandle(session: ActionSession): String { + return invoke(echo = session.echo) + } + + operator fun invoke(echo: JsonElement = EmptyJsonString): String { + // TODO: get_guild_list + return ok(EmptyJsonArray, echo, "此功能尚未实现") + } + + override fun path(): String = "get_guild_list" +} \ No newline at end of file