diff --git a/app/build.gradle b/app/build.gradle index c1846fa41d..3475131677 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,6 @@ apply plugin: 'AndResGuard' import groovy.xml.XmlUtil -//aspectjx { exclude 'androidx', 'com.google', 'com.gh.gamecenter' } - android { androidExtensions { @@ -432,6 +430,7 @@ andResGuard { mergeDuplicatedRes = true whiteList = [ "R.drawable.icon", + "R.drawable.ic_bar_back", "R.drawable.bg_notification_answer_style_1", "R.drawable.bg_notification_answer_style_2", "R.drawable.bg_notification_article_style_1", @@ -480,6 +479,14 @@ andResGuard { "R.drawable.ic_quick_login_uncheck", "R.anim.anim_auth_in", "R.anim.anim_auth_out", + "R.drawable.help_search_delete", + "R.drawable.suggest_type_normal", + "R.drawable.suggest_type_crash", + "R.drawable.suggest_type_game_question", + "R.drawable.suggest_type_game_collect", + "R.drawable.suggest_type_function_suggest", + "R.drawable.suggest_type_article_collect", + "R.drawable.suggest_type_copyright" ] compressFilePattern = [ "*.png", diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 4f9da45c34..d75b52b7cc 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -142,8 +142,30 @@ } # Flutter模块 --keep public class com.gh.common.util.DirectUtils { +-keep class com.gh.common.util.DirectUtils { public static void directToQa(...); public static void directToQaCollection(...); public static void directToFeedback(...); -} \ No newline at end of file +} +-keep class com.halo.assistant.HaloApp { + private void initFlutterBoost(); + private void initFlutterDyncExtension(); + public java.lang.String getOAID(); + public java.lang.String getChannel(); + public java.lang.String getUserAgent(); +} +-keep class com.gh.common.DefaultUrlHandler {*;} +-keep class com.gh.gamecenter.R {*;} +-keep class com.gh.gamecenter.BuildConfig {*;} +-keep class com.gh.common.util.TimestampUtils { + public static java.lang.String addTimestamp(java.lang.String); +} +-keep class com.gh.gamecenter.manager.UserManager { + public java.lang.String getDeviceId(); + public java.lang.String getToken(); + public static com.gh.gamecenter.manager.UserManager getInstance(); +} +-keep class com.gh.common.exposure.meta.MetaUtil { + public static java.lang.String getBase64EncodedIMEI(); +} + diff --git a/assistant_flutter b/assistant_flutter index 270953a258..4ed61085eb 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit 270953a2582dc8e2e04678e71fa277ebbe7295d3 +Subproject commit 4ed61085eb1691c53eda80d9fffeb89e45ec743f diff --git a/build.gradle b/build.gradle index 2ad15b227e..5f02ccb5b6 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,11 @@ buildscript { ext.kotlin_version = '1.4.20' repositories { + // 阿里云仓库 + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } google() jcenter() mavenCentral() @@ -28,6 +33,10 @@ buildscript { allprojects { repositories { + // 阿里云仓库 + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } google() jcenter() mavenCentral()