diff --git a/app/build.gradle b/app/build.gradle index bb55f755fc..c9ab5428e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -319,7 +319,7 @@ dependencies { implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}" - implementation "com.ethanhua:skeleton:${skeleton}" + implementation "com.github.nichbar:skeleton:${skeleton}" implementation "io.supercharge:shimmerlayout:${shimmerlayout}" implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}" implementation "com.github.nichbar:AndroidRomChecker:${romChecker}" diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 3316552d83..346863530e 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -81,6 +81,8 @@ public class Constants { // 骨架图配置 public static final int SHIMMER_ANGLE = 18; public static final int SHIMMER_DURATION = 800; + public static final float MASK_WIDTH = 0.8F; + public static final float GRADIENT_CENTER_COLOR_WIDTH = 0.6F; //引导设置 “通知管理” 引导弹窗 public static final String SP_SHOWED_NOTIFICATION_LOGIN = "show_notification_login_hint"; diff --git a/app/src/main/java/com/gh/common/tracker/Tracker.kt b/app/src/main/java/com/gh/common/tracker/Tracker.kt index 64cd1cbaee..e97a6d8d22 100644 --- a/app/src/main/java/com/gh/common/tracker/Tracker.kt +++ b/app/src/main/java/com/gh/common/tracker/Tracker.kt @@ -3,6 +3,7 @@ package com.gh.common.tracker import android.app.Activity import android.app.Application import androidx.lifecycle.ProcessLifecycleOwner +import com.gh.common.runOnUiThread import java.util.* /** @@ -28,8 +29,10 @@ object Tracker : ITrack { return } - ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleWatcher(this)) - application.registerActivityLifecycleCallbacks(ActivityLifecycleWatcher(this)) + runOnUiThread { + ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleWatcher(this)) + application.registerActivityLifecycleCallbacks(ActivityLifecycleWatcher(this)) + } mIsInitialized = true } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt index 7b8ca2de2d..643aa9cf2f 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -100,6 +100,8 @@ class NewCatalogListFragment : ListFragment .angle(Constants.SHIMMER_ANGLE) .color(R.color.skeleton_shimmer_color) .duration(Constants.SHIMMER_DURATION) + .maskWidth(Constants.MASK_WIDTH) + .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) .load(R.layout.fragment_tags_skeleton) .show() } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt index 31113edc6d..8639027c82 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -61,6 +61,8 @@ class SpecialCatalogFragment : ListFragment .angle(Constants.SHIMMER_ANGLE) .color(R.color.skeleton_shimmer_color) .duration(Constants.SHIMMER_DURATION) + .maskWidth(Constants.MASK_WIDTH) + .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) .load(R.layout.fragment_tags_skeleton) .show() diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 54124e10d4..75319224a2 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -75,6 +75,8 @@ class ForumArticleAskListFragment : ListFragment() .angle(Constants.SHIMMER_ANGLE) .color(R.color.skeleton_shimmer_color) .duration(Constants.SHIMMER_DURATION) + .maskWidth(Constants.MASK_WIDTH) + .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) .load(skeletonLayoutId).show() mListViewModel.load(LoadType.REFRESH) } diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt index 23d5f1339d..4086e557ac 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -72,6 +72,8 @@ class TagsListFragment : ListFragment() { .angle(Constants.SHIMMER_ANGLE) .color(R.color.skeleton_shimmer_color) .duration(Constants.SHIMMER_DURATION) + .maskWidth(Constants.MASK_WIDTH) + .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) .load(R.layout.fragment_tags_skeleton) .show() diff --git a/dependencies.gradle b/dependencies.gradle index f1ae6959f7..08c265ec46 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -96,7 +96,7 @@ ext { flexbox = "1.1.0" pickerView = "4.1.8" verifier = "1.0.6" - skeleton = "1.1.1" + skeleton = "1.1.3" shimmerlayout = "2.1.0" mta = "6.7.9" romChecker = "1.0.2"