From 69c9f83a1c6ba17d8113ec00e27c47952976a789 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 9 Sep 2020 20:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=AE=E8=82=A4=E5=BA=93no?= =?UTF-8?q?op=E5=AE=9E=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/commons/mvp/MvpActivity.java | 3 ++- .../java/com/mogo/skin/support/impl/SkinSupportInstaller.java | 2 +- .../java/com/mogo/skin/support/noop/SkinSupportInstaller.java | 4 ++-- .../java/com/mogo/skin/support/IMogoSkinSupportInstaller.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 7852521c3d..27f41aef51 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -95,6 +95,7 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > > @NonNull @Override public AppCompatDelegate getDelegate() { - return MogoSkinManager.getInstance().getInstaller().getSkinAppCompatDelegate( this, this ); + return MogoSkinManager.getInstance().getInstaller().getSkinAppCompatDelegate(this, + super.getDelegate(), this); } } diff --git a/skin/mogo-skin-support-impl/src/main/java/com/mogo/skin/support/impl/SkinSupportInstaller.java b/skin/mogo-skin-support-impl/src/main/java/com/mogo/skin/support/impl/SkinSupportInstaller.java index 4f11b5f16c..ab4ffcb3f2 100644 --- a/skin/mogo-skin-support-impl/src/main/java/com/mogo/skin/support/impl/SkinSupportInstaller.java +++ b/skin/mogo-skin-support-impl/src/main/java/com/mogo/skin/support/impl/SkinSupportInstaller.java @@ -60,7 +60,7 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller { } @Override - public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatCallback callback ) { + public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity,AppCompatDelegate superDelegate, AppCompatCallback callback ) { return SkinAppCompatDelegateImpl.get( activity, callback ); } diff --git a/skin/mogo-skin-support-noop/src/main/java/com/mogo/skin/support/noop/SkinSupportInstaller.java b/skin/mogo-skin-support-noop/src/main/java/com/mogo/skin/support/noop/SkinSupportInstaller.java index 9e5bfeb2ea..f7d09f1e96 100644 --- a/skin/mogo-skin-support-noop/src/main/java/com/mogo/skin/support/noop/SkinSupportInstaller.java +++ b/skin/mogo-skin-support-noop/src/main/java/com/mogo/skin/support/noop/SkinSupportInstaller.java @@ -36,8 +36,8 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller { } @Override - public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatCallback callback ) { - return activity.getDelegate(); + public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity,AppCompatDelegate superDelegate, AppCompatCallback callback ) { + return superDelegate; } @Override diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/IMogoSkinSupportInstaller.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/IMogoSkinSupportInstaller.java index c37a5b1e8f..a6dce85629 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/IMogoSkinSupportInstaller.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/IMogoSkinSupportInstaller.java @@ -21,5 +21,5 @@ interface IMogoSkinSupportInstaller extends IProvider { void loadSkin( SkinMode skinMode ); - AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatCallback callback ); + AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity,AppCompatDelegate superDelegate, AppCompatCallback callback ); }