diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index a61bab28f9..f8d8aec515 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -95,8 +95,6 @@ public class HaloApp extends MultiDexApplication { private static HaloApp mInstance; - private VaApp mVaApp = new VaApp(); - private static final ArrayMap sObjectMap = new ArrayMap<>(); private String mChannel; @@ -205,7 +203,7 @@ public class HaloApp extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); - mVaApp.onCreate(this); + VaApp.get().onCreate(this); initArouter(); if (!Injection.appInit(this)) { @@ -555,7 +553,7 @@ public class HaloApp extends MultiDexApplication { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); - mVaApp.attachBaseContext(this, base); + VaApp.get().attachBaseContext(this, base); for (IApplication application : mApplicationList) { application.attachBaseContext(); } diff --git a/dependencies_vasdk.gradle b/dependencies_vasdk.gradle index be5ff40da2..5b9cb12f99 100644 --- a/dependencies_vasdk.gradle +++ b/dependencies_vasdk.gradle @@ -13,11 +13,10 @@ ext { VA_FULL_EXT = true -// newandroid.keystore 78dd3cc keyalias 78dd3cc - signing_storeFile = "${rootDir}/vasdk/va.jks" - signing_storePassword = "2015031800" - signing_keyAlias = "ltortoise" - signing_keyPassword = "2015031800" + signing_storeFile = "${rootDir}/app/gh.keystore" + signing_storePassword = "20150318" + signing_keyAlias = "gh.keystore" + signing_keyPassword = "20150318" va_proguard_rules = "${rootDir}/vasdk/proguard/proguard-rules.pro" @@ -46,7 +45,6 @@ ext { ext { project_app = ":vasdk:app" - project_accelerator = ":vasdk:accelerator" project_aidl = ":vspace-bridge:vspace" project_aidlmanager = ":vasdk:aidlmanager" project_archive = ":vasdk:archive" diff --git a/gradle.properties b/gradle.properties index 1ff774d1de..c910ad7de3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,3 +85,4 @@ android.injected.testOnly = false # 动态配置插件 isRelease = true +useVaSdk = true \ No newline at end of file diff --git a/setting_vasdk.gradle b/setting_vasdk.gradle index fd610414b4..2f002cd7a4 100644 --- a/setting_vasdk.gradle +++ b/setting_vasdk.gradle @@ -17,7 +17,6 @@ include ':vasdk:feature:ads' include ':vasdk:core' include ':vasdk:common' include ':vasdk:lib-res' -include ':vasdk:accelerator' include ':vasdk:flavor' include ':vasdk:archive' include ':vasdk:library:network'