diff --git a/.gitmodules b/.gitmodules index 7cbef87053..4a2a579848 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ [submodule "ndownload"] path = ndownload url = ../../../android/ndownload.git +[submodule "vasdk"] + path = vasdk + url = ../../../sdg/android/vasdk.git diff --git a/app/build.gradle b/app/build.gradle index ec8c0712c3..5064cbae8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -413,6 +413,9 @@ dependencies { exclude group: 'androidx.swiperefreshlayout' } internalImplementation(project(':module_internal_test')) + implementation(project(project_app)) { + exclude group: 'androidx.swiperefreshlayout' + } } File propFile = file('sign.properties') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 660f6b789d..1d33797dcc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -789,7 +789,8 @@ android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}" android:exported="false" - android:grantUriPermissions="true"> + android:grantUriPermissions="true" + tools:replace="android:authorities"> diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 958ab45ba8..ef9f828a97 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -79,6 +79,8 @@ import com.gh.vspace.VHelper; import com.github.piasy.biv.BigImageViewer; import com.github.piasy.biv.loader.fresco.FrescoImageLoader; import com.lg.ndownload.DownloadCore; +import com.lg.ndownload.DownloadDbManager; +import com.lg.vspace.VaApp; import com.lightgame.utils.Utils; import com.llew.huawei.verifier.LoadedApkHuaWei; import com.shuyu.gsyvideoplayer.cache.CacheFactory; @@ -95,6 +97,9 @@ import tv.danmaku.ijk.media.exo2.ExoPlayerCacheManager; public class HaloApp extends MultiDexApplication { private static HaloApp mInstance; + + private VaApp mVaApp = new VaApp(); + private static final ArrayMap sObjectMap = new ArrayMap<>(); private String mChannel; @@ -204,6 +209,7 @@ public class HaloApp extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); + mVaApp.onCreate(this); initArouter(); if (!Injection.appInit(this)) { @@ -574,6 +580,7 @@ public class HaloApp extends MultiDexApplication { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); + mVaApp.attachBaseContext(this, base); for (IApplication application : mApplicationList) { application.attachBaseContext(); } diff --git a/build.gradle b/build.gradle index 12a56d8cb4..10655ea283 100644 --- a/build.gradle +++ b/build.gradle @@ -58,10 +58,8 @@ subprojects { minSdkVersion rootProject.ext.minSdkVersion // for those defined in AndroidManifest.xml - manifestPlaceholders = [ - manifestApplicationId: "${applicationId}", - tencentAppId : "${TENCENT_APPID}", - ] + manifestPlaceholders.put("manifestApplicationId", "${applicationId}") + manifestPlaceholders.put("tencentAppId", "${TENCENT_APPID}") } lintOptions.abortOnError false diff --git a/dependencies.gradle b/dependencies.gradle index dcb0fd6f13..8c9140e592 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -143,4 +143,6 @@ ext { qGameAdVersion = "4.520.1390" blankjUtilCodex = "1.30.4" -} \ No newline at end of file +} + +apply from: 'dependencies_vasdk.gradle' \ No newline at end of file diff --git a/dependencies_vasdk.gradle b/dependencies_vasdk.gradle new file mode 100644 index 0000000000..3bdc52a7f0 --- /dev/null +++ b/dependencies_vasdk.gradle @@ -0,0 +1,67 @@ +ext { + PACKAGE_NAME = "com.gh.gamecenter" + EXT_PACKAGE_NAME = PACKAGE_NAME + ".addon" + + VA_MAIN_PACKAGE_32BIT = false + VA_ACCESS_PERMISSION_NAME = PACKAGE_NAME + ".permission.SAFE_ACCESS" + VA_AUTHORITY_PREFIX = PACKAGE_NAME + VA_EXT_AUTHORITY_PREFIX = PACKAGE_NAME + ".ext" + INSTALL_EXT_AUTHORITY_PREFIX = PACKAGE_NAME + ".install_external_app" // 在va环境内安装外部应用authority属性 + // version test + VA_VERSION = '1.6.5' + VA_VERSION_CODE = 100605 + + VA_FULL_EXT = true + +// newandroid.keystore 78dd3cc keyalias 78dd3cc + signing_storeFile = "${rootDir}/vasdk/va.jks" + signing_storePassword = "2015031800" + signing_keyAlias = "ltortoise" + signing_keyPassword = "2015031800" + + va_proguard_rules = "${rootDir}/vasdk/proguard/proguard-rules.pro" + + AIDL_CLIENT_PACKAGE_NAME = "com.gh.gamecenter" + + // 是否启用媒体存储重定向,开启必须使用共享UID模式!!! + VA_ENABLE_MEDIA_REDIRECT = false + // 媒体存储重定向的插件包名 + MEDIA_PACKAGE_NAME = "io.busniess.va.media.module" + +} + +// android dependencies +// 光环助手dependencies.gradle已经有的就不用重复定义了 +ext { + swipeRefresh = "1.1.0" + glide = "4.12.0" + mmkv = "1.2.8" + flycoTablayout = "3.0.0" + smartRefresh = "2.0.3" + versionCompare = "1.4.1" + boltsTasks = "1.4.0" + utilcodex = "com.blankj:utilcodex:1.30.4" +} +// project dependencies +ext { + project_app = ":vasdk:app" + + project_accelerator = ":vasdk:accelerator" + project_aidl = ":vasdk:aidl" + project_archive = ":vasdk:archive" + project_commons = ":vasdk:commons" + project_common = ":vasdk:common" + project_core = ":vasdk:core" + project_lib = ":vasdk:lib" + project_lib_res = ":vasdk:lib-res" + project_lib_ext = ":vasdk:lib-ext" + project_ndownload = ":ndownload" + project_sandhook = ":vasdk:sandhook" + project_floatingwindow = ":vasdk:floating-window" + project_realnamewindow = ":vasdk:realname-window" + project_feature_update = ":vasdk:feature:update" + project_feature_login = ":vasdk:feature:login" + project_feature_cloud = ":vasdk:feature:cloud" + project_library_network = ":vasdk:library:network" + project_flavor = ":vasdk:flavor" +} \ No newline at end of file diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 7830d47d19..0eaa51b133 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 7830d47d1983440f8073a518f9052196bc70b566 +Subproject commit 0eaa51b133f0e3736adcd82b98700297818aa90f diff --git a/setting_vasdk.gradle b/setting_vasdk.gradle new file mode 100644 index 0000000000..797f61c494 --- /dev/null +++ b/setting_vasdk.gradle @@ -0,0 +1,21 @@ +include ':vasdk:lib' +include ':vasdk:lib-ext' +include ':vasdk:sandhook' +include ':vasdk:app' +include ':vasdk:app-ext' +include ':vasdk:aidl' +include ':vasdk:floating-window' +include ':vasdk:MediaProvider' +include ':vasdk:commons' +include ':vasdk:realname-window' +include ':vasdk:ndownload' +include ':vasdk:feature:update' +include ':vasdk:feature:cloud' +include ':vasdk:feature:login' +include ':vasdk:core' +include ':vasdk:common' +include ':vasdk:lib-res' +include ':vasdk:accelerator' +include ':vasdk:flavor' +include ':vasdk:archive' +include ':vasdk:library:network' \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f4932c5c6d..de937b96e0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,3 +25,5 @@ include ':feature:new_feedback' include ':feature:qq_game' include ':feature:realname-window' include ':module_internal_test' + +apply from: 'setting_vasdk.gradle' \ No newline at end of file diff --git a/vasdk b/vasdk new file mode 160000 index 0000000000..e5451f9e6f --- /dev/null +++ b/vasdk @@ -0,0 +1 @@ +Subproject commit e5451f9e6f1dccbf94c4e8ba209f6819a405a31b diff --git a/vspace-bridge b/vspace-bridge index 2e0dc0bcfa..871cf52b6a 160000 --- a/vspace-bridge +++ b/vspace-bridge @@ -1 +1 @@ -Subproject commit 2e0dc0bcfaa651022f7c52ce1eae2ffb58645694 +Subproject commit 871cf52b6a73619354e176a6b8ee0b87f6108210