From 655173482a031315ef53f463f5b8ad3b018d3d97 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 25 Mar 2025 14:45:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E7=95=85=E7=8E=A9=E6=B1=89?= =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle | 1 + vasdk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 786d337940..aba92abb64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -79,6 +79,7 @@ def optionalVaModules = [ 'va-common' : 'vasdk/common', 'va-core' : 'vasdk/core', 'va-feature-realname': 'vasdk/feature/realname-window', + 'va-feature-translate': 'vasdk/feature/translate', 'va-library-commons' : 'vasdk/commons', 'va-library-network' : 'vasdk/library/network', 'va-archive' : 'vasdk/archive', diff --git a/vasdk b/vasdk index 932474708c..6685757bc4 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit 932474708cdb6f620ea713c34ae905bf8e708dd4 +Subproject commit 6685757bc4472135cbca28cde3685cfe5fe3961b From 9f4eaa67fa8a70365ec462edaf2e2bb19e72802e Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 27 Mar 2025 10:48:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=B1=89?= =?UTF-8?q?=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 3 ++- vasdk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97c7af21ec..3f6acf6237 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ android_build: only: - dev - release - + - feat/GHZSCY-7642 # 代码检查 sonarqube_analysis: tags: @@ -157,3 +157,4 @@ oss-upload&send-email: only: - dev - release + - feat/GHZSCY-7642 diff --git a/vasdk b/vasdk index 6685757bc4..c0780398a9 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit 6685757bc4472135cbca28cde3685cfe5fe3961b +Subproject commit c0780398a9f65f549e47b06b3d869db5b3a82f17 From 4ed1e1e64ab22ea4f9290b3c0ad4087b54db7a29 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 27 Mar 2025 13:44:54 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E6=B1=89=E5=8C=96=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=B5=8B=E8=AF=95=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-7642?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f6acf6237..e45b17e20b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,3 +158,4 @@ oss-upload&send-email: - dev - release - feat/GHZSCY-7642 + From bb3a84967134e93442e399fe93f92e9c93272059 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 27 Mar 2025 16:08:26 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B2=A1=E6=9C=89=E4=B8=8B=E8=BD=BD=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E7=95=85=E7=8E=A9=E6=B8=B8=E6=88=8F=EF=BC=8C=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-7642?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/vspace/VHelper.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt index 412493f712..0b5de7ed25 100644 --- a/app/src/main/java/com/gh/vspace/VHelper.kt +++ b/app/src/main/java/com/gh/vspace/VHelper.kt @@ -1460,6 +1460,8 @@ object VHelper { } } } + // 启动游戏时也执行下载插件逻辑，修复用户没有下载新的畅玩游戏，插件更新没有触发的问题。 + initVaPlugin(gameId) } catch (e: Exception) { ToastUtils.toast(e.localizedMessage ?: "") } From e769c0e5f532d90e9aaba6c632c673b904894f1a Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 7 Apr 2025 10:08:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=B1=89=E5=8C=96=E8=BF=9B=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E8=87=B4unity=E6=B8=B8=E6=88=8F=E5=8D=A1=E5=B1=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20https://jira.shanqu.cc/browse/GHZSCY-7642?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vasdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vasdk b/vasdk index c0780398a9..fb64ead307 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit c0780398a9f65f549e47b06b3d869db5b3a82f17 +Subproject commit fb64ead307ac8c74ac1a2572776907d07f118690 From d3351ec0b6a4a753cceb1f9eeec76ced9e5aad3f Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 8 Apr 2025 16:34:19 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=E8=AF=BB=E5=8F=96=E6=B1=89?= =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE=20https://jira.sh?= =?UTF-8?q?anqu.cc/browse/GHZSCY-7642?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vasdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vasdk b/vasdk index fb64ead307..a7420093cb 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit fb64ead307ac8c74ac1a2572776907d07f118690 +Subproject commit a7420093cb5f92e5535ef50e5c8ec181b9892ee8 From c23a78a5468706b2b3392a9269a91b1096d30cd7 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 13 May 2025 14:45:21 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feat:=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-7638=20https://jira.shanqu.cc/browse/GHZSCY-7879=20https://?= =?UTF-8?q?jira.shanqu.cc/browse/GHZSCY-7972=20=E6=89=93=E5=8C=85=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vasdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vasdk b/vasdk index a7420093cb..164b9c226f 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit a7420093cb5f92e5535ef50e5c8ec181b9892ee8 +Subproject commit 164b9c226f0a2916606d8544baf80791bc4b9859 From 09e439f1432a7a8715ed695c5789b3be990ff759 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 13 May 2025 15:20:46 +0800 Subject: [PATCH 08/10] =?UTF-8?q?feat:=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-7638=20=E6=9B=BF=E6=8D=A2=E6=96=B0=E7=89=88=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module_va_impl/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_va_impl/build.gradle b/module_va_impl/build.gradle index 0f94fb817d..62d526ddfd 100644 --- a/module_va_impl/build.gradle +++ b/module_va_impl/build.gradle @@ -8,7 +8,7 @@ plugins { android { // 在 DEFAULT_PLUGIN_URL 中提取插件版本号 - def defaultPluginUrl = "https://app-static.796697.com/va/plugin/2024/10/17/1.0.3_64_1729148903919.zip" + def defaultPluginUrl = "https://dev-app-static.796697.com/va/plugin/2025/05/13/1.1.0_64_1747115135347.zip" def versionText = defaultPluginUrl.substring(defaultPluginUrl.lastIndexOf("/") + 1) def pluginVersionPattern = ~/^\d+.\d+.\d+/ def matcher = versionText =~ pluginVersionPattern From 8d7afea0f642befbf3c35a25b7003d150947a28a Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 15 May 2025 16:40:36 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=E6=9B=BF=E6=8D=A2=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=832.0.0=E6=8F=92=E4=BB=B6url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module_va_impl/build.gradle | 2 +- vasdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module_va_impl/build.gradle b/module_va_impl/build.gradle index 62d526ddfd..7760fb14fe 100644 --- a/module_va_impl/build.gradle +++ b/module_va_impl/build.gradle @@ -8,7 +8,7 @@ plugins { android { // 在 DEFAULT_PLUGIN_URL 中提取插件版本号 - def defaultPluginUrl = "https://dev-app-static.796697.com/va/plugin/2025/05/13/1.1.0_64_1747115135347.zip" + def defaultPluginUrl = "https://app-static.796697.com/va/plugin/2025/05/15/2.0.0_64_1747292406020.zip" def versionText = defaultPluginUrl.substring(defaultPluginUrl.lastIndexOf("/") + 1) def pluginVersionPattern = ~/^\d+.\d+.\d+/ def matcher = versionText =~ pluginVersionPattern diff --git a/vasdk b/vasdk index 164b9c226f..950989924d 160000 --- a/vasdk +++ b/vasdk @@ -1 +1 @@ -Subproject commit 164b9c226f0a2916606d8544baf80791bc4b9859 +Subproject commit 950989924dc0c1268f5af9ffff2d9081762d4132 From 6c8c2f234039b589badf59544b7e39cb558348b5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 15 May 2025 16:43:15 +0800 Subject: [PATCH 10/10] Revert .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e45b17e20b..5df862fb6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ android_build: only: - dev - release - - feat/GHZSCY-7642 + # 代码检查 sonarqube_analysis: tags: @@ -157,5 +157,4 @@ oss-upload&send-email: only: - dev - release - - feat/GHZSCY-7642