From e3af1c8fafeb4afa50bc5e7e429663a089f971dd Mon Sep 17 00:00:00 2001
From: SkyD666 <1161046314@qq.com>
Date: Mon, 15 Nov 2021 00:15:21 +0800
Subject: [PATCH] =?UTF-8?q?[feature|optimize|fix]=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=BC=B9=E5=B9=95=E9=93=BE=E6=8E=A5=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=92=AD=E6=94=BE=EF=BC=9B=E6=94=AF=E6=8C=81=E5=BC=B9?=
 =?UTF-8?q?=E5=B9=95=E5=BF=AB=E8=BF=9B/=E5=90=8E=E9=80=80=EF=BC=9B?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=92=AD=E6=94=BE=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B4=EF=BC=9B=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E4=B8=BB=E9=A2=98=E6=97=A0=E6=B3=95=E6=8D=A2=E8=82=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BE=8B=E5=A6=82MaterialDialog?=
 =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=E6=8D=A2=E8=82=A4=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=BB=93=E6=9E=84=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5Banner=E6=8C=87=E7=A4=BA=E5=99=A8=E6=9C=89?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E5=8F=8A=E6=97=B6=E6=8D=A2=E8=82=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E6=94=AF=E6=8C=81=E9=99=8D?=
 =?UTF-8?q?=E4=BD=8E=E5=85=A8=E5=B1=8F=E4=B8=8B=E7=9A=84=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=BA=AE=E5=BA=A6=EF=BC=9B=E4=BF=AE=E5=A4=8DAnimeDetailActivit?=
 =?UTF-8?q?y=E7=95=8C=E9=9D=A2=E8=8E=B7=E5=8F=96=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=90=8E=E5=9C=A8IO=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dictionaries/Sky_D.xml                  |   2 +
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |  61 ++
 .idea/runConfigurations.xml                   |  10 -
 andresguard.gradle                            |   1 +
 app/build.gradle                              |   3 +-
 app/proguard-rules.pro                        |  14 +
 app/src/main/AndroidManifest.xml              |   2 +-
 .../{GetDataEnum.kt => ResponseDataType.kt}   |   2 +-
 .../AnimeSendDanmakuBean.kt}                  |   6 +-
 .../AnimeSendDanmakuResultBean.kt}            |   5 +-
 .../imomoe/bean/danmaku/SendDanmakuBean.kt    |   5 +
 .../imomoe/model/interfaces/IClassifyModel.kt |   1 +
 .../imomoe/model/interfaces/IPlayModel.kt     |   1 +
 .../skyd/imomoe/model/util/ParseHtmlUtil.kt   |   2 +-
 .../{DanmuService.kt => DanmakuService.kt}    |   8 +-
 .../main/java/com/skyd/imomoe/util/IOUtil.kt  |  13 +
 app/src/main/java/com/skyd/imomoe/util/MD5.kt |  58 +-
 .../java/com/skyd/imomoe/util/RvAdapter.kt    |  12 +-
 .../main/java/com/skyd/imomoe/util/Share.kt   |   4 +-
 .../main/java/com/skyd/imomoe/util/Util.kt    |  41 +-
 .../main/java/com/skyd/imomoe/util/View.kt    |   9 +
 .../downloadanime/AnimeDownloadService.kt     |   4 +-
 .../com/skyd/imomoe/util/html/SnifferVideo.kt |   9 +-
 .../BannerIndicatorDotSelectedColorAttr.kt    |  23 +
 .../BannerIndicatorDotUnselectedColorAttr.kt  |  23 +
 .../view/activity/AnimeDetailActivity.kt      |  14 +-
 .../view/activity/AnimeDownloadActivity.kt    |   3 +-
 .../skyd/imomoe/view/activity/BaseActivity.kt |   4 +-
 .../imomoe/view/activity/ClassifyActivity.kt  |  32 +-
 .../imomoe/view/activity/HistoryActivity.kt   |   3 +-
 .../imomoe/view/activity/LicenseActivity.kt   |  21 +-
 .../skyd/imomoe/view/activity/PlayActivity.kt |  64 +-
 .../skyd/imomoe/view/activity/RankActivity.kt |  10 +-
 .../imomoe/view/activity/SearchActivity.kt    |   7 +-
 .../imomoe/view/activity/SettingActivity.kt   |   7 +-
 .../view/activity/SimplePlayActivity.kt       |   9 +-
 .../imomoe/view/adapter/AnimeShowAdapter.kt   |   5 +-
 .../bannerview/indicator/DotIndicator.kt      |  38 +-
 .../component/player/AnimeDanmakuLoader.kt    |  48 --
 .../player/AnimeDanmakuLoaderFactory.kt       |  21 -
 .../component/player/AnimeDanmakuParser.kt    | 101 ---
 .../view/component/player/AnimeJSONSource.kt  |  78 ---
 .../view/component/player/AnimeVideoPlayer.kt | 291 ++++----
 .../view/component/player/DanmakuAdapter.kt   |  69 --
 .../component/player/DanmakuVideoPlayer.kt    | 661 ++++++++++--------
 .../view/component/player/danmaku/Const.kt    |   7 +
 .../danmaku/anime/AnimeDanmakuParser.kt       |  83 +++
 .../danmaku/anime/AnimeDanmakuSender.kt       |  62 ++
 .../danmaku/bili/BiliBiliDanmakuParser.kt     | 147 ++++
 .../imomoe/view/fragment/AnimeShowFragment.kt |   6 +-
 .../view/fragment/EverydayAnimeFragment.kt    |   1 -
 .../skyd/imomoe/view/fragment/HomeFragment.kt |  29 +-
 .../skyd/imomoe/view/fragment/RankFragment.kt |   6 +-
 .../listener/dsl/OnItemSelectedListener.kt    |  35 +
 .../listener/dsl/OnSeekBarChangeListener.kt   |  43 ++
 .../listener/dsl/OnTabSelectedListener.kt     |  43 ++
 .../imomoe/viewmodel/AnimeDetailViewModel.kt  |   6 +-
 .../viewmodel/AnimeDownloadViewModel.kt       |  18 +-
 .../imomoe/viewmodel/AnimeShowViewModel.kt    |   8 +-
 .../imomoe/viewmodel/ClassifyViewModel.kt     |  14 +-
 .../imomoe/viewmodel/RankListViewModel.kt     |   8 +-
 .../skyd/imomoe/viewmodel/SearchViewModel.kt  |   8 +-
 .../skyd/imomoe/viewmodel/SettingViewModel.kt |   5 +-
 ...arrow_circle_down_main_color_2_24_skin.xml |   2 +-
 .../ic_arrow_circle_down_white_24_skin.xml    |   2 +-
 .../res/drawable/ic_fast_forward_white_24.xml |   9 +
 .../res/drawable/ic_fast_rewind_white_24.xml  |   9 +
 .../main/res/drawable/ic_restore_white_24.xml |   9 +
 .../res/layout/fragment_everyday_anime.xml    |   1 +
 app/src/main/res/layout/fragment_home.xml     |   3 +-
 .../main/res/layout/item_anime_cover_10.xml   |   1 +
 .../main/res/layout/item_anime_cover_3.xml    |  41 +-
 .../main/res/layout/item_anime_cover_6.xml    |  23 +-
 .../main/res/layout/item_anime_cover_8.xml    |  33 +-
 .../main/res/layout/item_anime_cover_9.xml    |  47 +-
 .../item_horizontal_recycler_view_1.xml       |  16 +-
 app/src/main/res/layout/item_more_1.xml       |  11 +-
 .../res/layout/layout_anime_video_player.xml  |   4 +-
 .../layout/layout_anime_video_player_land.xml | 132 +++-
 app/src/main/res/layout/layout_toolbar_1.xml  |   4 +-
 app/src/main/res/values/colors.xml            |   2 +-
 app/src/main/res/values/strings.xml           |  26 +-
 app/src/main/res/values/themes_skin.xml       |   2 +-
 .../main/java/com/skyd/skin/SkinManager.kt    | 575 ++-------------
 .../java/com/skyd/skin/core/SkinAttrsSet.kt   |   4 +-
 .../skyd/skin/core/attrs/BackgroundAttr.kt    |  28 +-
 .../skin/core/attrs/BackgroundTintAttr.kt     |  19 +-
 .../skyd/skin/core/attrs/ButtonTintAttr.kt    |  20 +-
 .../core/attrs/CardBackgroundColorAttr.kt     |  21 +-
 .../skyd/skin/core/attrs/ColorPrimaryAttr.kt  |  18 +-
 .../skyd/skin/core/attrs/ContentScrimAttr.kt  |  12 +-
 .../skyd/skin/core/attrs/DrawableEndAttr.kt   |  33 +-
 .../skyd/skin/core/attrs/DrawableStartAttr.kt |  33 +-
 .../skin/core/attrs/DrawableTopCompatAttr.kt  |  36 +-
 .../skyd/skin/core/attrs/ImageViewTintAttr.kt |  17 +-
 .../skin/core/attrs/IndeterminateTintAttr.kt  |  20 +-
 .../skin/core/attrs/ProgressDrawableAttr.kt   |  25 +-
 .../core/attrs/ScrollbarThumbVerticalAttr.kt  |  30 +-
 .../java/com/skyd/skin/core/attrs/SkinAttr.kt |   1 +
 .../java/com/skyd/skin/core/attrs/SrcAttr.kt  |  28 +-
 .../skin/core/attrs/SrlPrimaryColorAttr.kt    |  35 +-
 .../skin/core/attrs/TabIndicatorColorAttr.kt  |  18 +-
 .../skyd/skin/core/attrs/TabTextColorAttr.kt  |  17 +-
 .../com/skyd/skin/core/attrs/TextColorAttr.kt |  16 +-
 .../skyd/skin/core/attrs/TextColorHintAttr.kt |  21 +-
 .../com/skyd/skin/core/attrs/ThumbAttr.kt     |  24 +-
 .../com/skyd/skin/core/attrs/ThumbTintAttr.kt |  20 +-
 .../com/skyd/skin/core/attrs/TrackTintAttr.kt |  20 +-
 .../src/main/res/values/themes_skin_blue.xml  |   2 +-
 .../skin_dark/ExampleInstrumentedTest.kt      |   2 +-
 .../src/main/res/values/themes_skin_dark.xml  |   2 +-
 .../skin_dark/ExampleUnitTest.kt              |   2 +-
 .../skin_lemon/ExampleInstrumentedTest.kt     |   2 +-
 .../src/main/res/values/themes_skin_lemon.xml |   2 +-
 .../skin_lemon/ExampleUnitTest.kt             |   2 +-
 .../ExampleInstrumentedTest.kt                |   2 +-
 .../src/main/AndroidManifest.xml              |   2 +-
 .../res/values/themes_skin_sweat_soybean.xml  |   2 +-
 .../skin_sweat_soybean/ExampleUnitTest.kt     |   2 +-
 version.gradle                                |  18 +-
 121 files changed, 2071 insertions(+), 1773 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 rename app/src/main/java/com/skyd/imomoe/bean/{GetDataEnum.kt => ResponseDataType.kt} (67%)
 rename app/src/main/java/com/skyd/imomoe/bean/{SendDanmuBean.kt => danmaku/AnimeSendDanmakuBean.kt} (85%)
 rename app/src/main/java/com/skyd/imomoe/bean/{SendDanmuResultBean.kt => danmaku/AnimeSendDanmakuResultBean.kt} (68%)
 create mode 100644 app/src/main/java/com/skyd/imomoe/bean/danmaku/SendDanmakuBean.kt
 rename app/src/main/java/com/skyd/imomoe/net/service/{DanmuService.kt => DanmakuService.kt} (74%)
 create mode 100644 app/src/main/java/com/skyd/imomoe/util/IOUtil.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotSelectedColorAttr.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotUnselectedColorAttr.kt
 delete mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoader.kt
 delete mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoaderFactory.kt
 delete mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuParser.kt
 delete mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/AnimeJSONSource.kt
 delete mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuAdapter.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/Const.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuParser.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuSender.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/bili/BiliBiliDanmakuParser.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnItemSelectedListener.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnSeekBarChangeListener.kt
 create mode 100644 app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnTabSelectedListener.kt
 create mode 100644 app/src/main/res/drawable/ic_fast_forward_white_24.xml
 create mode 100644 app/src/main/res/drawable/ic_fast_rewind_white_24.xml
 create mode 100644 app/src/main/res/drawable/ic_restore_white_24.xml
 rename skin_dark/src/androidTest/java/com/{cyeasybuy => skyd}/skin_dark/ExampleInstrumentedTest.kt (95%)
 rename skin_dark/src/test/java/com/{cyeasybuy => skyd}/skin_dark/ExampleUnitTest.kt (90%)
 rename skin_lemon/src/androidTest/java/com/{cyeasybuy => skyd}/skin_lemon/ExampleInstrumentedTest.kt (95%)
 rename skin_lemon/src/test/java/com/{cyeasybuy => skyd}/skin_lemon/ExampleUnitTest.kt (90%)
 rename skin_sweat_soybean/src/androidTest/java/com/{cyeasybuy => skyd}/skin_sweat_soybean/ExampleInstrumentedTest.kt (94%)
 rename skin_sweat_soybean/src/test/java/com/{cyeasybuy => skyd}/skin_sweat_soybean/ExampleUnitTest.kt (88%)

diff --git a/.idea/dictionaries/Sky_D.xml b/.idea/dictionaries/Sky_D.xml
index 8fc5169a..6505d716 100644
--- a/.idea/dictionaries/Sky_D.xml
+++ b/.idea/dictionaries/Sky_D.xml
@@ -2,6 +2,7 @@
   <dictionary name="Sky_D">
     <words>
       <w>anime</w>
+      <w>bilibili</w>
       <w>bugly</w>
       <w>ctiao</w>
       <w>danmaku</w>
@@ -12,6 +13,7 @@
       <w>iframe</w>
       <w>imomoe</w>
       <w>jsoup</w>
+      <w>kuaishou</w>
       <w>mobileqq</w>
       <w>sakura</w>
       <w>shuyu</w>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c6e6e30f..34d74680 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6199cc2a..23c8afed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_arrow_circle_down_main_color_2_24_skin.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_arrow_circle_down_white_24_skin.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_fast_forward_white_24.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_fast_rewind_white_24.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_restore_white_24.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/ic_round_arrow_circle_down_24.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/drawable/selector_horizontal_reverse_button_skin.xml" value="0.3764102564102564" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout-sw600dp-land/activity_play.xml" value="0.14609375" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout-sw600dp-port/activity_play.xml" value="0.12773224043715847" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_about.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_anime_detail.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_classify.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_history.xml" value="0.2046875" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_license.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_month_anime.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_notice.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_play.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/activity_simple_play.xml" value="0.17806484295845998" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/fragment_everyday_anime.xml" value="0.25" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/fragment_home.xml" value="0.67" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_10.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_2.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_3.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_4.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_5.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_6.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_8.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_cover_9.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_describe_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_episode_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_episode_2.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_episode_flow_layout_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_episode_flow_layout_2.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_info_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_anime_type_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_banner_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_dlna_device_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_grid_recycler_view_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_header_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_horizontal_recycler_view_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_license_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_license_header_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_more_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_player_list_item_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_search_history_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_search_history_header_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_skin_cover_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_spinner_item_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/item_text_view_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/layout_anime_video_player.xml" value="0.23072916666666668" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/layout_anime_video_player_land.xml" value="0.33" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/layout_circle_progress_text_tip_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/layout_toolbar_1.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Imomoe/app/src/main/res/layout/widget_everyday_anime.xml" value="0.36614583333333334" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea5..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/andresguard.gradle b/andresguard.gradle
index ab0e2b0e..1f971194 100644
--- a/andresguard.gradle
+++ b/andresguard.gradle
@@ -4,6 +4,7 @@ def whiteList = [
         // skin
         "R.drawable.*_skin*",
         "R.color.*_skin*",
+        "R.style.*.skin*",
         // for your icon
         "R.mipmap.ic_launcher",
         "R.mipmap.ic_launcher_round",
diff --git a/app/build.gradle b/app/build.gradle
index 11aa080b..10b6d1ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,6 +118,7 @@ android {
         exclude 'org/eclipse/jetty/**'
         exclude 'org/fourthline/cling/**'
         exclude 'okhttp3/internal/**'
+        exclude 'com/badlogic/**'
     }
 
     buildFeatures {
@@ -166,8 +167,8 @@ dependencies {
     implementation deps.smart.refresh_layout_kernel
     implementation deps.smart.refresh_header_material
     implementation deps.smart.refresh_footer_ball
-    implementation deps.ctiao.DanmakuFlameMaster
     implementation deps.coil_kt.coil
+    implementation deps.kuaishou.akdanmaku
     implementation project(':skin')
     implementation project(':skin_blue')
     implementation project(':skin_dark')
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5dfc3fc6..7f4f78a9 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -113,6 +113,7 @@ public static final int *;
     *** get*();
     void set*(***);
     public <init>(android.content.Context);
+    public <init>(android.content.Context, java.lang.Boolean);
     public <init>(android.content.Context, android.util.AttributeSet);
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
@@ -162,6 +163,19 @@ public static final int *;
 #-keep class org.seamless.statemachine.** {;}
 #-keepclassmembers class * implements org.fourthline.cling.support.avtransport.impl.state.AbstractState {;}
 
+#-------------------------AkDanmaku v1.0.3
+-dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
+-dontwarn com.badlogic.gdx.utils.GdxBuild
+-dontwarn com.badlogic.gdx.jnigen.BuildTarget*
+-dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild
+-keep class com.kuaishou.akdanmaku.ecs.system.ActionSystem { *; }
+-keep class com.kuaishou.akdanmaku.ecs.system.DanmakuSystem { *; }
+-keep class com.kuaishou.akdanmaku.ecs.system.DataSystem { *; }
+-keep class com.kuaishou.akdanmaku.ecs.system.RenderSystem { *; }
+-keep class com.kuaishou.akdanmaku.ecs.system.layout.LayoutSystem { *; }
+# Required if using Gdx-Controllers extension
+-keep class com.badlogic.gdx.controllers.android.AndroidControllers
+
 #-------------------------
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.AppCompatActivity
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c09ae051..d094424f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.樱花动漫"
+        android:theme="@style/Theme.Anime.skin"
         android:usesCleartextTraffic="true">
         <activity android:name=".view.activity.NoticeActivity" />
         <activity
diff --git a/app/src/main/java/com/skyd/imomoe/bean/GetDataEnum.kt b/app/src/main/java/com/skyd/imomoe/bean/ResponseDataType.kt
similarity index 67%
rename from app/src/main/java/com/skyd/imomoe/bean/GetDataEnum.kt
rename to app/src/main/java/com/skyd/imomoe/bean/ResponseDataType.kt
index edcd6d21..c61c798c 100644
--- a/app/src/main/java/com/skyd/imomoe/bean/GetDataEnum.kt
+++ b/app/src/main/java/com/skyd/imomoe/bean/ResponseDataType.kt
@@ -1,5 +1,5 @@
 package com.skyd.imomoe.bean
 
-enum class GetDataEnum {
+enum class ResponseDataType {
     FAILED, REFRESH, LOAD_MORE
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/bean/SendDanmuBean.kt b/app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuBean.kt
similarity index 85%
rename from app/src/main/java/com/skyd/imomoe/bean/SendDanmuBean.kt
rename to app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuBean.kt
index 2ea5cded..eb44d07e 100644
--- a/app/src/main/java/com/skyd/imomoe/bean/SendDanmuBean.kt
+++ b/app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuBean.kt
@@ -1,9 +1,9 @@
-package com.skyd.imomoe.bean
+package com.skyd.imomoe.bean.danmaku
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
-class SendDanmuBean(
+class AnimeSendDanmakuBean(
     @SerializedName("author")
     var author: String,
     @SerializedName("color")
@@ -20,4 +20,4 @@ class SendDanmuBean(
     var time: Double,
     @SerializedName("type")
     var type: String
-) : Serializable
+) : SendDanmakuBean
diff --git a/app/src/main/java/com/skyd/imomoe/bean/SendDanmuResultBean.kt b/app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuResultBean.kt
similarity index 68%
rename from app/src/main/java/com/skyd/imomoe/bean/SendDanmuResultBean.kt
rename to app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuResultBean.kt
index ab2659de..79a8eeff 100644
--- a/app/src/main/java/com/skyd/imomoe/bean/SendDanmuResultBean.kt
+++ b/app/src/main/java/com/skyd/imomoe/bean/danmaku/AnimeSendDanmakuResultBean.kt
@@ -1,8 +1,9 @@
-package com.skyd.imomoe.bean
+package com.skyd.imomoe.bean.danmaku
 
 import com.google.gson.annotations.SerializedName
+import com.skyd.imomoe.bean.BaseBean
 
-class SendDanmuResultBean(
+class AnimeSendDanmakuResultBean(
     override var type: String,
     override var actionUrl: String,
     @SerializedName("code")
diff --git a/app/src/main/java/com/skyd/imomoe/bean/danmaku/SendDanmakuBean.kt b/app/src/main/java/com/skyd/imomoe/bean/danmaku/SendDanmakuBean.kt
new file mode 100644
index 00000000..62975e89
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/bean/danmaku/SendDanmakuBean.kt
@@ -0,0 +1,5 @@
+package com.skyd.imomoe.bean.danmaku
+
+import java.io.Serializable
+
+interface SendDanmakuBean : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/model/interfaces/IClassifyModel.kt b/app/src/main/java/com/skyd/imomoe/model/interfaces/IClassifyModel.kt
index d12446ed..25df4234 100644
--- a/app/src/main/java/com/skyd/imomoe/model/interfaces/IClassifyModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/model/interfaces/IClassifyModel.kt
@@ -9,6 +9,7 @@ import com.skyd.imomoe.bean.PageNumberBean
  * 获取分类界面数据的接口
  */
 interface IClassifyModel : IBase {
+    @Deprecated("This method will cause a memory leak!!!")
     fun setActivity(activity: Activity)
 
     fun clearActivity()
diff --git a/app/src/main/java/com/skyd/imomoe/model/interfaces/IPlayModel.kt b/app/src/main/java/com/skyd/imomoe/model/interfaces/IPlayModel.kt
index d4d517f4..357c8d85 100644
--- a/app/src/main/java/com/skyd/imomoe/model/interfaces/IPlayModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/model/interfaces/IPlayModel.kt
@@ -10,6 +10,7 @@ import com.skyd.imomoe.bean.PlayBean
  * 获取播放界面数据的接口
  */
 interface IPlayModel : IBase {
+    @Deprecated("This function will cause a memory leak!!!")
     fun setActivity(activity: Activity)
 
     fun clearActivity()
diff --git a/app/src/main/java/com/skyd/imomoe/model/util/ParseHtmlUtil.kt b/app/src/main/java/com/skyd/imomoe/model/util/ParseHtmlUtil.kt
index 569170f9..d3aff4e9 100644
--- a/app/src/main/java/com/skyd/imomoe/model/util/ParseHtmlUtil.kt
+++ b/app/src/main/java/com/skyd/imomoe/model/util/ParseHtmlUtil.kt
@@ -33,7 +33,7 @@ object ParseHtmlUtil {
                     "a" -> {
                         url = liChildren[j].attr("href")
                         cover = liChildren[j].select("img").attr("src")
-                        title = liChildren[j].select("p").first().ownText()
+                        title = liChildren[j].select("p").first()!!.ownText()
                         describe = liChildren[j].select("p").select("span").text()
                     }
                     "em" -> {
diff --git a/app/src/main/java/com/skyd/imomoe/net/service/DanmuService.kt b/app/src/main/java/com/skyd/imomoe/net/service/DanmakuService.kt
similarity index 74%
rename from app/src/main/java/com/skyd/imomoe/net/service/DanmuService.kt
rename to app/src/main/java/com/skyd/imomoe/net/service/DanmakuService.kt
index e6743c98..1bc10966 100644
--- a/app/src/main/java/com/skyd/imomoe/net/service/DanmuService.kt
+++ b/app/src/main/java/com/skyd/imomoe/net/service/DanmakuService.kt
@@ -1,6 +1,6 @@
 package com.skyd.imomoe.net.service
 
-import com.skyd.imomoe.bean.SendDanmuResultBean
+import com.skyd.imomoe.bean.danmaku.AnimeSendDanmakuResultBean
 import com.skyd.imomoe.config.Api
 import okhttp3.RequestBody
 import retrofit2.Call
@@ -9,12 +9,12 @@ import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.Query
 
-interface DanmuService {
+interface DanmakuService {
     @Headers(value = ["Content-Type: application/json", "Accept: application/json"])
     @POST(Api.DANMU_URL)
-    fun sendDanmu(
+    fun sendDanmaku(
         @Query("ac") ac: String,
         @Query("key") key: String,
         @Body json: RequestBody
-    ): Call<SendDanmuResultBean>
+    ): Call<AnimeSendDanmakuResultBean>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/util/IOUtil.kt b/app/src/main/java/com/skyd/imomoe/util/IOUtil.kt
new file mode 100644
index 00000000..75717c90
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/util/IOUtil.kt
@@ -0,0 +1,13 @@
+package com.skyd.imomoe.util
+
+import java.io.InputStream
+
+fun InputStream.string(): String {
+    val out = StringBuffer()
+    val b = ByteArray(4096)
+    var n: Int
+    while (this.read(b).also { n = it } != -1) {
+        out.append(String(b, 0, n))
+    }
+    return out.toString()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/util/MD5.kt b/app/src/main/java/com/skyd/imomoe/util/MD5.kt
index 9e2879ea..671821cd 100644
--- a/app/src/main/java/com/skyd/imomoe/util/MD5.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/MD5.kt
@@ -10,37 +10,35 @@ import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 
 
-object MD5 {
-    fun getMD5(f: File): String? {
-        var bi: BigInteger? = null
-        try {
-            val buffer = ByteArray(8192)
-            var len = 0
-            val md = MessageDigest.getInstance("MD5")
-            val fis = FileInputStream(f)
-            while (fis.read(buffer).also { len = it } != -1) {
-                md.update(buffer, 0, len)
-            }
-            fis.close()
-            val b = md.digest()
-            bi = BigInteger(1, b)
-        } catch (e: NoSuchAlgorithmException) {
-            e.printStackTrace()
-        } catch (e: IOException) {
-            e.printStackTrace()
+fun File.toMD5(): String? {
+    var bi: BigInteger? = null
+    try {
+        val buffer = ByteArray(8192)
+        var len: Int
+        val md = MessageDigest.getInstance("MD5")
+        val fis = FileInputStream(this)
+        while (fis.read(buffer).also { len = it } != -1) {
+            md.update(buffer, 0, len)
         }
-        return bi?.toString(16)
+        fis.close()
+        val b = md.digest()
+        bi = BigInteger(1, b)
+    } catch (e: NoSuchAlgorithmException) {
+        e.printStackTrace()
+    } catch (e: IOException) {
+        e.printStackTrace()
     }
+    return bi?.toString(16)
+}
 
-    fun getMD5(s: String): String {
-        try {
-            val messageDigest = MessageDigest.getInstance("MD5")
-            val md5bytes = messageDigest.digest(s.toByteArray(charset("UTF-8")))
-            return ByteString.of(*md5bytes).hex()
-        } catch (e: NoSuchAlgorithmException) {
-            throw AssertionError(e)
-        } catch (e: UnsupportedEncodingException) {
-            throw AssertionError(e)
-        }
+fun String.toMD5(): String {
+    try {
+        val messageDigest = MessageDigest.getInstance("MD5")
+        val md5bytes = messageDigest.digest(toByteArray(charset("UTF-8")))
+        return ByteString.of(*md5bytes).hex()
+    } catch (e: NoSuchAlgorithmException) {
+        throw AssertionError(e)
+    } catch (e: UnsupportedEncodingException) {
+        throw AssertionError(e)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/skyd/imomoe/util/RvAdapter.kt b/app/src/main/java/com/skyd/imomoe/util/RvAdapter.kt
index 1160d5cf..9a1e52e2 100644
--- a/app/src/main/java/com/skyd/imomoe/util/RvAdapter.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/RvAdapter.kt
@@ -1,7 +1,7 @@
 package com.skyd.imomoe.util
 
 import androidx.recyclerview.widget.RecyclerView
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 
 /**
  * 根据GetDataEnum状态自动更新
@@ -9,25 +9,25 @@ import com.skyd.imomoe.bean.GetDataEnum
  * @param deltaDataSet 新数据集
  * @param dataSet 构造adapter时传入的list
  */
-fun <T> RecyclerView.Adapter<RecyclerView.ViewHolder>.smartNotifyDataSetChanged(
-    type: GetDataEnum,
+fun <T, VH : RecyclerView.ViewHolder> RecyclerView.Adapter<VH>.smartNotifyDataSetChanged(
+    type: ResponseDataType,
     deltaDataSet: MutableList<T>,
     dataSet: MutableList<T>
 ) {
     when (type) {
-        GetDataEnum.REFRESH -> {
+        ResponseDataType.REFRESH -> {
             val count = dataSet.size
             dataSet.clear()
             notifyItemRangeRemoved(0, count)
             dataSet.addAll(deltaDataSet)
             notifyItemRangeInserted(0, deltaDataSet.size)
         }
-        GetDataEnum.LOAD_MORE -> {
+        ResponseDataType.LOAD_MORE -> {
             val index = dataSet.size
             dataSet.addAll(deltaDataSet)
             notifyItemRangeInserted(index, deltaDataSet.size)
         }
-        GetDataEnum.FAILED -> {
+        ResponseDataType.FAILED -> {
             val count = dataSet.size
             dataSet.clear()
             notifyItemRangeRemoved(0, count)
diff --git a/app/src/main/java/com/skyd/imomoe/util/Share.kt b/app/src/main/java/com/skyd/imomoe/util/Share.kt
index d6cf39ad..a76ee6a2 100644
--- a/app/src/main/java/com/skyd/imomoe/util/Share.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/Share.kt
@@ -6,7 +6,7 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
-import com.skyd.imomoe.util.Util.copyText2Clipboard
+import com.skyd.imomoe.util.Util.copy2Clipboard
 import com.skyd.imomoe.util.Util.showToast
 
 object Share {
@@ -65,7 +65,7 @@ object Share {
                 )
             }
             SHARE_LINK -> {
-                copyText2Clipboard(activity, shareContent)
+                shareContent.copy2Clipboard(activity)
                 activity.resources.getString(R.string.already_copy_to_clipboard).showToast()
             }
         }
diff --git a/app/src/main/java/com/skyd/imomoe/util/Util.kt b/app/src/main/java/com/skyd/imomoe/util/Util.kt
index 4a161846..0d881b01 100644
--- a/app/src/main/java/com/skyd/imomoe/util/Util.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/Util.kt
@@ -272,11 +272,11 @@ object Util {
         return result
     }
 
-    fun copyText2Clipboard(context: Context, text: String) {
+    fun String.copy2Clipboard(context: Context) {
         try {
             val systemService: ClipboardManager =
                 context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            systemService.setPrimaryClip(ClipData.newPlainText("text", text))
+            systemService.setPrimaryClip(ClipData.newPlainText("text", this))
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -495,24 +495,24 @@ object Util {
         return outPoint.x
     }
 
-    fun getFileSize(f: File): Long {
+    fun File.fileSize(): Long {
         var s: Long = 0
-        if (f.exists() && f.isFile) {
-            val fis = FileInputStream(f)
+        if (this.exists() && this.isFile) {
+            val fis = FileInputStream(this)
             s = fis.available().toLong()
         }
         return s
     }
 
-    fun getDirectorySize(f: File): Long {
+    fun File.directorySize(): Long {
         var size: Long = 0
-        val fList = f.listFiles()
+        val fList = listFiles()
         fList?.let {
             for (i in it.indices) {
                 size += if (it[i].isDirectory) {
-                    getDirectorySize(it[i])
+                    it[i].directorySize()
                 } else {
-                    getFileSize(it[i])
+                    it[i].fileSize()
                 }
             }
         }
@@ -613,20 +613,17 @@ object Util {
                 decodeUrl.startsWith(Const.ActionUrl.ANIME_SKIP_BY_WEBSITE) -> { // 根据网址跳转
                     var website = decodeUrl.replaceFirst(Const.ActionUrl.ANIME_SKIP_BY_WEBSITE, "")
                     if (website.isBlank() || website == "/") {
-                        MaterialDialog(activity).show {
-                            input(hintRes = R.string.input_a_website) { dialog, text ->
-                                try {
-                                    var url = text.toString()
-                                    if (!url.matches(Regex("^.+://.*"))) url = "http://$url"
-                                    process(activity, URL(url).file)
-                                } catch (e: Exception) {
-                                    App.context.resources.getString(R.string.website_format_error)
-                                        .showToast()
-                                    e.printStackTrace()
-                                }
+                        MaterialDialog(activity).input(hintRes = R.string.input_a_website) { dialog, text ->
+                            try {
+                                var url = text.toString()
+                                if (!url.matches(Regex("^.+://.*"))) url = "http://$url"
+                                process(activity, URL(url).file)
+                            } catch (e: Exception) {
+                                App.context.resources.getString(R.string.website_format_error)
+                                    .showToast()
+                                e.printStackTrace()
                             }
-                            positiveButton(R.string.ok)
-                        }
+                        }.positiveButton(R.string.ok).show()
                     } else {
                         try {
                             if (!website.matches(Regex("^.+://.*"))) website = "http://$website"
diff --git a/app/src/main/java/com/skyd/imomoe/util/View.kt b/app/src/main/java/com/skyd/imomoe/util/View.kt
index b6f4be22..2f084ae4 100644
--- a/app/src/main/java/com/skyd/imomoe/util/View.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/View.kt
@@ -3,6 +3,15 @@ package com.skyd.imomoe.util
 import android.view.View
 import android.view.animation.AlphaAnimation
 
+fun View.enable() {
+    if (isEnabled) return
+    isEnabled = true
+}
+
+fun View.disable() {
+    if (!isEnabled) return
+    isEnabled = false
+}
 
 fun View.gone(animate: Boolean = false, dur: Long = 500L) {
     if (visibility == View.GONE) return
diff --git a/app/src/main/java/com/skyd/imomoe/util/downloadanime/AnimeDownloadService.kt b/app/src/main/java/com/skyd/imomoe/util/downloadanime/AnimeDownloadService.kt
index 516244a8..213b8604 100644
--- a/app/src/main/java/com/skyd/imomoe/util/downloadanime/AnimeDownloadService.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/downloadanime/AnimeDownloadService.kt
@@ -20,11 +20,11 @@ import com.skyd.imomoe.R
 import com.skyd.imomoe.config.Const.DownloadAnime.Companion.animeFilePath
 import com.skyd.imomoe.database.entity.AnimeDownloadEntity
 import com.skyd.imomoe.database.getAppDataBase
-import com.skyd.imomoe.util.MD5.getMD5
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper.Companion.downloadHashMap
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper.Companion.save2Xml
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadNotificationReceiver.Companion.DOWNLOAD_ANIME_NOTIFICATION_ID
+import com.skyd.imomoe.util.toMD5
 import com.skyd.imomoe.view.activity.MainActivity
 import kotlinx.coroutines.*
 import java.io.File
@@ -61,7 +61,7 @@ class AnimeDownloadService : Service() {
                     if (file.exists()) {
                         downloadHashMap[key]?.postValue(AnimeDownloadStatus.COMPLETE)
                         GlobalScope.launch(Dispatchers.IO) {
-                            getMD5(file)?.let {
+                            file.toMD5()?.let {
                                 val entity = AnimeDownloadEntity(it, title, fileName)
                                 getAppDataBase().animeDownloadDao().insertAnimeDownload(entity)
                                 save2Xml(animeDir, entity)
diff --git a/app/src/main/java/com/skyd/imomoe/util/html/SnifferVideo.kt b/app/src/main/java/com/skyd/imomoe/util/html/SnifferVideo.kt
index f25df632..3af8cc4d 100644
--- a/app/src/main/java/com/skyd/imomoe/util/html/SnifferVideo.kt
+++ b/app/src/main/java/com/skyd/imomoe/util/html/SnifferVideo.kt
@@ -34,7 +34,7 @@ object SnifferVideo {
         return when (type) {
             0 -> {
                 Jsoup.parse(html).select("body")[0].select("[class=player]")[0]
-                    .getElementById("playbox").select("iframe")[0]
+                    .getElementById("playbox")!!.select("iframe")[0]
                     .attr("src")
             }
             1 -> {
@@ -63,7 +63,7 @@ object SnifferVideo {
                     }
                 }
                 Jsoup.parse(html)
-                    .select("body")[0].getElementById("player")
+                    .select("body")[0].getElementById("player")!!
                     .select("[class=leleplayer-video-wrap]")
                     .select("video").attr("src")
             }
@@ -191,7 +191,10 @@ object SnifferVideo {
                         put(REFEREER_URL, this@SnifferVideo.referer)
                         put(
                             DANMU_URL,
-                            "https:$serverApi/barrage/api?ac=dm&key=$serverKey&id=$videoId"
+                            "$serverApi/barrage/api?ac=dm&key=$serverKey&id=$videoId".run {
+                                if (this.startsWith("http")) this
+                                else "https:" + this
+                            }
                         )
                         callback(html, this)
                     }
diff --git a/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotSelectedColorAttr.kt b/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotSelectedColorAttr.kt
new file mode 100644
index 00000000..6f279236
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotSelectedColorAttr.kt
@@ -0,0 +1,23 @@
+package com.skyd.imomoe.util.skin.attrs
+
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.skyd.imomoe.view.component.bannerview.indicator.DotIndicator
+import com.skyd.skin.core.SkinResourceProcessor
+import com.skyd.skin.core.attrs.SkinAttr
+
+
+class BannerIndicatorDotSelectedColorAttr : SkinAttr() {
+    override fun applySkin(view: View) {
+        if (attrResourceRefId != -1 && view is DotIndicator) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.mSelectedColor = ContextCompat.getColor(view.context, attrResourceRefId)
+            } else {
+                view.mSelectedColor = skinResProcessor.getColor(attrResourceRefId)
+            }
+        }
+    }
+
+    override fun tag(): String = "bannerIndicatorDotSelectedColorAttr"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotUnselectedColorAttr.kt b/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotUnselectedColorAttr.kt
new file mode 100644
index 00000000..141a533f
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/util/skin/attrs/BannerIndicatorDotUnselectedColorAttr.kt
@@ -0,0 +1,23 @@
+package com.skyd.imomoe.util.skin.attrs
+
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.skyd.imomoe.view.component.bannerview.indicator.DotIndicator
+import com.skyd.skin.core.SkinResourceProcessor
+import com.skyd.skin.core.attrs.SkinAttr
+
+
+class BannerIndicatorDotUnselectedColorAttr : SkinAttr() {
+    override fun applySkin(view: View) {
+        if (attrResourceRefId != -1 && view is DotIndicator) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.mUnSelectedColor = ContextCompat.getColor(view.context, attrResourceRefId)
+            } else {
+                view.mUnSelectedColor = skinResProcessor.getColor(attrResourceRefId)
+            }
+        }
+    }
+
+    override fun tag(): String = "bannerIndicatorDotUnselectedColorAttr"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDetailActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDetailActivity.kt
index 8e76ce93..d9dde0bb 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDetailActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDetailActivity.kt
@@ -13,6 +13,7 @@ import com.skyd.imomoe.config.Api
 import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.database.getAppDataBase
 import com.skyd.imomoe.databinding.ActivityAnimeDetailBinding
+import com.skyd.imomoe.util.Util.getResDrawable
 import com.skyd.imomoe.util.Util.getSkinResourceId
 import com.skyd.imomoe.util.Util.getStatusBarHeight
 import com.skyd.imomoe.util.Util.setTransparentStatusBar
@@ -60,6 +61,7 @@ class AnimeDetailActivity : BaseActivity<ActivityAnimeDetailBinding>() {
             tvToolbar1Title.isFocused = true
             ivToolbar1Back.setOnClickListener { finish() }
             // 分享
+            ivToolbar1Button1.setImageDrawable(getResDrawable(R.drawable.ic_share_white_24))
             ivToolbar1Button1.visible()
             ivToolbar1Button1.setOnClickListener {
                 ShareDialogFragment().setShareContent(Api.MAIN_URL + partUrl)
@@ -68,14 +70,12 @@ class AnimeDetailActivity : BaseActivity<ActivityAnimeDetailBinding>() {
             // 收藏
             lifecycleScope.launch(Dispatchers.IO) {
                 val favoriteAnime = getAppDataBase().favoriteAnimeDao().getFavoriteAnime(partUrl)
-                isFavorite = if (favoriteAnime == null) {
-                    ivToolbar1Button2.setImageResource(R.drawable.ic_star_border_white_24)
-                    false
-                } else {
-                    ivToolbar1Button2.setImageResource(R.drawable.ic_star_white_24_skin)
-                    true
-                }
+                isFavorite = favoriteAnime != null
                 withContext(Dispatchers.Main) {
+                    ivToolbar1Button2.setImageResource(
+                        if (isFavorite) R.drawable.ic_star_white_24_skin else
+                            R.drawable.ic_star_border_white_24
+                    )
                     ivToolbar1Button2.visible()
                 }
             }
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDownloadActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDownloadActivity.kt
index 2126e9cf..3667bb94 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDownloadActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/AnimeDownloadActivity.kt
@@ -14,6 +14,7 @@ import com.skyd.imomoe.R
 import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.databinding.ActivityAnimeDownloadBinding
 import com.skyd.imomoe.util.Util
+import com.skyd.imomoe.util.Util.getResDrawable
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.gone
 import com.skyd.imomoe.util.visible
@@ -44,7 +45,7 @@ class AnimeDownloadActivity : BaseActivity<ActivityAnimeDownloadBinding>() {
             llAnimeDownloadActivityToolbar.tvToolbar1Title.text = actionBarTitle
             llAnimeDownloadActivityToolbar.ivToolbar1Back.setOnClickListener { finish() }
             llAnimeDownloadActivityToolbar.ivToolbar1Button1.visible()
-            llAnimeDownloadActivityToolbar.ivToolbar1Button1.setImageResource(R.drawable.ic_info_white_24)
+            llAnimeDownloadActivityToolbar.ivToolbar1Button1.setImageDrawable(getResDrawable(R.drawable.ic_info_white_24))
             llAnimeDownloadActivityToolbar.ivToolbar1Button1.setOnClickListener {
                 MaterialDialog(this@AnimeDownloadActivity).show {
                     title(res = R.string.attention)
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/BaseActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/BaseActivity.kt
index cb2d2a5f..499a2153 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/BaseActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/BaseActivity.kt
@@ -23,7 +23,7 @@ abstract class BaseActivity<VB : ViewBinding> : SkinBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setTheme(SkinResourceProcessor.instance.getSkinThemeId(R.style.Theme_樱花动漫))
+        setTheme(SkinResourceProcessor.instance.getSkinThemeId(R.style.Theme_Anime_skin))
         mBinding = getBinding()
         setContentView(mBinding.root)
         setColorStatusBar(window, getResColor(R.color.main_color_2_skin))
@@ -31,7 +31,7 @@ abstract class BaseActivity<VB : ViewBinding> : SkinBaseActivity() {
 
     override fun onChangeSkin() {
         super.onChangeSkin()
-        setTheme(SkinResourceProcessor.instance.getSkinThemeId(R.style.Theme_樱花动漫))
+        setTheme(SkinResourceProcessor.instance.getSkinThemeId(R.style.Theme_Anime_skin))
     }
 
     override fun onChangeStatusBarSkin() {
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/ClassifyActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/ClassifyActivity.kt
index 15971176..34cb4ac4 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/ClassifyActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/ClassifyActivity.kt
@@ -5,11 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -18,13 +15,14 @@ import com.skyd.imomoe.App
 import com.skyd.imomoe.R
 import com.skyd.imomoe.bean.ClassifyBean
 import com.skyd.imomoe.bean.ClassifyDataBean
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.databinding.ActivityClassifyBinding
 import com.skyd.imomoe.util.Util.getResColor
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.smartNotifyDataSetChanged
 import com.skyd.imomoe.view.adapter.BaseRvAdapter
 import com.skyd.imomoe.view.adapter.SearchAdapter
+import com.skyd.imomoe.view.listener.dsl.setOnItemSelectedListener
 import com.skyd.imomoe.viewmodel.ClassifyViewModel
 
 
@@ -64,7 +62,7 @@ class ClassifyActivity : BaseActivity<ActivityClassifyBinding>() {
                 //避免刷新间隔太短
                 if (System.currentTimeMillis() - lastRefreshTime > 500) {
                     lastRefreshTime = System.currentTimeMillis()
-                    if (viewModel.mldClassifyTabList.value?.second == GetDataEnum.REFRESH)
+                    if (viewModel.mldClassifyTabList.value?.second == ResponseDataType.REFRESH)
                         viewModel.getClassifyData(currentPartUrl)
                     else viewModel.getClassifyTabData()
                 } else {
@@ -90,25 +88,25 @@ class ClassifyActivity : BaseActivity<ActivityClassifyBinding>() {
             rvClassifyActivity.adapter = classifyAdapter
 
             spinnerClassifyActivity.adapter = spinnerAdapter
-            spinnerClassifyActivity.onItemSelectedListener = object : OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>, view: View,
-                    pos: Int, id: Long
-                ) {
+            spinnerClassifyActivity.setOnItemSelectedListener {
+                onItemSelected { parent, view, position, id ->
                     if (view is TextView) view.setTextColor(getResColor(R.color.foreground_main_color_2_skin))
+                    // 为什么下面注释的代码不能替代以下三行呢？？
+//                    classifyTabAdapter.smartNotifyDataSetChanged(
+//                        ResponseDataType.REFRESH,
+//                        viewModel.classifyTabList[position].classifyDataList,
+//                        classifyTabList
+//                    )
                     classifyTabList.clear()
-                    classifyTabList.addAll(viewModel.classifyTabList[pos].classifyDataList)
+                    classifyTabList.addAll(viewModel.classifyTabList[position].classifyDataList)
                     classifyTabAdapter.notifyDataSetChanged()
                 }
-
-                override fun onNothingSelected(parent: AdapterView<*>) {
-                }
             }
         }
 
         viewModel.mldClassifyTabList.observe(this, {
             when (it.second) {
-                GetDataEnum.REFRESH -> {
+                ResponseDataType.REFRESH -> {
                     viewModel.classifyTabList.apply {
                         clear()
                         spinnerAdapter.clear()
@@ -144,7 +142,7 @@ class ClassifyActivity : BaseActivity<ActivityClassifyBinding>() {
                         if (!found) tabSelected(currentPartUrl)
                     }
                 }
-                GetDataEnum.FAILED -> {
+                ResponseDataType.FAILED -> {
                     viewModel.classifyTabList.apply {
                         clear()
                         spinnerAdapter.clear()
@@ -160,7 +158,7 @@ class ClassifyActivity : BaseActivity<ActivityClassifyBinding>() {
             mBinding.srlClassifyActivity.closeHeaderOrFooter()
             viewModel.isRequesting = false
             classifyAdapter.smartNotifyDataSetChanged(it.first, it.second, viewModel.classifyList)
-            if (it.first == GetDataEnum.REFRESH) {
+            if (it.first == ResponseDataType.REFRESH) {
                 mBinding.llClassifyActivityToolbar.tvToolbar1Title.text =
                     if (classifyTabTitle.isEmpty()) "${getString(R.string.anime_classify)}  $classifyTitle"
                     else "${getString(R.string.anime_classify)}  ${
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/HistoryActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/HistoryActivity.kt
index 0f5a9a25..4276d985 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/HistoryActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/HistoryActivity.kt
@@ -11,6 +11,7 @@ import com.skyd.imomoe.bean.HistoryBean
 import com.skyd.imomoe.databinding.ActivityHistoryBinding
 import com.skyd.imomoe.util.Util.dp
 import com.skyd.imomoe.util.Util.getResColor
+import com.skyd.imomoe.util.Util.getResDrawable
 import com.skyd.imomoe.util.visible
 import com.skyd.imomoe.view.adapter.HistoryAdapter
 import com.skyd.imomoe.viewmodel.HistoryViewModel
@@ -72,7 +73,7 @@ class HistoryActivity : BaseActivity<ActivityHistoryBinding>() {
             ivToolbar1Button1.setOnClickListener {
                 if (viewModel.historyList.isEmpty()) return@setOnClickListener
                 MaterialDialog(this@HistoryActivity).show {
-                    icon(R.drawable.ic_delete_main_color_2_24_skin)
+                    icon(drawable = getResDrawable(R.drawable.ic_delete_main_color_2_24_skin))
                     title(res = R.string.warning)
                     message(text = "确定要删除所有观看历史记录？")
                     positiveButton(res = R.string.delete) { viewModel.deleteAllHistory() }
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/LicenseActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/LicenseActivity.kt
index ffc05003..191bccd9 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/LicenseActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/LicenseActivity.kt
@@ -17,13 +17,6 @@ class LicenseActivity : BaseActivity<ActivityLicenseBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        mBinding.run {
-            llLicenseActivityToolbar.tvToolbar1Title.text = getString(R.string.open_source_licenses)
-            llLicenseActivityToolbar.ivToolbar1Back.setOnClickListener { finish() }
-            rvLicenseActivity.layoutManager = LinearLayoutManager(this@LicenseActivity)
-            rvLicenseActivity.adapter = adapter
-        }
-
         list.add(LicenseBean(ViewHolderTypeString.LICENSE_HEADER_1, "", "", "", ""))
         list.add(
             LicenseBean(
@@ -155,12 +148,18 @@ class LicenseActivity : BaseActivity<ActivityLicenseBinding>() {
             LicenseBean(
                 ViewHolderTypeString.LICENSE_1,
                 ActionUrl.ANIME_BROWSER,
-                "https://github.com/bilibili/DanmakuFlameMaster",
-                "DanmakuFlameMaster",
-                "Apache-2.0 License"
+                "https://github.com/KwaiAppTeam/AkDanmaku",
+                "AkDanmaku",
+                "MIT License"
             )
         )
-        adapter.notifyDataSetChanged()
+
+        mBinding.run {
+            llLicenseActivityToolbar.tvToolbar1Title.text = getString(R.string.open_source_licenses)
+            llLicenseActivityToolbar.ivToolbar1Back.setOnClickListener { finish() }
+            rvLicenseActivity.layoutManager = LinearLayoutManager(this@LicenseActivity)
+            rvLicenseActivity.adapter = adapter
+        }
     }
 
     override fun getBinding(): ActivityLicenseBinding =
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/PlayActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/PlayActivity.kt
index 1e574ea7..73c8a225 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/PlayActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/PlayActivity.kt
@@ -24,7 +24,7 @@ import com.shuyu.gsyvideoplayer.model.VideoOptionModel
 import com.shuyu.gsyvideoplayer.player.PlayerFactory
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoView.CURRENT_STATE_AUTO_COMPLETE
+import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
 import com.skyd.imomoe.bean.AnimeEpisodeDataBean
@@ -34,9 +34,7 @@ import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.database.getAppDataBase
 import com.skyd.imomoe.databinding.ActivityPlayBinding
 import com.skyd.imomoe.model.DataSourceManager
-import com.skyd.imomoe.util.AnimeEpisode2ViewHolder
-import com.skyd.imomoe.util.MD5.getMD5
-import com.skyd.imomoe.util.Util
+import com.skyd.imomoe.util.*
 import com.skyd.imomoe.util.Util.dp
 import com.skyd.imomoe.util.Util.getDetailLinkByEpisodeLink
 import com.skyd.imomoe.util.Util.getResColor
@@ -46,9 +44,7 @@ import com.skyd.imomoe.util.Util.openVideoByExternalPlayer
 import com.skyd.imomoe.util.Util.setColorStatusBar
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper
-import com.skyd.imomoe.util.gone
 import com.skyd.imomoe.util.html.SnifferVideo
-import com.skyd.imomoe.util.visible
 import com.skyd.imomoe.view.adapter.AnimeDetailAdapter
 import com.skyd.imomoe.view.adapter.PlayAdapter
 import com.skyd.imomoe.view.adapter.decoration.AnimeEpisodeItemDecoration
@@ -79,8 +75,8 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
     private lateinit var viewModel: PlayViewModel
     private lateinit var adapter: PlayAdapter
     private var isFirstTime = true
-    private var danmuUrl: String = ""
-    private var danmuParamMap: HashMap<String, String> = HashMap()
+    private var danmakuUrl: String = ""
+    private var danmakuParamMap: HashMap<String, String> = HashMap()
     private var currentNightMode: Int = 0
     private var lastCanCollapsed: Boolean? = null
 
@@ -253,7 +249,7 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
 //                    danmuParamMap.putAll(paramMap)
                     runOnUiThread {
                         AnimeDownloadHelper.instance.downloadAnime(
-                            this, videoUrl, getMD5(videoUrl),
+                            this, videoUrl, videoUrl.toMD5(),
                             viewModel.playBean?.title?.title + "/" +
                                     viewModel.episodesList[it].title
                         )
@@ -262,7 +258,7 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
                 return@Observer
             } else {
                 AnimeDownloadHelper.instance.downloadAnime(
-                    this, url, getMD5(url),
+                    this, url, url.toMD5(),
                     viewModel.playBean?.title?.title + "/" +
                             viewModel.episodesList[it].title
                 )
@@ -312,7 +308,7 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
                 viewModel.insertHistoryData(detailPartUrl)
             }
             if (!viewModel.animeEpisodeDataBean.videoUrl.endsWith("\$qzz", true)) {
-                danmuUrl = ""
+                danmakuUrl = ""
                 setUp(
                     viewModel.animeEpisodeDataBean.videoUrl,
                     false, viewModel.animeEpisodeDataBean.title
@@ -323,9 +319,9 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
                     partUrl,
                     detailPartUrl
                 ) { videoUrl, paramMap ->
-                    danmuParamMap.clear()
-                    danmuParamMap.putAll(paramMap)
-                    danmuUrl = paramMap[SnifferVideo.DANMU_URL] ?: ""
+                    danmakuParamMap.clear()
+                    danmakuParamMap.putAll(paramMap)
+                    danmakuUrl = paramMap[SnifferVideo.DANMU_URL] ?: ""
                     runOnUiThread {
                         setUp(videoUrl, false, viewModel.animeEpisodeDataBean.title)
                         //开始播放
@@ -343,14 +339,14 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
                 viewModel.insertHistoryData(detailPartUrl)
             }
             if (!url.endsWith("\$qzz", true)) {
-                danmuUrl = ""
+                danmakuUrl = ""
                 setUp(url, false, title)
             } else {
                 SnifferVideo.getQzzVideoUrl(this@PlayActivity, partUrl, detailPartUrl)
                 { videoUrl, paramMap ->
-                    danmuParamMap.clear()
-                    danmuParamMap.putAll(paramMap)
-                    danmuUrl = paramMap[SnifferVideo.DANMU_URL] ?: ""
+                    danmakuParamMap.clear()
+                    danmakuParamMap.putAll(paramMap)
+                    danmakuUrl = paramMap[SnifferVideo.DANMU_URL] ?: ""
                     setUp(videoUrl, false, title)
                     // 开始播放
                     startPlayLogic()
@@ -370,17 +366,30 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
     override fun onVideoSizeChanged() {
         mBinding.apply {
             val tag = avpPlayActivity.tag
-            if (tag is String && tag == "sw600dp-land") return
+            val state = avpPlayActivity.currentPlayer.currentState
+            if (avpPlayActivity.isIfCurrentIsFullscreen ||
+                state == GSYVideoView.CURRENT_STATE_ERROR ||
+                state == GSYVideoView.CURRENT_STATE_AUTO_COMPLETE ||
+                state == GSYVideoView.CURRENT_STATE_PREPAREING ||
+                (tag is String && tag == "sw600dp-land")
+            ) {
+                return
+            }
+            val videoHeight: Int = avpPlayActivity.currentVideoHeight
+            val videoWidth: Int = avpPlayActivity.currentVideoWidth
+            if (videoHeight <= 10 || videoWidth <= 10) return
+            val ratio = videoWidth.toDouble() / videoHeight
+            if (ratio < 0.001) return
             avpPlayActivity.measure(
                 View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
                 View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
             )
-            val videoHeight: Int = avpPlayActivity.currentVideoHeight
-            val videoWidth: Int = avpPlayActivity.currentVideoWidth
-            val ratio = videoWidth.toDouble() / videoHeight
             val playerWidth: Int = avpPlayActivity.width
             if (abs(playerWidth.toDouble() / avpPlayActivity.height - ratio) < 0.001) return
             var playerHeight = playerWidth / ratio
+            avpPlayActivity.currentPlayer.let {
+                if (it is DanmakuVideoPlayer) playerHeight += it.getDanmakuControllerHeight()
+            }
             val parentHeight = Util.getScreenHeight(true)
             if (playerHeight > parentHeight * 0.75) playerHeight = parentHeight * 0.75
             val layoutParams: ViewGroup.LayoutParams = avpPlayActivity.layoutParams
@@ -420,9 +429,9 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
         //毫秒,刚好划一屏1分35秒
         mBinding.avpPlayActivity.currentPlayer.apply {
             seekRatio = duration / 90_000f
-            if (danmuUrl.isNotBlank() && this is DanmakuVideoPlayer && !this@PlayActivity.isDestroyed) {
-                this@PlayActivity.getString(R.string.the_video_has_danmu).showToast()
-                this.setDanmaKuUrl(danmuUrl, paramMap = danmuParamMap)
+            if (danmakuUrl.isNotBlank() && this is DanmakuVideoPlayer && !this@PlayActivity.isDestroyed) {
+                this@PlayActivity.getString(R.string.the_video_has_danmaku).showToast()
+                this.setDanmakuUrl(danmakuUrl, paramMap = danmakuParamMap)
             }
         }
     }
@@ -432,8 +441,9 @@ class PlayActivity : DetailPlayerActivity<DanmakuVideoPlayer, ActivityPlayBindin
         mBinding.apply {
             canCollapsed(!playing)
             tvPlayActivityToolbarTitle?.text =
-                if (avpPlayActivity.currentState == CURRENT_STATE_AUTO_COMPLETE)
-                    getString(R.string.replay_video)
+                if (avpPlayActivity.currentPlayer.currentState ==
+                    GSYVideoView.CURRENT_STATE_AUTO_COMPLETE
+                ) getString(R.string.replay_video)
                 else getString(R.string.play_video_now)
         }
     }
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/RankActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/RankActivity.kt
index ff85a8ad..130f1b3f 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/RankActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/RankActivity.kt
@@ -75,12 +75,10 @@ class RankActivity : BaseActivity<ActivityRankBinding>() {
                     adapter.addFragment(fragment)
                 }
             } else {
-                showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry),
-                    View.OnClickListener {
-                        viewModel.getRankTabData()
-                        hideLoadFailedTip()
-                    }
-                )
+                showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry)) {
+                    viewModel.getRankTabData()
+                    hideLoadFailedTip()
+                }
             }
             adapter.notifyDataSetChanged()
             viewModel.isRequesting = false
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/SearchActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/SearchActivity.kt
index 96389a29..bb00514e 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/SearchActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/SearchActivity.kt
@@ -7,12 +7,11 @@ import android.view.KeyEvent
 import android.view.inputmethod.EditorInfo
 import android.widget.RelativeLayout
 import android.widget.TextView
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.bean.SearchHistoryBean
 import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.databinding.ActivitySearchBinding
@@ -96,13 +95,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
                 if (mBinding.rvSearchActivity.adapter != adapter) setSearchAdapter()
                 adapter.smartNotifyDataSetChanged(it.first, it.second, viewModel.searchResultList)
                 when (it.first) {
-                    GetDataEnum.REFRESH, GetDataEnum.LOAD_MORE -> {
+                    ResponseDataType.REFRESH, ResponseDataType.LOAD_MORE -> {
                         mBinding.tvSearchActivityTip.text = getString(
                             R.string.search_activity_tip, viewModel.keyWord,
                             viewModel.searchResultList.size
                         )
                     }
-                    GetDataEnum.FAILED -> {
+                    ResponseDataType.FAILED -> {
                         mBinding.tvSearchActivityTip.text =
                             getString(R.string.search_activity_failed)
                     }
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/SettingActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/SettingActivity.kt
index 4715e1a2..681baf86 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/SettingActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/SettingActivity.kt
@@ -15,6 +15,7 @@ import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.databinding.ActivitySettingBinding
 import com.skyd.imomoe.model.DataSourceManager
 import com.skyd.imomoe.util.Util.getAppVersionName
+import com.skyd.imomoe.util.Util.getResDrawable
 import com.skyd.imomoe.util.Util.restartApp
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.Util.showToastOnIOThread
@@ -54,7 +55,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
         mBinding.tvSettingActivityDeleteAllHistoryInfo.isFocused = true
         mBinding.rlSettingActivityDeleteAllHistory.setOnClickListener {
             MaterialDialog(this).show {
-                icon(R.drawable.ic_delete_main_color_2_24_skin)
+                icon(drawable = getResDrawable(R.drawable.ic_delete_main_color_2_24_skin))
                 title(res = R.string.warning)
                 message(text = "确定要删除所有历史记录？包括搜索历史和观看历史")
                 positiveButton(res = R.string.delete) { viewModel.deleteAllHistory() }
@@ -80,7 +81,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
         mBinding.tvSettingActivityClearCache.isFocused = true
         mBinding.rlSettingActivityClearCache.setOnClickListener {
             MaterialDialog(this).show {
-                icon(R.drawable.ic_sd_storage_main_color_2_24_skin)
+                icon(drawable = getResDrawable(R.drawable.ic_sd_storage_main_color_2_24_skin))
                 title(res = R.string.warning)
                 message(text = "确定清理所有缓存？不包括缓存视频")
                 positiveButton(res = R.string.clean) { viewModel.clearAllCache() }
@@ -150,7 +151,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
         mBinding.switchSettingActivityCustomDataSource.setOnCheckedChangeListener { buttonView, isChecked ->
             if (DataSourceManager.useCustomDataSource == isChecked) return@setOnCheckedChangeListener
             MaterialDialog(this).show {
-                icon(R.drawable.ic_category_main_color_2_24_skin)
+                icon(drawable = getResDrawable(R.drawable.ic_category_main_color_2_24_skin))
                 title(res = R.string.warning)
                 message(res = if (isChecked) R.string.custom_data_source_tip else R.string.request_restart_app)
                 cancelable(false)
diff --git a/app/src/main/java/com/skyd/imomoe/view/activity/SimplePlayActivity.kt b/app/src/main/java/com/skyd/imomoe/view/activity/SimplePlayActivity.kt
index 531b3246..cf3190d1 100644
--- a/app/src/main/java/com/skyd/imomoe/view/activity/SimplePlayActivity.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/activity/SimplePlayActivity.kt
@@ -6,14 +6,17 @@ import androidx.lifecycle.lifecycleScope
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
 import com.shuyu.gsyvideoplayer.model.VideoOptionModel
+import com.shuyu.gsyvideoplayer.player.PlayerFactory
+import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils
 import com.skyd.imomoe.database.getAppDataBase
 import com.skyd.imomoe.databinding.ActivitySimplePlayBinding
-import com.skyd.imomoe.util.MD5.getMD5
 import com.skyd.imomoe.util.Util.setFullScreen
 import com.skyd.imomoe.util.gone
+import com.skyd.imomoe.util.toMD5
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import tv.danmaku.ijk.media.exo2.Exo2PlayerManager
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
 import java.io.File
 
@@ -34,6 +37,8 @@ class SimplePlayActivity : BaseActivity<ActivitySimplePlayBinding>() {
         init()
 
         mBinding.run {
+            PlayerFactory.setPlayManager(Exo2PlayerManager().javaClass)
+            GSYVideoType.disableMediaCodec()        // 关闭硬解码
             avpSimplePlayActivity.startPlayLogic()
             orientationUtils.resolveByClick()
             avpSimplePlayActivity.startWindowFullscreen(
@@ -44,7 +49,7 @@ class SimplePlayActivity : BaseActivity<ActivitySimplePlayBinding>() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 val title = getAppDataBase().animeDownloadDao()
-                    .getAnimeDownloadTitleByMd5(getMD5(File(url.replaceFirst("file://", ""))) ?: "")
+                    .getAnimeDownloadTitleByMd5(File(url.replaceFirst("file://", "")).toMD5() ?: "")
                     ?: this@SimplePlayActivity.title
                 runOnUiThread {
                     avpSimplePlayActivity.titleTextView?.text = title
diff --git a/app/src/main/java/com/skyd/imomoe/view/adapter/AnimeShowAdapter.kt b/app/src/main/java/com/skyd/imomoe/view/adapter/AnimeShowAdapter.kt
index d36fb2cf..7bd153f0 100644
--- a/app/src/main/java/com/skyd/imomoe/view/adapter/AnimeShowAdapter.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/adapter/AnimeShowAdapter.kt
@@ -26,6 +26,7 @@ import com.skyd.imomoe.util.Util.dp
 import com.skyd.imomoe.util.Util.getResColor
 import com.skyd.imomoe.util.Util.getResDrawable
 import com.skyd.imomoe.view.adapter.decoration.AnimeCoverItemDecoration
+import com.skyd.skin.SkinManager
 
 class AnimeShowAdapter(
     val fragment: AnimeShowFragment,
@@ -126,7 +127,9 @@ class AnimeShowAdapter(
                 fragment.activity?.let {
                     item.animeCoverList?.let { it1 ->
                         holder.banner1.setAdapter(MyCycleBannerAdapter(it, it1))
-                        holder.banner1.setIndicator(DotIndicator(it))
+                        holder.banner1.setIndicator(DotIndicator(it).apply {
+                            SkinManager.setViewTag(this)
+                        })
                         holder.banner1.startPlay(5000)
                     }
                 }
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/bannerview/indicator/DotIndicator.kt b/app/src/main/java/com/skyd/imomoe/view/component/bannerview/indicator/DotIndicator.kt
index 9909f94c..7c8754cd 100644
--- a/app/src/main/java/com/skyd/imomoe/view/component/bannerview/indicator/DotIndicator.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/component/bannerview/indicator/DotIndicator.kt
@@ -8,16 +8,28 @@ import android.widget.RelativeLayout
 import com.skyd.imomoe.R
 import com.skyd.imomoe.util.Util.dp
 import com.skyd.imomoe.util.Util.getResColor
+import com.skyd.imomoe.util.skin.attrs.BannerIndicatorDotSelectedColorAttr
+import com.skyd.imomoe.util.skin.attrs.BannerIndicatorDotUnselectedColorAttr
+import com.skyd.skin.SkinManager
+import com.skyd.skin.core.listeners.ChangeCustomSkinListener
 
 /**
  * Created by Sky_D on 2021-02-08.
  */
-class DotIndicator : View, Indicator {
+class DotIndicator : View, Indicator, ChangeCustomSkinListener {
     private val mPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)        //抗锯齿
     private var mRadius: Float = 3f.dp
     private var mDotsPadding = 3.dp
-    private var mSelectedColor: Int = context.getResColor(R.color.main_color_2_skin)
-    private var mUnSelectedColor: Int = context.getResColor(R.color.foreground_white_skin)
+    var mSelectedColor: Int = context.getResColor(R.color.main_color_2_skin)
+        set(value) {
+            field = value
+            invalidate()
+        }
+    var mUnSelectedColor: Int = context.getResColor(R.color.foreground_white_skin)
+        set(value) {
+            field = value
+            invalidate()
+        }
     private var mDotsCount = 0
     private var mCurrentPosition = 0
 
@@ -85,4 +97,24 @@ class DotIndicator : View, Indicator {
             }
         }
     }
+
+    override fun setCustomTag() {
+        SkinManager.setCustomViewAttrs(this,
+            BannerIndicatorDotSelectedColorAttr().apply {
+                attrResourceRefId = R.color.main_color_2_skin
+            },
+            BannerIndicatorDotUnselectedColorAttr().apply {
+                attrResourceRefId = R.color.foreground_white_skin
+            }
+        )
+    }
+
+    override fun changeCustomSkin() {
+        SkinManager.getCustomViewAttrs(this).let {
+            it ?: return@let
+            it.attrsMap.forEach { entry ->
+                entry.value.applySkin(this)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoader.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoader.kt
deleted file mode 100644
index 4b74735c..00000000
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoader.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.skyd.imomoe.view.component.player
-
-import android.net.Uri
-import master.flame.danmaku.danmaku.loader.ILoader
-import master.flame.danmaku.danmaku.loader.IllegalDataException
-import java.io.InputStream
-import java.net.URL
-import kotlin.jvm.Throws
-
-class AnimeDanmakuLoader private constructor() : ILoader {
-    private var dataSource: AnimeJSONSource? = null
-    override fun getDataSource(): AnimeJSONSource? {
-        return dataSource
-    }
-
-    @Throws(IllegalDataException::class)
-    fun load(url: URL) {
-        dataSource = try {
-            AnimeJSONSource(url)
-        } catch (e: Exception) {
-            throw IllegalDataException(e)
-        }
-    }
-
-    @Throws(IllegalDataException::class)
-    override fun load(uri: String) {
-        dataSource = try {
-            AnimeJSONSource(Uri.parse(uri))
-        } catch (e: Exception) {
-            throw IllegalDataException(e)
-        }
-    }
-
-    @Throws(IllegalDataException::class)
-    override fun load(`in`: InputStream) {
-        dataSource = try {
-            AnimeJSONSource(`in`)
-        } catch (e: Exception) {
-            throw IllegalDataException(e)
-        }
-    }
-
-    companion object {
-        val instance: AnimeDanmakuLoader by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            AnimeDanmakuLoader()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoaderFactory.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoaderFactory.kt
deleted file mode 100644
index 9924e630..00000000
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuLoaderFactory.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.skyd.imomoe.view.component.player
-
-import master.flame.danmaku.danmaku.loader.ILoader
-import master.flame.danmaku.danmaku.loader.android.AcFunDanmakuLoader
-import master.flame.danmaku.danmaku.loader.android.BiliDanmakuLoader
-
-class AnimeDanmakuLoaderFactory {
-    companion object {
-        var TAG_BILI = "bili"
-        var TAG_ACFUN = "acfun"
-        var TAG_ANIME = "anime"
-        fun create(tag: String): ILoader? {
-            return when {
-                TAG_BILI.equals(tag, ignoreCase = true) -> BiliDanmakuLoader.instance()
-                TAG_ACFUN.equals(tag, ignoreCase = true) -> AcFunDanmakuLoader.instance()
-                TAG_ANIME.equals(tag, ignoreCase = true) -> AnimeDanmakuLoader.instance
-                else -> AnimeDanmakuLoader.instance
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuParser.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuParser.kt
deleted file mode 100644
index 7fc8ddeb..00000000
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeDanmakuParser.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.skyd.imomoe.view.component.player
-
-import android.graphics.Color
-import com.skyd.imomoe.BuildConfig
-import com.skyd.imomoe.util.Text.shield
-import master.flame.danmaku.danmaku.model.android.Danmakus
-import master.flame.danmaku.danmaku.parser.BaseDanmakuParser
-import org.json.JSONArray
-import org.json.JSONException
-import java.util.*
-
-class AnimeDanmakuParser : BaseDanmakuParser() {
-    public override fun parse(): Danmakus {
-        if (mDataSource != null && mDataSource is AnimeJSONSource) {
-            val jsonSource = mDataSource as AnimeJSONSource
-            return doParse(jsonSource.data())
-        }
-        return Danmakus()
-    }
-
-    /**
-     * @param danmakuListData 弹幕数据
-     * 传入的数组内包含普通弹幕，会员弹幕，锁定弹幕。
-     * @return 转换后的Danmakus
-     */
-    private fun doParse(danmakuListData: JSONArray?): Danmakus {
-        var danmakus = Danmakus()
-        if (danmakuListData == null || danmakuListData.length() == 0) {
-            return danmakus
-        }
-        danmakus = _parse(danmakuListData, danmakus)
-        return danmakus
-    }
-
-    private fun _parse(jsonArray: JSONArray?, danmakus: Danmakus): Danmakus {
-        if (jsonArray == null || jsonArray.length() == 0) {
-            return danmakus
-        }
-        for (i in 0 until jsonArray.length()) {
-            try {
-                val array = jsonArray.getJSONArray(i)
-                val text = array.getString(4)
-                // 如果此条弹幕应该屏蔽，则直接continue到下一条
-                if (text.shield()) continue
-                val type = getType(array.getString(1))          // 弹幕类型
-                val time = (array.getDouble(0) * 1000).toLong() // 出现时间
-                val color = getColor(array.getString(2))
-                var textSize = 27.5f
-                if (array.length() >= 8) {
-                    textSize = array.getString(7).replace("px", "").toFloat()
-                }
-                val item = mContext.mDanmakuFactory.createDanmaku(type, mContext)
-                if (item != null) {
-                    item.time = time
-                    item.textSize = 0.7f * textSize * (mDispDensity - 0.6f)
-                    item.textColor = color
-                    item.textShadowColor = if (color <= Color.BLACK) Color.WHITE else Color.BLACK
-                    item.index = i
-                    item.flags = mContext.mGlobalFlagValues
-                    item.timer = mTimer
-                    item.text = text
-                    danmakus.addItem(item)
-                }
-            } catch (e: JSONException) {
-                e.printStackTrace()
-            } catch (e: NumberFormatException) {
-                e.printStackTrace()
-            }
-        }
-        return danmakus
-    }
-
-    companion object {
-        fun getColor(s: String): Int {
-            val strColor = s.toLowerCase(Locale.ROOT)
-            try {
-                if (strColor.startsWith("#")) {
-                    Color.parseColor(s)
-                } else if (strColor.startsWith("rgb")) {
-                    val rgbArray = strColor.replace("rgb(", "")
-                        .replace(")", "").split(",")
-                    if (rgbArray.size == 3) Color.rgb(
-                        rgbArray[0].trim().toInt(),
-                        rgbArray[1].trim().toInt(),
-                        rgbArray[2].trim().toInt()
-                    )
-                }
-            } catch (e: IllegalArgumentException) {
-                e.printStackTrace()
-            }
-            return Color.WHITE
-        }
-    }
-
-    private fun getType(s: String): Int {
-        return when (s) {
-            "top" -> 4
-            else -> 1
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeJSONSource.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeJSONSource.kt
deleted file mode 100644
index 6368f1a4..00000000
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeJSONSource.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.skyd.imomoe.view.component.player
-
-import android.net.Uri
-import master.flame.danmaku.danmaku.parser.IDataSource
-import master.flame.danmaku.danmaku.util.IOUtils
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.File
-import java.io.FileInputStream
-import java.io.InputStream
-import java.net.URL
-import kotlin.jvm.Throws
-
-class AnimeJSONSource : IDataSource<JSONArray> {
-    private var mJSONArray: JSONArray? = null
-    var danmuCount: Long = 0
-    var code = 0
-    var msg: String? = null
-    private var mInput: InputStream? = null
-
-    constructor(json: String) {
-        init(json)
-    }
-
-    constructor(`in`: InputStream?) {
-        init(`in`)
-    }
-
-    @Throws(JSONException::class)
-    private fun init(`in`: InputStream?) {
-        if (`in` == null) throw NullPointerException("input stream cannot be null!")
-        mInput = `in`
-        val json = IOUtils.getString(mInput)
-        init(json)
-    }
-
-    constructor(url: URL) {
-        init(url.openStream())
-    }
-
-    constructor(file: File) {
-        init(FileInputStream(file))
-    }
-
-    constructor(uri: Uri) {
-        val scheme = uri.scheme
-        if (IDataSource.SCHEME_HTTP_TAG.equals(scheme, ignoreCase = true)
-            || IDataSource.SCHEME_HTTPS_TAG.equals(scheme, ignoreCase = true)
-        ) {
-            init(URL(uri.toString()).openStream())
-        } else if (IDataSource.SCHEME_FILE_TAG.equals(scheme, ignoreCase = true)) {
-            init(FileInputStream(uri.path))
-        }
-    }
-
-    @Throws(JSONException::class)
-    private fun init(json: String) {
-        if (json.isNotBlank()) {
-            val o = JSONObject(json)
-            danmuCount = o.getLong("danum")
-            code = o.getInt("code")
-            msg = o.getString("msg")
-            mJSONArray = o.getJSONArray("danmuku")
-        }
-    }
-
-    override fun data(): JSONArray? {
-        return mJSONArray
-    }
-
-    override fun release() {
-        IOUtils.closeQuietly(mInput)
-        mInput = null
-        mJSONArray = null
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeVideoPlayer.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeVideoPlayer.kt
index ababd23e..ca3cb472 100644
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeVideoPlayer.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/AnimeVideoPlayer.kt
@@ -37,6 +37,7 @@ import com.skyd.imomoe.view.activity.DlnaActivity
 import com.skyd.imomoe.view.adapter.SkinRvAdapter
 import com.skyd.imomoe.view.component.ZoomView
 import com.skyd.imomoe.view.component.textview.TypefaceTextView
+import com.skyd.imomoe.view.listener.dsl.setOnSeekBarChangeListener
 import com.skyd.skin.SkinManager
 import java.io.File
 import java.io.Serializable
@@ -56,12 +57,15 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
         const val NO_REVERSE = 0
         const val HORIZONTAL_REVERSE = 1
         const val VERTICAL_REVERSE = 2
+
+        // 夜间屏幕最大Alpha
+        const val NIGHT_SCREEN_MAX_ALPHA: Int = 0xAA
     }
 
     // 正在双指缩放移动
     private var doublePointerZoomingMoving = false
 
-    private var mDownloadButton: ImageView? = null
+    private var ivDownloadButton: ImageView? = null
 
     private var initFirstLoad = true
 
@@ -69,81 +73,90 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     private var mScaleIndex = 0
 
     //4:3  16:9等
-    private var mMoreScaleTextView: TextView? = null
+    private var tvMoreScale: TextView? = null
 
     //倍速按钮
-    private var mSpeedTextView: TextView? = null
-    private var mSpeedRecyclerView: RecyclerView? = null
+    private var tvSpeed: TextView? = null
+    private var rvSpeed: RecyclerView? = null
 
     //速度
     private var mPlaySpeed = 1f
 
     //投屏按钮
-    private var mClingImageView: ImageView? = null
+    private var ivCling: ImageView? = null
 
     //分享按钮
-    private var mShareImageView: ImageView? = null
+    private var ivShare: ImageView? = null
 
     //更多按钮
-    private var mMoreImageView: ImageView? = null
+    private var ivMore: ImageView? = null
 
     //下一集按钮
-    private var mNextImageView: ImageView? = null
+    private var ivNextEpisode: ImageView? = null
 
     //选集
-    private var mEpisodeTextView: TextView? = null
+    private var tvEpisode: TextView? = null
     private var mEpisodeTextViewVisibility: Int = View.VISIBLE
     private var mEpisodeButtonOnClickListener: OnClickListener? = null
-    private var mEpisodeRecyclerView: RecyclerView? = null
+    private var rvEpisode: RecyclerView? = null
     private var mEpisodeAdapter: EpisodeRecyclerViewAdapter? = null
 
     // 设置
-    private var mSettingContainer: ViewGroup? = null
-    private var mSettingImageView: ImageView? = null
+    protected var vgSettingContainer: ViewGroup? = null
+    private var ivSetting: ImageView? = null
 
     // 镜像RadioGroup
-    private var mReverseRadioGroup: RadioGroup? = null
+    private var rgReverse: RadioGroup? = null
     private var mReverseValue: Int? = null
     private var mTextureViewTransform: Int =
         NO_REVERSE
 
     // 底部进度条CheckBox
-    private var mBottomProgressCheckBox: CheckBox? = null
+    private var cbBottomProgress: CheckBox? = null
     private var mBottomProgressCheckBoxValue: Boolean = true
 
     //底部进度调
-    private var mBottomProgress: ProgressBar? = null
+    private var pbBottomProgress: ProgressBar? = null
 
     // 外部播放器打开
-    private var mOpenByExternalPlayerTextView: TextView? = null
+    private var tvOpenByExternalPlayer: TextView? = null
 
     // 硬解码CheckBox
-    private var mMediaCodecCheckBox: CheckBox? = null
+    private var cbMediaCodec: CheckBox? = null
 
     // 右侧弹出栏
-    private var mRightContainer: ViewGroup? = null
+    protected var vgRightContainer: ViewGroup? = null
 
     // 按住高速播放的tv
-    private var mTouchDownHighSpeedTextView: TextView? = null
+    private var tvTouchDownHighSpeed: TextView? = null
     private var mLongPressing: Boolean = false
 
     // 还原屏幕
-    private var mRestoreScreenTextView: TextView? = null
+    private var tvRestoreScreen: TextView? = null
 
     // 屏幕已经双指放大移动了
     private var mDoublePointerZoomMoved: Boolean = false
 
     // 屏幕已经双指放大移动了
-    private var mBiggerSurface: ViewGroup? = null
+    private var vgBiggerSurface: ViewGroup? = null
 
     // 控件没有显示
     private var mUiCleared: Boolean = true
 
     // 显示系统时间
-    private var mSystemTimeTextView: TextView? = null
+    private var tcSystemTime: TextClock? = null
 
     // top阴影
-    private var mViewTopContainerShadow: View? = null
+    private var viewTopContainerShadow: View? = null
+
+    // 夜间屏幕View
+    private var viewNightScreen: View? = null
+
+    // 夜间屏幕seekbar
+    private var sbNightScreen: SeekBar? = null
+
+    // 夜间屏幕SeekBar值
+    private var mNightScreenSeekBarProgress: Int = 0
 
     constructor(context: Context) : super(context)
 
@@ -158,38 +171,40 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     override fun init(context: Context?) {
         super.init(context)
 
-        mDownloadButton = findViewById(R.id.iv_play_activity_toolbar_download)
-        mMoreScaleTextView = findViewById(R.id.tv_more_scale)
-        mSpeedTextView = findViewById(R.id.tv_speed)
+        ivDownloadButton = findViewById(R.id.iv_play_activity_toolbar_download)
+        tvMoreScale = findViewById(R.id.tv_more_scale)
+        tvSpeed = findViewById(R.id.tv_speed)
 //        mClingImageView = findViewById(R.id.iv_cling)
-        mRightContainer = findViewById(R.id.layout_right)
-        mSpeedRecyclerView = findViewById(R.id.rv_right)
-        mEpisodeRecyclerView = findViewById(R.id.rv_right)
-        mShareImageView = findViewById(R.id.iv_play_activity_toolbar_share)
-        mNextImageView = findViewById(R.id.iv_next)
-        mEpisodeTextView = findViewById(R.id.tv_episode)
-        mSettingImageView = findViewById(R.id.iv_setting)
-        mSettingContainer = findViewById(R.id.layout_setting)
-        mReverseRadioGroup = findViewById(R.id.rg_reverse)
-        mBottomProgressCheckBox = findViewById(R.id.cb_bottom_progress)
-        mBottomProgress = super.mBottomProgressBar
-        mMoreImageView = findViewById(R.id.iv_play_activity_toolbar_more)
-        mOpenByExternalPlayerTextView = findViewById(R.id.tv_open_by_external_player)
+        vgRightContainer = findViewById(R.id.layout_right)
+        rvSpeed = findViewById(R.id.rv_right)
+        rvEpisode = findViewById(R.id.rv_right)
+        ivShare = findViewById(R.id.iv_play_activity_toolbar_share)
+        ivNextEpisode = findViewById(R.id.iv_next)
+        tvEpisode = findViewById(R.id.tv_episode)
+        ivSetting = findViewById(R.id.iv_setting)
+        vgSettingContainer = findViewById(R.id.layout_setting)
+        rgReverse = findViewById(R.id.rg_reverse)
+        cbBottomProgress = findViewById(R.id.cb_bottom_progress)
+        pbBottomProgress = super.mBottomProgressBar
+        ivMore = findViewById(R.id.iv_play_activity_toolbar_more)
+        tvOpenByExternalPlayer = findViewById(R.id.tv_open_by_external_player)
 //        mMediaCodecCheckBox = findViewById(R.id.cb_media_codec)
-        mRestoreScreenTextView = findViewById(R.id.tv_restore_screen)
-        mTouchDownHighSpeedTextView = findViewById(R.id.tv_touch_down_high_speed)
-        mBiggerSurface = findViewById(R.id.bigger_surface)
-        mSystemTimeTextView = findViewById(R.id.tv_system_time)
-        mViewTopContainerShadow = findViewById(R.id.view_top_container_shadow)
-
-        mRightContainer?.gone()
-        mSettingContainer?.gone()
-        mTouchDownHighSpeedTextView?.gone()
-
-        mBiggerSurface?.setOnClickListener(this)
-        mBiggerSurface?.setOnTouchListener(this)
-
-        mRestoreScreenTextView?.setOnClickListener {
+        tvRestoreScreen = findViewById(R.id.tv_restore_screen)
+        tvTouchDownHighSpeed = findViewById(R.id.tv_touch_down_high_speed)
+        vgBiggerSurface = findViewById(R.id.bigger_surface)
+        tcSystemTime = findViewById(R.id.tc_system_time)
+        viewTopContainerShadow = findViewById(R.id.view_top_container_shadow)
+        viewNightScreen = findViewById(R.id.view_player_night_screen)
+        sbNightScreen = findViewById(R.id.sb_player_night_screen)
+
+        vgRightContainer?.gone()
+        vgSettingContainer?.gone()
+        tvTouchDownHighSpeed?.gone()
+
+        vgBiggerSurface?.setOnClickListener(this)
+        vgBiggerSurface?.setOnTouchListener(this)
+
+        tvRestoreScreen?.setOnClickListener {
             mTextureViewContainer?.run {
                 if (this is ZoomView) restore()
                 else {
@@ -203,8 +218,8 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 it.gone()
             }
         }
-        mSpeedTextView?.setOnClickListener {
-            mRightContainer?.let {
+        tvSpeed?.setOnClickListener {
+            vgRightContainer?.let {
                 val adapter = SpeedAdapter(
                     listOf(
                         SpeedBean("speed", "", "0.5"),
@@ -215,24 +230,23 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                         SpeedBean("speed", "", "2")
                     )
                 )
-                mSpeedRecyclerView?.layoutManager = LinearLayoutManager(context)
-                mSpeedRecyclerView?.adapter = adapter
-                adapter.notifyDataSetChanged()
+                rvSpeed?.layoutManager = LinearLayoutManager(context)
+                rvSpeed?.adapter = adapter
             }
             showRightContainer()
         }
-        mEpisodeTextView?.setOnClickListener {
-            mRightContainer?.let {
-                mEpisodeRecyclerView?.layoutManager = LinearLayoutManager(context)
-                mEpisodeRecyclerView?.adapter = mEpisodeAdapter
+        tvEpisode?.setOnClickListener {
+            vgRightContainer?.let {
+                rvEpisode?.layoutManager = LinearLayoutManager(context)
+                rvEpisode?.adapter = mEpisodeAdapter
                 mEpisodeAdapter?.notifyDataSetChanged()
-                mEpisodeRecyclerView?.scrollToPosition(mEpisodeAdapter?.currentIndex ?: 0)
+                rvEpisode?.scrollToPosition(mEpisodeAdapter?.currentIndex ?: 0)
             }
             showRightContainer()
         }
-        mSettingImageView?.setOnClickListener { showSettingContainer() }
-        mReverseValue = mReverseRadioGroup?.getChildAt(0)?.id
-        mReverseRadioGroup?.children?.forEach {
+        ivSetting?.setOnClickListener { showSettingContainer() }
+        mReverseValue = rgReverse?.getChildAt(0)?.id
+        rgReverse?.children?.forEach {
             (it as RadioButton).apply {
                 setOnCheckedChangeListener { buttonView, isChecked ->
                     if (!isChecked) return@setOnCheckedChangeListener
@@ -245,32 +259,32 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 }
             }
         }
-        mBottomProgressCheckBox?.setOnCheckedChangeListener { buttonView, isChecked ->
+        cbBottomProgress?.setOnCheckedChangeListener { buttonView, isChecked ->
             if (isChecked) {
-                mBottomProgress?.let {
+                pbBottomProgress?.let {
                     mBottomProgressBar = it
                     it.visible()
                 }
             } else {
                 mBottomProgressBar?.let {
-                    mBottomProgress = it
+                    pbBottomProgress = it
                     it.gone()
                     mBottomProgressBar = null
                 }
             }
             mBottomProgressCheckBoxValue = isChecked
         }
-        mBottomProgressCheckBox?.isChecked = mBottomProgressBar != null
+        cbBottomProgress?.isChecked = mBottomProgressBar != null
 
         //重置视频比例
         GSYVideoType.setShowType(mScaleStrings[mScaleIndex].second)
         changeTextureViewShowType()
         if (mTextureView != null) mTextureView.requestLayout()
 
-        mMoreScaleTextView?.text = mScaleStrings[mScaleIndex].first
+        tvMoreScale?.text = mScaleStrings[mScaleIndex].first
 
         //切换视频比例
-        mMoreScaleTextView?.setOnClickListener(OnClickListener {
+        tvMoreScale?.setOnClickListener(OnClickListener {
             startDismissControlViewTimer()      //重新开始ui消失时间计时
             if (!mHadPlay) {
                 return@OnClickListener
@@ -279,7 +293,7 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
             resolveTypeUI()
         })
 
-        mClingImageView?.setOnClickListener {
+        ivCling?.setOnClickListener {
             mContext.startActivity(
                 Intent(mContext, DlnaActivity::class.java)
                     .putExtra("url", mUrl)
@@ -288,10 +302,18 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
             mOriginUrl
         }
 
-        mOpenByExternalPlayerTextView?.setOnClickListener {
+        tvOpenByExternalPlayer?.setOnClickListener {
             if (!openVideoByExternalPlayer(mContext, mUrl))
                 mContext.getString(R.string.matched_app_not_found).showToast()
         }
+
+        sbNightScreen?.setOnSeekBarChangeListener {
+            onProgressChanged { seekBar, progress, _ ->
+                seekBar ?: return@onProgressChanged
+                mNightScreenSeekBarProgress = progress
+                viewNightScreen?.setBackgroundColor((NIGHT_SCREEN_MAX_ALPHA * progress / seekBar.max) shl 24)
+            }
+        }
     }
 
     fun getUrl(): String = mUrl
@@ -299,7 +321,7 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     fun getTitle(): String = mTitle
 
     private fun showSettingContainer() {
-        mSettingContainer?.let {
+        vgSettingContainer?.let {
             hideAllWidget()
             it.translationX = 150f.dp
             it.visible()
@@ -310,9 +332,9 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
             animator.start()
             //取消xx秒后隐藏控制界面
             cancelDismissControlViewTimer()
-            if (mReverseValue == null) mReverseValue = mReverseRadioGroup?.getChildAt(0)?.id
+            if (mReverseValue == null) mReverseValue = rgReverse?.getChildAt(0)?.id
             mReverseValue?.let { id -> findViewById<RadioButton>(id).isChecked = true }
-            mBottomProgressCheckBox?.isChecked = mBottomProgressCheckBoxValue
+            cbBottomProgress?.isChecked = mBottomProgressCheckBoxValue
 
 //            mMediaCodecCheckBox?.isChecked = GSYVideoType.isMediaCodec()
 //            mMediaCodecCheckBox?.setOnCheckedChangeListener { buttonView, isChecked ->
@@ -325,8 +347,8 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
 
     fun setTopContainer(top: ViewGroup?) {
         mTopContainer = top
-        mViewTopContainerShadow = if (top == null) {
-            mViewTopContainerShadow?.visible()
+        viewTopContainerShadow = if (top == null) {
+            viewTopContainerShadow?.visible()
             null
         } else {
             findViewById(R.id.view_top_container_shadow)
@@ -335,7 +357,7 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     }
 
     private fun showRightContainer() {
-        mRightContainer?.let {
+        vgRightContainer?.let {
             hideAllWidget()
             it.translationX = 150f.dp
             it.visible()
@@ -349,14 +371,14 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
 
     override fun hideAllWidget() {
         super.hideAllWidget()
-        setViewShowState(mRightContainer, INVISIBLE)
-        setViewShowState(mSettingContainer, INVISIBLE)
-        setViewShowState(mRestoreScreenTextView, View.GONE)
-        setViewShowState(mViewTopContainerShadow, View.INVISIBLE)
+        setViewShowState(vgRightContainer, INVISIBLE)
+        setViewShowState(vgSettingContainer, INVISIBLE)
+        setViewShowState(tvRestoreScreen, View.GONE)
+        setViewShowState(viewTopContainerShadow, View.INVISIBLE)
     }
 
     override fun onClickUiToggle(e: MotionEvent?) {
-        mRightContainer?.let {
+        vgRightContainer?.let {
             //如果右侧栏显示，则隐藏
             if (it.visibility == View.VISIBLE) {
                 it.gone()
@@ -365,7 +387,7 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 return
             }
         }
-        mSettingContainer?.let {
+        vgSettingContainer?.let {
             // 如果显示，则隐藏
             if (it.visibility == View.VISIBLE) {
                 it.gone()
@@ -397,16 +419,17 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
             statusBar
         ) as AnimeVideoPlayer
         player.mScaleIndex = mScaleIndex
-        player.mSpeedTextView?.text = mSpeedTextView?.text
+        player.tvSpeed?.text = tvSpeed?.text
         player.mFullscreenButton.visibility = mFullscreenButton.visibility
         player.mEpisodeTextViewVisibility = mEpisodeTextViewVisibility
-        player.mEpisodeTextView?.visibility = mEpisodeTextViewVisibility
+        player.tvEpisode?.visibility = mEpisodeTextViewVisibility
         player.mEpisodeAdapter = mEpisodeAdapter
         player.mTextureViewTransform = mTextureViewTransform
         player.mReverseValue = mReverseValue
         player.mBottomProgressCheckBoxValue = mBottomProgressCheckBoxValue
         player.mPlaySpeed = mPlaySpeed
-        if (player.mBottomProgressBar != null) player.mBottomProgress = player.mBottomProgressBar
+        player.sbNightScreen?.progress = mNightScreenSeekBarProgress
+        if (player.mBottomProgressBar != null) player.pbBottomProgress = player.mBottomProgressBar
         if (!player.mBottomProgressCheckBoxValue) player.mBottomProgressBar = null
         touchSurfaceUp()
         player.setRestoreScreenTextViewVisibility()
@@ -416,10 +439,10 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
 
     private fun setRestoreScreenTextViewVisibility() {
         if (mUiCleared) {
-            mRestoreScreenTextView?.gone()
+            tvRestoreScreen?.gone()
         } else {
-            if (mDoublePointerZoomMoved) mRestoreScreenTextView?.visible()
-            else mRestoreScreenTextView?.gone()
+            if (mDoublePointerZoomMoved) tvRestoreScreen?.visible()
+            else tvRestoreScreen?.gone()
         }
     }
 
@@ -440,15 +463,16 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
             val player = gsyVideoPlayer as AnimeVideoPlayer
             mScaleIndex = player.mScaleIndex
             mFullscreenButton.visibility = player.mFullscreenButton.visibility
-            mSpeedTextView?.text = player.mSpeedTextView?.text
+            tvSpeed?.text = player.tvSpeed?.text
             mEpisodeTextViewVisibility = player.mEpisodeTextViewVisibility
-            mEpisodeTextView?.visibility = mEpisodeTextViewVisibility
+            tvEpisode?.visibility = mEpisodeTextViewVisibility
             mEpisodeAdapter = player.mEpisodeAdapter
             mTextureViewTransform = player.mTextureViewTransform
             mReverseValue = player.mReverseValue
             mBottomProgressCheckBoxValue = player.mBottomProgressCheckBoxValue
             mPlaySpeed = player.mPlaySpeed
-            if (mBottomProgressBar != null) mBottomProgress = mBottomProgressBar
+            mNightScreenSeekBarProgress = player.sbNightScreen?.progress ?: 0
+            if (mBottomProgressBar != null) pbBottomProgress = mBottomProgressBar
             if (!mBottomProgressCheckBoxValue) mBottomProgressBar = null
             player.touchSurfaceUp()
             setRestoreScreenTextViewVisibility()
@@ -473,15 +497,27 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
         if (!mHadPlay) {
             return
         }
-        mMoreScaleTextView?.text = mScaleStrings[mScaleIndex].first
+        tvMoreScale?.text = mScaleStrings[mScaleIndex].first
         GSYVideoType.setShowType(mScaleStrings[mScaleIndex].second)
         changeTextureViewShowType()
         if (mTextureView != null) mTextureView.requestLayout()
         setSpeed(mPlaySpeed, true)
-        mTouchDownHighSpeedTextView?.gone()
+        tvTouchDownHighSpeed?.gone()
         mLongPressing = false
     }
 
+    override fun setSpeed(speed: Float, soundTouch: Boolean) {
+        super.setSpeed(speed, soundTouch)
+        onSpeedChanged(speed)
+    }
+
+    /**
+     * 视频播放速度改变后回调
+     */
+    protected open fun onSpeedChanged(speed: Float) {
+
+    }
+
     /**
      * 需要在尺寸发生变化的时候重新处理
      */
@@ -583,34 +619,34 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     //正常
     override fun changeUiToNormal() {
         super.changeUiToNormal()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
         initFirstLoad = true
         mUiCleared = false
     }
 
     override fun changeUiToPauseShow() {
         super.changeUiToPauseShow()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
         mUiCleared = false
     }
 
     override fun changeUiToClear() {
         super.changeUiToClear()
-        mViewTopContainerShadow?.invisible()
+        viewTopContainerShadow?.invisible()
         mUiCleared = true
     }
 
     //准备中
     override fun changeUiToPreparingShow() {
         super.changeUiToPreparingShow()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
         mUiCleared = false
     }
 
     //播放中
     override fun changeUiToPlayingShow() {
         super.changeUiToPlayingShow()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
 //        if (initFirstLoad) {
 //            mBottomContainer.gone()
 //            mStartButton.gone()
@@ -622,35 +658,35 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
     //自动播放结束
     override fun changeUiToCompleteShow() {
         super.changeUiToCompleteShow()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
         mBottomContainer.gone()
-        mTouchDownHighSpeedTextView?.gone()
+        tvTouchDownHighSpeed?.gone()
         mUiCleared = false
     }
 
     override fun changeUiToError() {
         super.changeUiToError()
-        mViewTopContainerShadow?.invisible()
+        viewTopContainerShadow?.invisible()
     }
 
     override fun changeUiToPrepareingClear() {
         super.changeUiToPrepareingClear()
-        mViewTopContainerShadow?.invisible()
+        viewTopContainerShadow?.invisible()
     }
 
     override fun changeUiToPlayingBufferingClear() {
         super.changeUiToPlayingBufferingClear()
-        mViewTopContainerShadow?.invisible()
+        viewTopContainerShadow?.invisible()
     }
 
     override fun changeUiToCompleteClear() {
         super.changeUiToCompleteClear()
-        mViewTopContainerShadow?.invisible()
+        viewTopContainerShadow?.invisible()
     }
 
     override fun changeUiToPlayingBufferingShow() {
         super.changeUiToPlayingBufferingShow()
-        mViewTopContainerShadow?.visible()
+        viewTopContainerShadow?.visible()
     }
 
     override fun onVideoPause() {
@@ -677,6 +713,11 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
 
     public override fun clickStartIcon() {
         super.clickStartIcon()
+
+        // 下面是处理完点击后的逻辑
+        if (mCurrentState == CURRENT_STATE_PLAYING) {
+            onVideoResume()
+        }
     }
 
     override fun onClick(v: View) {
@@ -712,9 +753,9 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 mLongPressing = true
                 // 此处不能设置mPlaySpeed
                 setSpeed(2f, true)
-                mTouchDownHighSpeedTextView?.text =
+                tvTouchDownHighSpeed?.text =
                     mContext.getString(R.string.touch_down_high_speed, "2")
-                mTouchDownHighSpeedTextView?.visible()
+                tvTouchDownHighSpeed?.visible()
             }
         }
     }
@@ -727,7 +768,7 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 if (mLongPressing) {
                     mLongPressing = false
                     setSpeed(mPlaySpeed, true)
-                    mTouchDownHighSpeedTextView?.gone()
+                    tvTouchDownHighSpeed?.gone()
                     return false
                 }
             }
@@ -741,14 +782,14 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                 // 不让super的代码执行，表明正在双指放大移动旋转
                 doublePointerZoomingMoving = true
                 mDoublePointerZoomMoved = true
-                if (!mUiCleared) mRestoreScreenTextView?.visible()
+                if (!mUiCleared) tvRestoreScreen?.visible()
                 // 下面用bigger_surface代替原有的surface_container执行手势动作
                 return false
             }
         }
         // 当正在双指操作时，禁止执行super的代码
         if (doublePointerZoomingMoving) {
-            mRestoreScreenTextView?.visible()
+            tvRestoreScreen?.visible()
             // 如果双指松开，则标志不是在移动
             if (event.action == MotionEvent.ACTION_UP) {
                 doublePointerZoomingMoving = false
@@ -838,24 +879,24 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
         mEpisodeAdapter = adapter
     }
 
-    fun getShareButton() = mShareImageView
+    fun getShareButton() = ivShare
 
-    fun getMoreButton() = mMoreImageView
+    fun getMoreButton() = ivMore
 
-    fun getEpisodeButton() = mEpisodeTextView
+    fun getEpisodeButton() = tvEpisode
 
-    fun getDownloadButton() = mDownloadButton
+    fun getDownloadButton() = ivDownloadButton
 
     fun getBottomContainer() = mBottomContainer
 
-    fun getClingButton() = mClingImageView
+    fun getClingButton() = ivCling
 
-    fun getNextButton() = mNextImageView
+    fun getNextButton() = ivNextEpisode
 
-    fun getRightContainer() = mRightContainer
+    fun getRightContainer() = vgRightContainer
 
     fun setEpisodeButtonVisibility(visibility: Int) {
-        mEpisodeTextView?.visibility = visibility
+        tvEpisode?.visibility = visibility
         mEpisodeTextViewVisibility = visibility
     }
 
@@ -893,13 +934,13 @@ open class AnimeVideoPlayer : StandardGSYVideoPlayer {
                         holder.tvTitle.text = item.title
                         holder.itemView.setOnClickListener {
                             if (item.title == "1") {
-                                mSpeedTextView?.text = App.context.getString(R.string.play_speed)
+                                tvSpeed?.text = App.context.getString(R.string.play_speed)
                             } else {
-                                mSpeedTextView?.text = item.title + "X"
+                                tvSpeed?.text = item.title + "X"
                             }
                             mPlaySpeed = item.title.toFloat()
                             setSpeed(mPlaySpeed, true)
-                            mRightContainer?.gone()
+                            vgRightContainer?.gone()
                             //因为右侧界面显示时，不在xx秒后隐藏界面，所以要恢复xx秒后隐藏控制界面
                             startDismissControlViewTimer()
                         }
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuAdapter.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuAdapter.kt
deleted file mode 100644
index 78fca480..00000000
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuAdapter.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.skyd.imomoe.view.component.player
-
-import android.graphics.Color
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.BackgroundColorSpan
-import android.text.style.ImageSpan
-import master.flame.danmaku.controller.IDanmakuView
-import master.flame.danmaku.danmaku.model.BaseDanmaku
-import master.flame.danmaku.danmaku.model.android.BaseCacheStuffer
-import master.flame.danmaku.danmaku.util.IOUtils
-import java.io.IOException
-import java.io.InputStream
-import java.net.URL
-
-class DanmakuAdapter(private val mDanmakuView: IDanmakuView?) : BaseCacheStuffer.Proxy() {
-    private var mDrawable: Drawable? = null
-    override fun prepareDrawing(danmaku: BaseDanmaku, fromWorkerThread: Boolean) {
-        if (danmaku.text is Spanned) { // 根据你的条件检查是否需要需要更新弹幕
-            // FIXME 这里只是简单启个线程来加载远程url图片，请使用你自己的异步线程池，最好加上你的缓存池
-            object : Thread() {
-                override fun run() {
-                    val url = "http://www.bilibili.com/favicon.ico"
-                    var inputStream: InputStream? = null
-                    var drawable = mDrawable
-                    if (drawable == null) {
-                        try {
-                            inputStream = URL(url).openConnection().getInputStream()
-                            drawable = BitmapDrawable.createFromStream(inputStream, "bitmap")
-                            mDrawable = drawable
-                        } catch (e: IOException) {
-                            e.printStackTrace()
-                        } finally {
-                            IOUtils.closeQuietly(inputStream)
-                        }
-                    }
-                    drawable?.let {
-                        it.setBounds(0, 0, 100, 100)
-                        danmaku.text = createSpannable(it)
-                        mDanmakuView?.invalidateDanmaku(danmaku, false)
-                    }
-                }
-            }.start()
-        }
-    }
-
-    override fun releaseResource(danmaku: BaseDanmaku) {
-        // TODO 重要:清理含有ImageSpan的text中的一些占用内存的资源 例如drawable
-    }
-
-    private fun createSpannable(drawable: Drawable): SpannableStringBuilder {
-        val text = "bitmap"
-        val spannableStringBuilder = SpannableStringBuilder(text)
-        val span = ImageSpan(drawable) //ImageSpan.ALIGN_BOTTOM);
-        spannableStringBuilder.setSpan(span, 0, text.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
-        spannableStringBuilder.append("图文混排")
-        spannableStringBuilder.setSpan(
-            BackgroundColorSpan(Color.parseColor("#8A2233B1")),
-            0,
-            spannableStringBuilder.length,
-            Spannable.SPAN_INCLUSIVE_INCLUSIVE
-        )
-        return spannableStringBuilder
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuVideoPlayer.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuVideoPlayer.kt
index eb291d8d..7a4f3dd8 100644
--- a/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuVideoPlayer.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/DanmakuVideoPlayer.kt
@@ -1,9 +1,8 @@
 package com.skyd.imomoe.view.component.player
 
-import android.animation.ValueAnimator
 import android.content.Context
-import android.graphics.Color
 import android.util.AttributeSet
+import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
@@ -11,77 +10,88 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
-import com.google.gson.Gson
-import com.shuyu.gsyvideoplayer.utils.Debuger
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.input.input
+import com.kuaishou.akdanmaku.DanmakuConfig
+import com.kuaishou.akdanmaku.ecs.DanmakuEngine
+import com.kuaishou.akdanmaku.ecs.component.filter.*
+import com.kuaishou.akdanmaku.render.SimpleRenderer
+import com.kuaishou.akdanmaku.ui.DanmakuPlayer
+import com.kuaishou.akdanmaku.ui.DanmakuView
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
+import com.skyd.imomoe.App
 import com.skyd.imomoe.R
-import com.skyd.imomoe.bean.SendDanmuBean
-import com.skyd.imomoe.bean.SendDanmuResultBean
-import com.skyd.imomoe.net.RetrofitManager
-import com.skyd.imomoe.net.service.DanmuService
-import com.skyd.imomoe.util.Text.shield
+import com.skyd.imomoe.bean.danmaku.AnimeSendDanmakuBean
+import com.skyd.imomoe.util.*
 import com.skyd.imomoe.util.Util.hideKeyboard
 import com.skyd.imomoe.util.Util.showToast
-import com.skyd.imomoe.util.gone
 import com.skyd.imomoe.util.html.SnifferVideo.AC
 import com.skyd.imomoe.util.html.SnifferVideo.KEY
 import com.skyd.imomoe.util.html.SnifferVideo.REFEREER_URL
 import com.skyd.imomoe.util.html.SnifferVideo.VIDEO_ID
-import com.skyd.imomoe.util.visible
-import com.skyd.imomoe.view.component.player.AnimeDanmakuLoaderFactory.Companion.TAG_ANIME
-import com.skyd.imomoe.view.component.player.AnimeDanmakuLoaderFactory.Companion.create
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import master.flame.danmaku.controller.DrawHandler
-import master.flame.danmaku.controller.IDanmakuView
-import master.flame.danmaku.danmaku.loader.IllegalDataException
-import master.flame.danmaku.danmaku.model.BaseDanmaku
-import master.flame.danmaku.danmaku.model.DanmakuTimer
-import master.flame.danmaku.danmaku.model.IDisplayer
-import master.flame.danmaku.danmaku.model.android.DanmakuContext
-import master.flame.danmaku.danmaku.model.android.Danmakus
-import master.flame.danmaku.danmaku.model.android.SpannedCacheStuffer
-import master.flame.danmaku.danmaku.parser.BaseDanmakuParser
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody.Companion.toRequestBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import com.skyd.imomoe.view.component.player.danmaku.Const
+import com.skyd.imomoe.view.component.player.danmaku.anime.AnimeDanmakuParser
+import com.skyd.imomoe.view.component.player.danmaku.anime.AnimeDanmakuSender
+import com.skyd.imomoe.view.component.player.danmaku.bili.BiliBiliDanmakuParser
+import java.net.HttpURLConnection
 import java.net.URL
-import kotlin.math.abs
+import java.util.zip.Inflater
+import java.util.zip.InflaterInputStream
+
 
 /**
  * 注意：这只是一个例子，演示如何集合弹幕，需要完善如弹出输入弹幕等的，可以自行完善。
  * 注意：b站的弹幕so只有v5 v7 x86、没有64，所以记得配置上ndk过滤。
  */
 open class DanmakuVideoPlayer : AnimeVideoPlayer {
-    private lateinit var mDanmakuUrl: String
-    private var mParser: BaseDanmakuParser? = null //解析器对象
-    private lateinit var danmakuView: IDanmakuView          //弹幕view
-    private var danmakuContext: DanmakuContext? = null
-    var danmakuStartSeekPosition: Long = -1
-
-    // 由于seek后弹幕时间不精确，因此标记是否需要校准
-    private var needCorrectSeekPosition = false
+    private var mDanmakuUrl: String = ""
+    private lateinit var mDanmakuView: DanmakuView          //弹幕view
+    private lateinit var mDanmakuPlayer: DanmakuPlayer
+    private val colorFilter = TextColorFilter()
+    private var dataFilters = emptyMap<Int, DanmakuFilter>()
+    private var config = DanmakuConfig().apply {
+        dataFilter = createDataFilters()
+        dataFilters = dataFilter.associateBy { it.filterParams }
+        layoutFilter = createLayoutFilters()
+        textSizeScale = 0.8f
+    }
 
     // 是否在显示弹幕
-    var mDanmakuShow = true
+    private var mDanmakuShow = true
+
+    // 弹幕源类型
+    private var mDanmakuSourceType: String = Const.TAG_ANIME
 
     // 请求弹幕相关参数
-    var mDanmuParamMap = HashMap<String, String>()
+    var mDanmakuParamMap = HashMap<String, String>()
         private set
 
     // 弹幕输入文本框
-    private var mDanmakuInputEditText: EditText? = null
+    private var etDanmakuInput: EditText? = null
 
     // 弹幕开关
-    private var mShowDanmakuImageView: ImageView? = null
+    private var ivShowDanmaku: ImageView? = null
+
+    private var vgDanmakuController: ViewGroup? = null
+
+    // 自定义弹幕链接
+    private var tvInputCustomDanmakuUrl: TextView? = null
+
+    private var mDanmakuControllerHeight: Int = 0
 
-    private var mDanmuController: ViewGroup? = null
+    // 弹幕进度-2s
+    private var tvRewindDanmakuProgress: TextView? = null
+
+    // 弹幕进度恢复正常
+    private var tvResetDanmakuProgress: TextView? = null
+
+    // 弹幕进度+2s
+    private var tvForwardDanmakuProgress: TextView? = null
+
+    // 弹幕进度delta
+    private var mDanmakuProgressDelta: Long = 0L
 
     constructor(context: Context, fullFlag: Boolean?) : super(context, fullFlag)
 
@@ -91,33 +101,46 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
 
     override fun init(context: Context?) {
         super.init(context)
-        danmakuView = findViewById(R.id.danmaku_view)
-        mShowDanmakuImageView = findViewById(R.id.iv_show_danmu)
-        mDanmakuInputEditText = findViewById(R.id.et_input_danmu)
-        mDanmuController = findViewById(R.id.cl_danmu_controller)
-        mDanmakuInputEditText?.gone()
-        mShowDanmakuImageView?.gone()
+        mDanmakuView = findViewById(R.id.danmaku_view)
+        mDanmakuPlayer = DanmakuPlayer(SimpleRenderer()).also {
+            it.bindView(mDanmakuView)
+        }
+        ivShowDanmaku = findViewById(R.id.iv_show_danmu)
+        etDanmakuInput = findViewById(R.id.et_input_danmu)
+        vgDanmakuController = findViewById(R.id.cl_danmu_controller)
+        tvInputCustomDanmakuUrl = findViewById(R.id.tv_input_custom_danmaku_url)
+        tvRewindDanmakuProgress = findViewById(R.id.tv_player_rewind_danmaku_progress)
+        tvResetDanmakuProgress = findViewById(R.id.tv_player_reset_danmaku_progress)
+        tvForwardDanmakuProgress = findViewById(R.id.tv_player_forward_danmaku_progress)
+        etDanmakuInput?.gone()
+        ivShowDanmaku?.gone()
         // 设置高度是0
-        hideBottomDanmuController()
+        hideBottomDanmakuController()
 
-        mDanmakuInputEditText?.setOnEditorActionListener(object : TextView.OnEditorActionListener {
+        etDanmakuInput?.setOnEditorActionListener(object : TextView.OnEditorActionListener {
             override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean {
                 if (actionId == EditorInfo.IME_ACTION_SEND) {
                     val text = v.text.toString()
                     if (text.isBlank()) {
-                        mContext.resources.getString(R.string.please_input_danmu_text).showToast()
+                        mContext.resources.getString(R.string.please_input_danmaku_text).showToast()
                         return false
                     }
-                    mDanmakuInputEditText?.setText("")
-                    SendDanmuBean(
-                        "DIYgod", "rgb(255, 255, 255)",
-                        mDanmuParamMap[VIDEO_ID] ?: "",
-                        mDanmuParamMap[REFEREER_URL] ?: "",
-                        "27.5px", text, currentPlayer.currentPositionWhenPlaying / 1000.0,
-                        "right"
-                    ).let {
-                        sendDanmaku(mDanmuParamMap[AC] ?: "", mDanmuParamMap[KEY] ?: "", it)
-                    }
+                    etDanmakuInput?.setText("")
+                    if (mDanmakuSourceType == Const.TAG_ANIME)
+                        AnimeSendDanmakuBean(
+                            "DIYgod", "rgb(255, 255, 255)",
+                            mDanmakuParamMap[VIDEO_ID] ?: "",
+                            mDanmakuParamMap[REFEREER_URL] ?: "",
+                            "27.5px", text, currentPlayer.currentPositionWhenPlaying / 1000.0,
+                            "right"
+                        ).let {
+                            AnimeDanmakuSender.send(
+                                mDanmakuPlayer,
+                                mDanmakuParamMap[AC] ?: "",
+                                mDanmakuParamMap[KEY] ?: "",
+                                it
+                            )
+                        }
                     return true
 
                 }
@@ -125,7 +148,7 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
             }
         })
 
-        mDanmakuInputEditText?.setOnFocusChangeListener { v, hasFocus ->
+        etDanmakuInput?.setOnFocusChangeListener { v, hasFocus ->
             if (mIfCurrentIsFullscreen) {
                 if (hasFocus) cancelDismissControlViewTimer()
                 else {
@@ -137,62 +160,127 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
             }
         }
 
-        mDanmakuUrl = ""
-        initDanmaku()
-
-        mShowDanmakuImageView?.setOnClickListener {
+        ivShowDanmaku?.setOnClickListener {
             startDismissControlViewTimer()
             mDanmakuShow = !mDanmakuShow
             resolveDanmakuShow()
         }
+
+        tvInputCustomDanmakuUrl?.setOnClickListener {
+            MaterialDialog(mContext).input(hintRes = R.string.input_danmaku_url) { dialog, text ->
+                try {
+                    val url = URL(text.toString()).toString()
+//                        val url = URL("http://api.bilibili.com/x/v1/dm/list.so?oid=431625080").toString()
+                    if (url.contains("bili", true)) {
+                        setDanmakuUrl(url, null, Const.TAG_BILIBILI)
+                    }
+                } catch (e: Exception) {
+                    App.context.resources.getString(R.string.website_format_error).showToast()
+                    e.printStackTrace()
+                }
+            }.positiveButton(R.string.ok).show()
+            vgSettingContainer?.invisible()
+        }
+
+        tvRewindDanmakuProgress?.setOnClickListener {
+            if (mDanmakuProgressDelta < -60000L) {
+                mContext.getString(R.string.cannot_rewind_over_10s).showToast()
+                return@setOnClickListener
+            }
+            mDanmakuProgressDelta -= 2000L
+            seekDanmaku(currentPlayer.currentPositionWhenPlaying.toLong())
+        }
+
+        tvForwardDanmakuProgress?.setOnClickListener {
+            if (mDanmakuProgressDelta > 60000L) {
+                mContext.getString(R.string.cannot_forward_over_10s).showToast()
+                return@setOnClickListener
+            }
+            mDanmakuProgressDelta += 2000L
+            seekDanmaku(currentPlayer.currentPositionWhenPlaying.toLong())
+        }
+
+        tvResetDanmakuProgress?.setOnClickListener {
+            mDanmakuProgressDelta = 0L
+            seekDanmaku(currentPlayer.currentPositionWhenPlaying.toLong())
+        }
+    }
+
+    override fun onCompletion() {
+        super.onCompletion()
+        stopDanmaku()
+    }
+
+    override fun onAutoCompletion() {
+        super.onAutoCompletion()
+        stopDanmaku()
+    }
+
+    override fun onBufferingUpdate(percent: Int) {
+        super.onBufferingUpdate(percent)
+        pauseDanmaku()
     }
 
     override fun onPrepared() {
         super.onPrepared()
-        onPrepareDanmaku(this)
+        seekDanmaku(0L)
+//        playDanmaku()
     }
 
     override fun onVideoPause() {
         super.onVideoPause()
-        danmakuOnPause()
+        pauseDanmaku()
     }
 
     override fun onVideoResume(seek: Boolean) {
         super.onVideoResume(seek)
-        danmakuOnResume()
+        playDanmaku()
     }
 
-    override fun clickStartIcon() {
-        super.clickStartIcon()
-        if (mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING) {
-            danmakuOnResume()
-        } else if (mCurrentState == GSYVideoView.CURRENT_STATE_PAUSE) {
-            danmakuOnPause()
-        }
+    override fun onSeekComplete() {
+        super.onSeekComplete()
+        // 虽然此方法叫做onSeekComplete，但是这时候多半还没有缓冲完（为GSYPlayer库设计缺陷）
+        // 因此不能开始弹幕播放，要传入pauseDanmaku = true，强行暂停播放
+        seekDanmaku((mProgressBar.progress * duration / 100.0).toLong(), true)
     }
 
-    override fun onCompletion() {
-        releaseDanmaku(this)
+    override fun changeUiToPlayingShow() {
+        super.changeUiToPlayingShow()
+        // 弥补上述onSeekComplete方法内的缺陷
+        playDanmaku()
     }
 
-    override fun onSeekComplete() {
-        super.onSeekComplete()
-        val time = mProgressBar.progress / 100.0 * duration
-        // 如果已经初始化过的，直接seek到对于位置
-//        Log.e("---", "$time ${mProgressBar.progress} $duration")
-//        Log.e("---", "$mCurrentPosition ${mProgressBar.progress} $duration")
-        if (mHadPlay && danmakuView.isPrepared) {
-            resolveDanmakuSeek(this, time.toLong())
-            needCorrectSeekPosition = true
-        } else if (mHadPlay && !danmakuView.isPrepared) {
-            // 如果没有初始化过的，记录位置等待
-            danmakuStartSeekPosition = time.toLong()
-        }
+    override fun changeUiToPauseShow() {
+        super.changeUiToPauseShow()
+        pauseDanmaku()
+    }
+
+    override fun changeUiToPlayingBufferingShow() {
+        super.changeUiToPlayingBufferingShow()
+        pauseDanmaku()
     }
 
-    override fun cloneParams(from: GSYBaseVideoPlayer, to: GSYBaseVideoPlayer) {
-        (to as DanmakuVideoPlayer).mDanmakuUrl = (from as DanmakuVideoPlayer).mDanmakuUrl
-        super.cloneParams(from, to)
+    override fun changeUiToCompleteShow() {
+        super.changeUiToCompleteShow()
+        stopDanmaku()
+    }
+
+    override fun changeUiToPreparingShow() {
+        super.changeUiToPreparingShow()
+        pauseDanmaku()
+    }
+
+    override fun changeUiToError() {
+        super.changeUiToError()
+        pauseDanmaku()
+    }
+
+    /**
+     * 视频播放速度改变后回调
+     */
+    override fun onSpeedChanged(speed: Float) {
+        super.onSpeedChanged(speed)
+        mDanmakuPlayer.updatePlaySpeed(speed)
     }
 
     /**
@@ -206,15 +294,20 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
     ): GSYBaseVideoPlayer {
         val player =
             super.startWindowFullscreen(context, actionBar, statusBar) as DanmakuVideoPlayer
-        // 设置弹幕信息Map
-        player.mDanmuParamMap.clear()
-        player.mDanmuParamMap.putAll(mDanmuParamMap)
-        // 对弹幕设置偏移记录
-        player.danmakuStartSeekPosition = currentPositionWhenPlaying.toLong()
+        player.ivShowDanmaku?.visibility = ivShowDanmaku?.visibility ?: View.GONE
+        player.etDanmakuInput?.visibility = etDanmakuInput?.visibility ?: View.GONE
+
         player.mDanmakuShow = mDanmakuShow
-        player.mShowDanmakuImageView?.visibility = mShowDanmakuImageView?.visibility ?: View.GONE
-        player.mDanmakuInputEditText?.visibility = mDanmakuInputEditText?.visibility ?: View.GONE
-        onPrepareDanmaku(player)
+        player.resolveDanmakuShow()
+        if (player.mDanmakuUrl != mDanmakuUrl) {
+            player.setDanmakuUrl(
+                mDanmakuUrl, mDanmakuParamMap, mDanmakuSourceType,
+                mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING
+            )
+        }
+        player.seekDanmaku(currentPositionWhenPlaying.toLong())
+        pauseDanmaku()
+
         return player
     }
 
@@ -230,83 +323,86 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
         super.resolveNormalVideoShow(oldF, vp, gsyVideoPlayer)
         gsyVideoPlayer?.let {
             val player = it as DanmakuVideoPlayer
-            // 设置弹幕信息Map
-            mDanmuParamMap.clear()
-            mDanmuParamMap.putAll(player.mDanmuParamMap)
+            if (player.etDanmakuInput?.visibility == View.VISIBLE) showBottomDanmakuController()
+            else hideBottomDanmakuController()
+            ivShowDanmaku?.visibility =
+                player.ivShowDanmaku?.visibility ?: View.GONE
+            etDanmakuInput?.visibility =
+                player.etDanmakuInput?.visibility ?: View.GONE
+
             mDanmakuShow = player.mDanmakuShow
-            mShowDanmakuImageView?.visibility = player.mShowDanmakuImageView?.visibility ?: View.GONE
-            mDanmakuInputEditText?.visibility = player.mDanmakuInputEditText?.visibility ?: View.GONE
-            if (player.mDanmakuInputEditText?.visibility == View.VISIBLE) showBottomDanmakuController()
-            else hideBottomDanmuController()
-
-            if (player.danmakuView.isPrepared) {
-                resolveDanmakuSeek(this, player.currentPositionWhenPlaying.toLong())
-                resolveDanmakuShow()
-                releaseDanmaku(player)
+            resolveDanmakuShow()
+            if (mDanmakuUrl != player.mDanmakuUrl) {
+                setDanmakuUrl(
+                    player.mDanmakuUrl,
+                    player.mDanmakuParamMap,
+                    player.mDanmakuSourceType,
+                    player.mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING
+                )
             }
+            seekDanmaku(player.currentPositionWhenPlaying.toLong())
+            player.pauseDanmaku()
         }
     }
 
-    protected fun danmakuOnPause() {
-        if (danmakuView.isPrepared) {
-            danmakuView.pause()
-        }
-    }
-
-    protected fun danmakuOnResume() {
-        if (danmakuView.isPrepared && danmakuView.isPaused) {
-            danmakuView.resume()
-        }
+    fun getDanmakuControllerHeight(): Int {
+        vgDanmakuController?.measure(
+            MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+            MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+        )
+        return vgDanmakuController?.height ?: 0
     }
 
-    fun setDanmaKuUrl(url: String, paramMap: HashMap<String, String>? = null) {
+    fun setDanmakuUrl(
+        url: String,
+        paramMap: HashMap<String, String>? = null,
+        danmakuSourceType: String = Const.TAG_ANIME,
+        autoPlayIfVideoIsPlaying: Boolean = true    // 调用此方法后若视频在播放，则自动播放弹幕
+    ) {
+        mDanmakuParamMap.clear()
         if (paramMap != null) {
-            mDanmuParamMap.clear()
-            mDanmuParamMap.putAll(paramMap)
+            mDanmakuParamMap.putAll(paramMap)
         }
+        mDanmakuSourceType = danmakuSourceType
         mDanmakuUrl = url
-        if (!danmakuView.isPrepared) {
-            onPrepareDanmaku(currentPlayer as DanmakuVideoPlayer)
-        }
-    }
-
-    private fun initDanmaku() {
-        // 设置最大显示行数
-        val maxLinesPair = HashMap<Int, Int>()
-        maxLinesPair[BaseDanmaku.TYPE_SCROLL_RL] = 6 // 滚动弹幕最大显示6行
-        // 设置是否禁止重叠
-        val overlappingEnablePair = HashMap<Int, Boolean>()
-        overlappingEnablePair[BaseDanmaku.TYPE_SCROLL_RL] = true
-        overlappingEnablePair[BaseDanmaku.TYPE_FIX_TOP] = true
-        val danmakuAdapter = DanmakuAdapter(danmakuView)
-        danmakuContext = DanmakuContext.create()
-        danmakuContext?.setDanmakuStyle(IDisplayer.DANMAKU_STYLE_STROKEN, 3f)
-            ?.setDuplicateMergingEnabled(false)?.setScrollSpeedFactor(1.2f)?.setScaleTextSize(1.2f)
-            ?.setCacheStuffer(SpannedCacheStuffer(), danmakuAdapter) // 图文混排使用SpannedCacheStuffer
-            ?.setMaximumLines(maxLinesPair)
-            ?.preventOverlapping(overlappingEnablePair)
-        //todo 这是为了demo效果，实际上需要去掉这个，外部传输文件进来
-        danmakuView.setCallback(object : DrawHandler.Callback {
-            override fun updateTimer(timer: DanmakuTimer) {
-                if (abs(currentPlayer.speed - 1f) >= 0.001f) timer.update(
-                    currentPlayer.currentPositionWhenPlaying.toLong()
-                )/* else if (needCorrectSeekPosition) {
-                    currentPlayer.currentPositionWhenPlaying.toLong()
-                    needCorrectSeekPosition = false
-                }*/
-            }
 
-            override fun drawingFinished() {}
-            override fun danmakuShown(danmaku: BaseDanmaku) {}
-            override fun prepared() {
-                if (danmakuStartSeekPosition != -1L) {
-                    resolveDanmakuSeek(this@DanmakuVideoPlayer, danmakuStartSeekPosition)
-                    danmakuStartSeekPosition = -1
+        Thread {
+            when (danmakuSourceType) {
+                Const.TAG_ANIME -> {
+                    Log.d(DanmakuEngine.TAG, "[ANIME] 开始加载数据")
+                    val dataList = AnimeDanmakuParser(
+                        URL(url).openConnection().getInputStream().string()
+                    ).parse()
+                    mDanmakuPlayer.updateData(dataList)
+                    mDanmakuView.post {
+                        if (autoPlayIfVideoIsPlaying && mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING) {
+                            seekDanmaku(currentPlayer.currentPositionWhenPlaying.toLong())
+                            playDanmaku()
+                        }
+                        Log.d(DanmakuEngine.TAG, "[ANIME] 数据已加载(count = ${dataList.size})")
+                    }
+                }
+                Const.TAG_BILIBILI -> {
+                    Log.d(DanmakuEngine.TAG, "[BILIBILI] 开始加载数据")
+                    val conn = URL(url).openConnection() as HttpURLConnection
+                    conn.connect()
+                    val inputStream = InflaterInputStream(conn.inputStream, Inflater(true))
+                    val dataList = BiliBiliDanmakuParser(inputStream.string()).parse()
+                    mDanmakuPlayer.updateData(dataList)
+                    mDanmakuView.post {
+                        if (autoPlayIfVideoIsPlaying && mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING) {
+                            seekDanmaku(currentPlayer.currentPositionWhenPlaying.toLong())
+                            playDanmaku()
+                        }
+                        Log.d(DanmakuEngine.TAG, "[BILIBILI] 数据已加载(count = ${dataList.size})")
+                    }
+                }
+                else -> {
+                    Log.d(DanmakuEngine.TAG, "找不到合适的弹幕解析器！")
                 }
-                resolveDanmakuShow()
             }
-        })
-        danmakuView.enableDanmakuDrawingCache(true)
+
+        }.start()
     }
 
     /**
@@ -315,101 +411,114 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
     private fun resolveDanmakuShow() {
         post {
             if (mDanmakuShow) {
-                if (!danmakuView.isShown) danmakuView.show()
-                mShowDanmakuImageView?.isSelected = true
+                setDanmakuVisibility(true)
+                ivShowDanmaku?.isSelected = true
             } else {
-                if (danmakuView.isShown) danmakuView.hide()
-                mShowDanmakuImageView?.isSelected = false
+                setDanmakuVisibility(false)
+                ivShowDanmaku?.isSelected = false
             }
         }
     }
 
+    private fun setDanmakuVisibility(visible: Boolean) {
+        config = config.copy(visibility = visible)
+        mDanmakuPlayer.updateConfig(config)
+    }
+
     /**
      * 开始播放弹幕
      */
-    private fun onPrepareDanmaku(gsyVideoPlayer: DanmakuVideoPlayer) {
-        if (mDanmakuUrl.isBlank()) return
-        mDanmakuInputEditText?.visible()
-        mShowDanmakuImageView?.visible()
-        showBottomDanmakuController()
-        // 使用的弹幕url进行显示，要网络请求，因此在io线程执行（与danmakuView.prepare需要顺序执行）
-        GlobalScope.launch(Dispatchers.IO) {
-            gsyVideoPlayer.mParser = createParser(gsyVideoPlayer.mDanmakuUrl)
-            gsyVideoPlayer.danmakuView.let { danmakuView ->
-                if (!danmakuView.isPrepared && gsyVideoPlayer.mParser != null) {
-                    danmakuView.prepare(gsyVideoPlayer.mParser, gsyVideoPlayer.danmakuContext)
-                }
-            }
+    private fun onPrepareDanmaku() {
+        etDanmakuInput?.visible()
+        ivShowDanmaku?.visible()
+        tvRewindDanmakuProgress?.visible()
+        tvResetDanmakuProgress?.visible()
+        tvForwardDanmakuProgress?.visible()
+        if (mDanmakuParamMap.size > 0) {
+            etDanmakuInput?.enable()
+            etDanmakuInput?.hint = mContext.getString(R.string.send_a_danmaku)
+        } else {
+            etDanmakuInput?.disable()
+            etDanmakuInput?.hint = mContext.getString(R.string.send_a_danmaku_is_disabled)
         }
+        showBottomDanmakuController()
+    }
 
+    /**
+     * 播放弹幕，要保证只在次方法内调用mDanmakuPlayer.start(config)
+     */
+    protected open fun playDanmaku() {
+        if (mDanmakuUrl.isBlank()) return
         // 若不加下面的if，则切换横竖屏后不管是否暂停，弹幕都会自动播放
-        if (gsyVideoPlayer.currentState == CURRENT_STATE_PLAYING) gsyVideoPlayer.danmakuView.resume()
-        else gsyVideoPlayer.danmakuView.pause()
+        mDanmakuPlayer.start(config)
+        onPrepareDanmaku()
     }
 
     /**
-     * 弹幕偏移
+     * 暂停弹幕
      */
-    private fun resolveDanmakuSeek(gsyVideoPlayer: DanmakuVideoPlayer, time: Long) {
-        gsyVideoPlayer.danmakuView.let { danmakuView ->
-            if (mHadPlay && danmakuView.isPrepared) danmakuView.seekTo(time)
-        }
+    protected open fun pauseDanmaku() {
+        mDanmakuPlayer.pause()
     }
 
     /**
-     * 创建解析器对象，解析弹幕url
-     *
-     * @param url
-     * @return
+     * 停止弹幕
      */
-    private fun createParser(url: String): BaseDanmakuParser {
-        if (url.isBlank()) {
-            return object : BaseDanmakuParser() {
-                override fun parse(): Danmakus {
-                    return Danmakus()
-                }
-            }
-        }
-        val loader = create(TAG_ANIME)
-        try {
-            if (loader is AnimeDanmakuLoader) loader.load(URL(url))
-            else loader?.load(url)
-        } catch (e: IllegalDataException) {
-            e.printStackTrace()
-        }
-        return AnimeDanmakuParser().apply {
-            load(loader?.dataSource)
+    protected open fun stopDanmaku() {
+        mDanmakuPlayer.stop()
+        // 加此句是因为stop后悔seek 0，又会播放
+        mDanmakuPlayer.pause()
+    }
+
+    /**
+     * 弹幕偏移
+     * @param pauseDanmaku 传入true则不管当前状态都会停止播放弹幕
+     */
+    private fun seekDanmaku(time: Long, pauseDanmaku: Boolean = false) {
+        // 若mDanmakuProgressDelta<0即左移了，并且总进度也小于0，则重置mDanmakuProgressDelta
+        if (time + mDanmakuProgressDelta < 0L) {
+            mDanmakuProgressDelta = 0L - time
         }
+//        Log.e("---", (time + mDanmakuProgressDelta).toString() + " " + mDanmakuProgressDelta.toString())
+        mDanmakuPlayer.seekTo(time + mDanmakuProgressDelta)
+        // 由于上面一条语句会导致弹幕开始播放，因此要判断是否暂停
+        if (pauseDanmaku || mCurrentState == GSYVideoView.CURRENT_STATE_PAUSE ||
+            mCurrentState == GSYVideoView.CURRENT_STATE_PLAYING_BUFFERING_START
+        )
+            pauseDanmaku()
+        if (mCurrentState == GSYVideoView.CURRENT_STATE_AUTO_COMPLETE ||
+            mCurrentState == GSYVideoView.CURRENT_STATE_ERROR ||
+            mCurrentState == GSYVideoView.CURRENT_STATE_NORMAL
+        )
+            stopDanmaku()
     }
 
     /**
      * 释放弹幕控件
      */
-    private fun releaseDanmaku(danmakuVideoPlayer: DanmakuVideoPlayer?) {
-        danmakuVideoPlayer?.danmakuView?.let { danmakuView ->
-            Debuger.printfError("release Danmaku!")
-            danmakuView.release()
-        }
+    private fun releaseDanmaku() {
+        mDanmakuPlayer.release()
+    }
+
+    /**
+     * 调用此方法释放整个视频播放器
+     */
+    override fun release() {
+        super.release()
+        releaseDanmaku()
     }
 
     /**
      * 显示非全屏模式下播放器下方弹幕控制部分
      */
     private fun showBottomDanmakuController() {
-        mDanmuController?.let { danmuController ->
-            if (danmuController.layoutParams.height == 0) {
-                danmuController.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
-                danmuController.requestLayout()
-                post {
-                    ValueAnimator.ofInt(height, height + danmuController.height).setDuration(500)
-                        .apply {
-                            addUpdateListener { animation ->
-                                layoutParams.height = animation.animatedValue as Int
-                                requestLayout()
-                            }
-                            start()
-                        }
-                }
+        vgDanmakuController?.let { danmakuController ->
+            if (danmakuController.layoutParams.height == 0) {
+                danmakuController.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                danmakuController.requestLayout()
+                mDanmakuControllerHeight = danmakuController.height
+                layoutParams.height = height + danmakuController.height
+                requestLayout()
             }
         }
     }
@@ -417,73 +526,29 @@ open class DanmakuVideoPlayer : AnimeVideoPlayer {
     /**
      * 隐藏非全屏模式下播放器下方弹幕控制部分
      */
-    private fun hideBottomDanmuController() {
-        mDanmuController?.let { danmuController ->
-            if (danmuController.layoutParams.height != 0) {
-                if (danmuController.height > 0) {
-                    post {
-                        ValueAnimator.ofInt(height, height - danmuController.height)
-                            .setDuration(500)
-                            .apply {
-                                addUpdateListener { animation ->
-                                    layoutParams.height = animation.animatedValue as Int
-                                    requestLayout()
-                                }
-                                start()
-                            }
-                    }
+    private fun hideBottomDanmakuController() {
+        vgDanmakuController?.let { danmakuController ->
+            if (danmakuController.layoutParams.height != 0) {
+                if (danmakuController.height > 0) {
+                    mDanmakuControllerHeight = danmakuController.height
+                    layoutParams.height = height - danmakuController.height
+                    requestLayout()
                 }
-                danmuController.layoutParams.height = 0
-                danmuController.requestLayout()
+                danmakuController.layoutParams.height = 0
+                danmakuController.requestLayout()
             }
         }
     }
 
-    /**
-     * 发送弹幕
-     * @param isLive 是否是直播弹幕
-     */
-    private fun sendDanmaku(
-        ac: String,
-        key: String,
-        sendDanmuBean: SendDanmuBean,
-        isLive: Boolean = false
-    ) {
-        val danmaku = danmakuContext?.mDanmakuFactory?.createDanmaku(BaseDanmaku.TYPE_SCROLL_RL)
-        danmaku ?: return
-        sendDanmuBean.text.apply {
-            // 检测是否有被屏蔽字符，若有则不进行发送
-            if (shield()) {
-                mContext.getString(R.string.danmu_exist_shield_content).showToast(Toast.LENGTH_LONG)
-                return
-            }
-            danmaku.text = this
-        }
-        danmaku.isLive = isLive
-        danmaku.time = (sendDanmuBean.time * 1000).toLong()
-        danmaku.textSize = 0.7f * sendDanmuBean.size.replace("px", "").toFloat() *
-                (mParser?.displayer?.density ?: 1 - 0.6f)
-        val color = AnimeDanmakuParser.getColor(sendDanmuBean.color)
-        danmaku.textColor = color
-        danmaku.textShadowColor = if (color <= Color.BLACK) Color.WHITE else Color.BLACK
-        danmaku.underlineColor = Color.GREEN
-        danmakuView.addDanmaku(danmaku)
-
-        val request = RetrofitManager.instance.create(DanmuService::class.java) ?: return
-        val json = Gson().toJson(sendDanmuBean)
-            .toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
-        request.sendDanmu(ac, key, json).enqueue(object : Callback<SendDanmuResultBean> {
-            override fun onFailure(call: Call<SendDanmuResultBean>, t: Throwable) {
-                mContext.getString(R.string.send_danmu_failed, t.message).showToast()
-                t.printStackTrace()
-            }
-
-            override fun onResponse(
-                call: Call<SendDanmuResultBean>,
-                response: Response<SendDanmuResultBean>
-            ) {
-                response.body()?.message?.showToast()
-            }
-        })
-    }
+    private fun createDataFilters(): List<DanmakuDataFilter> =
+        listOf(
+            TypeFilter(),
+            colorFilter,
+            UserIdFilter(),
+            GuestFilter(),
+            BlockedTextFilter { it == 0L },
+            DuplicateMergedFilter()
+        )
+
+    private fun createLayoutFilters(): List<DanmakuLayoutFilter> = emptyList()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/Const.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/Const.kt
new file mode 100644
index 00000000..d97a1d8c
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/Const.kt
@@ -0,0 +1,7 @@
+package com.skyd.imomoe.view.component.player.danmaku
+
+object Const {
+    var TAG_BILIBILI = "bili"
+    var TAG_ACFUN = "acfun"
+    var TAG_ANIME = "anime"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuParser.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuParser.kt
new file mode 100644
index 00000000..b058fc1e
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuParser.kt
@@ -0,0 +1,83 @@
+package com.skyd.imomoe.view.component.player.danmaku.anime
+
+import android.graphics.Color
+import com.kuaishou.akdanmaku.data.DanmakuItemData
+import com.skyd.imomoe.util.Text.shield
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.*
+import kotlin.collections.ArrayList
+
+class AnimeDanmakuParser {
+    private var data: String = ""
+
+    constructor(data: String) {
+        this.data = data
+    }
+
+    fun parse(): List<DanmakuItemData> {
+        if (data.isBlank()) return ArrayList()
+        val jsonArray: JSONArray
+        JSONObject(data).apply {
+            jsonArray = getJSONArray("danmuku")
+        }
+        val dataList: MutableList<DanmakuItemData> = ArrayList(jsonArray.length())
+        for (i in 0 until jsonArray.length()) {
+            try {
+                val array = jsonArray.getJSONArray(i)
+                val content = array.getString(4)
+                // 如果此条弹幕应该屏蔽，则直接continue到下一条
+                if (content.shield()) continue
+                var textSize = 27
+                if (array.length() >= 8) {
+                    textSize = array.getString(7).replace("px", "").toInt()
+                }
+                dataList.add(
+                    DanmakuItemData(
+                        content = content,
+                        danmakuId = i.toLong(),
+                        textSize = textSize,
+                        textColor = getColor(array.getString(2)),
+                        position = (array.getDouble(0) * 1000).toLong(),
+                        mode = getType(array.getString(1))
+                    )
+                )
+            } catch (e: JSONException) {
+                e.printStackTrace()
+            } catch (e: NumberFormatException) {
+                e.printStackTrace()
+            }
+        }
+        return dataList
+    }
+
+    companion object {
+        fun getColor(s: String): Int {
+            val strColor = s.toLowerCase(Locale.ROOT)
+            try {
+                if (strColor.startsWith("#")) {
+                    Color.parseColor(s)
+                } else if (strColor.startsWith("rgb")) {
+                    val rgbArray = strColor.replace("rgb(", "")
+                        .replace(")", "").split(",")
+                    if (rgbArray.size == 3) Color.rgb(
+                        rgbArray[0].trim().toInt(),
+                        rgbArray[1].trim().toInt(),
+                        rgbArray[2].trim().toInt()
+                    )
+                }
+            } catch (e: IllegalArgumentException) {
+                e.printStackTrace()
+            }
+            return Color.WHITE
+        }
+    }
+
+    private fun getType(s: String): Int {
+        return when (s) {
+            "top" -> DanmakuItemData.DANMAKU_MODE_CENTER_TOP
+            else -> DanmakuItemData.DANMAKU_MODE_ROLLING
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuSender.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuSender.kt
new file mode 100644
index 00000000..eb566606
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/anime/AnimeDanmakuSender.kt
@@ -0,0 +1,62 @@
+package com.skyd.imomoe.view.component.player.danmaku.anime
+
+import android.widget.Toast
+import com.google.gson.Gson
+import com.kuaishou.akdanmaku.data.DanmakuItemData
+import com.kuaishou.akdanmaku.ui.DanmakuPlayer
+import com.skyd.imomoe.App
+import com.skyd.imomoe.R
+import com.skyd.imomoe.bean.danmaku.AnimeSendDanmakuBean
+import com.skyd.imomoe.bean.danmaku.AnimeSendDanmakuResultBean
+import com.skyd.imomoe.net.RetrofitManager
+import com.skyd.imomoe.net.service.DanmakuService
+import com.skyd.imomoe.util.Text.shield
+import com.skyd.imomoe.util.Util.showToast
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlin.random.Random
+
+object AnimeDanmakuSender {
+    fun send(
+        danmakuPlayer: DanmakuPlayer,
+        ac: String,
+        key: String,
+        animeSendDanmakuBean: AnimeSendDanmakuBean,
+    ) {
+        if (animeSendDanmakuBean.text.shield()) {
+            App.context.getString(R.string.danmaku_exist_shield_content).showToast(Toast.LENGTH_LONG)
+            return
+        }
+        val time = danmakuPlayer.getCurrentTimeMs() + 500
+        val danmaku = DanmakuItemData(
+            Random.nextLong(),
+            time,
+            animeSendDanmakuBean.text,
+            DanmakuItemData.DANMAKU_MODE_ROLLING,
+            (0.28f * animeSendDanmakuBean.size.replace("px", "").toFloat()).toInt(),
+            AnimeDanmakuParser.getColor(animeSendDanmakuBean.color),
+            DanmakuItemData.DANMAKU_STYLE_ICON_UP
+        )
+        val item = danmakuPlayer.obtainItem(danmaku)
+        val request = RetrofitManager.instance.create(DanmakuService::class.java) ?: return
+        val json = Gson().toJson(animeSendDanmakuBean)
+            .toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
+        request.sendDanmaku(ac, key, json).enqueue(object : Callback<AnimeSendDanmakuResultBean> {
+            override fun onFailure(call: Call<AnimeSendDanmakuResultBean>, t: Throwable) {
+                App.context.getString(R.string.send_danmaku_failed, t.message).showToast()
+                t.printStackTrace()
+            }
+
+            override fun onResponse(
+                call: Call<AnimeSendDanmakuResultBean>,
+                response: Response<AnimeSendDanmakuResultBean>
+            ) {
+                response.body()?.message?.showToast()
+                danmakuPlayer.send(item)
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/bili/BiliBiliDanmakuParser.kt b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/bili/BiliBiliDanmakuParser.kt
new file mode 100644
index 00000000..f14990d9
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/component/player/danmaku/bili/BiliBiliDanmakuParser.kt
@@ -0,0 +1,147 @@
+package com.skyd.imomoe.view.component.player.danmaku.bili
+
+import com.kuaishou.akdanmaku.data.DanmakuItemData
+import com.skyd.imomoe.util.Util.dp
+import com.skyd.imomoe.util.string
+import org.xml.sax.Attributes
+import org.xml.sax.InputSource
+import org.xml.sax.SAXException
+import org.xml.sax.helpers.DefaultHandler
+import org.xml.sax.helpers.XMLReaderFactory
+import java.io.IOException
+import java.io.InputStream
+import java.util.*
+import kotlin.collections.ArrayList
+
+class BiliBiliDanmakuParser {
+    init {
+        System.setProperty("org.xml.sax.driver", "org.xmlpull.v1.sax2.Driver")
+    }
+
+    private var data: String = ""
+
+    constructor(data: String) {
+        this.data = data
+    }
+
+    constructor(inputStream: InputStream) {
+        this.data = inputStream.string()
+    }
+
+    fun parse(): List<DanmakuItemData> {
+        if (data.isBlank()) return ArrayList()
+        try {
+            val xmlReader = XMLReaderFactory.createXMLReader()
+            val contentHandler = XmlContentHandler()
+            xmlReader.contentHandler = contentHandler
+            xmlReader.parse(InputSource(data.byteInputStream()))
+            return contentHandler.result
+        } catch (e: SAXException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+        return ArrayList()
+    }
+
+    class XmlContentHandler : DefaultHandler() {
+        lateinit var result: MutableList<DanmakuItemData>
+        var item: DanmakuItemData? = null
+        var completed = false
+
+        override fun startDocument() {
+            result = ArrayList()
+        }
+
+        override fun endDocument() {
+            completed = true
+        }
+
+        override fun startElement(
+            uri: String,
+            localName: String,
+            qName: String,
+            attributes: Attributes
+        ) {
+            var tagName = if (localName.isNotEmpty()) localName else qName
+            tagName = tagName.toLowerCase(Locale.getDefault()).trim { it <= ' ' }
+            if (tagName == "d") {
+                // <d p="23.826000213623,1,25,16777215,1422201084,0,057075e9,757076900">我从未见过如此厚颜无耻之猴</d>
+                // 0:时间(弹幕出现时间)
+                // 1:类型(1从右至左滚动弹幕|6从左至右滚动弹幕|5顶端固定弹幕|4底端固定弹幕|7高级弹幕|8脚本弹幕)
+                // 2:字号
+                // 3:颜色
+                // 4:时间戳 ?
+                // 5:弹幕池id
+                // 6:用户hash
+                // 7:弹幕id
+                val pValue = attributes.getValue("p")
+                // parse p value to danmaku
+                val values = pValue.split(",").toTypedArray()
+
+                if (values.isNotEmpty()) {
+                    item = DanmakuItemData(
+                        content = "",
+                        danmakuId = values[7].toLong(),
+                        textSize = (values[2].toFloat() * 2f).dp.toInt(),
+                        textColor = values[3].toInt(),
+                        position = (values[0].toFloat() * 1000).toLong(),
+                        mode = getType(values[1].toInt())
+                    )
+                }
+            }
+        }
+
+        override fun endElement(uri: String, localName: String, qName: String) {
+            item?.let {
+                val tagName = if (localName.isNotEmpty()) localName else qName
+                if (tagName.equals("d", ignoreCase = true)) {
+                    result.add(it)
+                }
+                item = null
+            }
+        }
+
+        override fun characters(ch: CharArray, start: Int, length: Int) {
+            item?.let {
+                item = DanmakuItemData(
+                    content = decodeXmlString(String(ch, start, length)),
+                    danmakuId = it.danmakuId,
+                    textSize = it.textSize,
+                    textColor = it.textColor,
+                    position = it.position,
+                    mode = it.mode
+                )
+            }
+        }
+
+        private fun decodeXmlString(s: String): String {
+            var result = s
+            if (result.contains("&amp;")) {
+                result = result.replace("&amp;", "&")
+            }
+            if (result.contains("&quot;")) {
+                result = result.replace("&quot;", "\"")
+            }
+            if (result.contains("&gt;")) {
+                result = result.replace("&gt;", ">")
+            }
+            if (result.contains("&lt;")) {
+                result = result.replace("&lt;", "<")
+            }
+            return result
+        }
+
+        companion object {
+            private fun getType(s: Int): Int {
+                // 类型(1从右至左滚动弹幕|6从左至右滚动弹幕|5顶端固定弹幕|4底端固定弹幕|7高级弹幕|8脚本弹幕)
+                return when (s) {
+                    1 -> DanmakuItemData.DANMAKU_MODE_ROLLING
+                    4 -> DanmakuItemData.DANMAKU_MODE_CENTER_BOTTOM
+                    5 -> DanmakuItemData.DANMAKU_MODE_CENTER_TOP
+                    else -> DanmakuItemData.DANMAKU_MODE_ROLLING
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skyd/imomoe/view/fragment/AnimeShowFragment.kt b/app/src/main/java/com/skyd/imomoe/view/fragment/AnimeShowFragment.kt
index 81d60dc0..fab16899 100644
--- a/app/src/main/java/com/skyd/imomoe/view/fragment/AnimeShowFragment.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/fragment/AnimeShowFragment.kt
@@ -8,7 +8,7 @@ import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import com.skyd.imomoe.R
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.databinding.FragmentAnimeShowBinding
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.smartNotifyDataSetChanged
@@ -93,8 +93,8 @@ class AnimeShowFragment : BaseFragment<FragmentAnimeShowBinding>() {
             mBinding.srlAnimeShowFragment.closeHeaderOrFooter()
             adapter.smartNotifyDataSetChanged(it.first, it.second, viewModel.animeShowList)
             when (it.first) {
-                GetDataEnum.REFRESH, GetDataEnum.LOAD_MORE -> hideLoadFailedTip()
-                GetDataEnum.FAILED -> {
+                ResponseDataType.REFRESH, ResponseDataType.LOAD_MORE -> hideLoadFailedTip()
+                ResponseDataType.FAILED -> {
                     showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry)) {
                         viewModel.getAnimeShowData(partUrl)
                         hideLoadFailedTip()
diff --git a/app/src/main/java/com/skyd/imomoe/view/fragment/EverydayAnimeFragment.kt b/app/src/main/java/com/skyd/imomoe/view/fragment/EverydayAnimeFragment.kt
index 268adf58..3a667acc 100644
--- a/app/src/main/java/com/skyd/imomoe/view/fragment/EverydayAnimeFragment.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/fragment/EverydayAnimeFragment.kt
@@ -202,7 +202,6 @@ class EverydayAnimeFragment : BaseFragment<FragmentEverydayAnimeBinding>(), Even
                     if (showRankNumber.isNotEmpty() && showRankNumber[position])
                         adapter.showRankNumber = true
                     holder.rvGridRecyclerView1.adapter = adapter
-                    adapter.notifyDataSetChanged()
                 }
             }
         }
diff --git a/app/src/main/java/com/skyd/imomoe/view/fragment/HomeFragment.kt b/app/src/main/java/com/skyd/imomoe/view/fragment/HomeFragment.kt
index 894f7e46..db9be4d6 100644
--- a/app/src/main/java/com/skyd/imomoe/view/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/fragment/HomeFragment.kt
@@ -28,6 +28,7 @@ import com.skyd.imomoe.util.eventbus.MessageEvent
 import com.skyd.imomoe.util.eventbus.RefreshEvent
 import com.skyd.imomoe.util.eventbus.SelectHomeTabEvent
 import com.skyd.imomoe.view.activity.*
+import com.skyd.imomoe.view.listener.dsl.addOnTabSelectedListener
 import com.skyd.imomoe.viewmodel.HomeViewModel
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -110,29 +111,19 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), EventBusSubscriber {
                 startActivity(Intent(activity, FavoriteActivity::class.java))
             }
 
-            tlHomeFragment.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-                override fun onTabSelected(tab: TabLayout.Tab) {
-                    currentTab = tab.position
-                }
-
-                override fun onTabUnselected(tab: TabLayout.Tab) {
-                    //当选项卡变成未选中状态时调用
-                }
-
-                override fun onTabReselected(tab: TabLayout.Tab) {
-                    adapter.refresh(currentTab)
-                }
-            })
+            tlHomeFragment.addOnTabSelectedListener {
+                onTabSelected { currentTab = it!!.position }
+                onTabReselected { adapter.refresh(currentTab) }
+            }
         }
 
-        viewModel.mldGetAllTabList.observe(viewLifecycleOwner, Observer {
+        viewModel.mldGetAllTabList.observe(viewLifecycleOwner, {
             adapter.clearAllFragment()
             if (!it) {
-                showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry),
-                    View.OnClickListener {
-                        viewModel.getAllTabData()
-                        hideLoadFailedTip()
-                    })
+                showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry)) {
+                    viewModel.getAllTabData()
+                    hideLoadFailedTip()
+                }
                 getString(R.string.get_home_tab_data_failed).showToast(Toast.LENGTH_LONG)
             } else {
                 hideLoadFailedTip()
diff --git a/app/src/main/java/com/skyd/imomoe/view/fragment/RankFragment.kt b/app/src/main/java/com/skyd/imomoe/view/fragment/RankFragment.kt
index 34c74f4f..98cef849 100644
--- a/app/src/main/java/com/skyd/imomoe/view/fragment/RankFragment.kt
+++ b/app/src/main/java/com/skyd/imomoe/view/fragment/RankFragment.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import com.skyd.imomoe.R
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.databinding.FragmentRankBinding
 import com.skyd.imomoe.util.Util.showToast
 import com.skyd.imomoe.util.smartNotifyDataSetChanged
@@ -67,8 +67,8 @@ class RankFragment : BaseFragment<FragmentRankBinding>() {
             adapter.smartNotifyDataSetChanged(it.first, it.second, viewModel.rankList)
 
             when (it.first) {
-                GetDataEnum.REFRESH, GetDataEnum.LOAD_MORE -> hideLoadFailedTip()
-                GetDataEnum.FAILED -> {
+                ResponseDataType.REFRESH, ResponseDataType.LOAD_MORE -> hideLoadFailedTip()
+                ResponseDataType.FAILED -> {
                     showLoadFailedTip(getString(R.string.load_data_failed_click_to_retry)) {
                         viewModel.getRankListData(partUrl)
                         hideLoadFailedTip()
diff --git a/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnItemSelectedListener.kt b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnItemSelectedListener.kt
new file mode 100644
index 00000000..28c25c3d
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnItemSelectedListener.kt
@@ -0,0 +1,35 @@
+package com.skyd.imomoe.view.listener.dsl
+
+import android.view.View
+import android.widget.AdapterView
+import androidx.appcompat.widget.AppCompatSpinner
+
+fun AppCompatSpinner.setOnItemSelectedListener(init: OnItemSelectedListener.() -> Unit) {
+    val listener = OnItemSelectedListener()
+    listener.init()
+    this.onItemSelectedListener = listener
+}
+
+private typealias ItemSelected = (parent: AdapterView<*>?, view: View?, position: Int, id: Long) -> Unit
+private typealias NothingSelected = (parent: AdapterView<*>?) -> Unit
+
+class OnItemSelectedListener : AdapterView.OnItemSelectedListener {
+    private var itemSelected: ItemSelected? = null
+    private var nothingSelected: NothingSelected? = null
+
+    fun onItemSelected(itemSelected: ItemSelected?) {
+        this.itemSelected = itemSelected
+    }
+
+    fun onNothingSelected(nothingSelected: NothingSelected?) {
+        this.nothingSelected = nothingSelected
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        itemSelected?.invoke(parent, view, position, id)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        nothingSelected?.invoke(parent)
+    }
+}
diff --git a/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnSeekBarChangeListener.kt b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnSeekBarChangeListener.kt
new file mode 100644
index 00000000..51ca5e06
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnSeekBarChangeListener.kt
@@ -0,0 +1,43 @@
+package com.skyd.imomoe.view.listener.dsl
+
+import android.widget.SeekBar
+
+fun SeekBar.setOnSeekBarChangeListener(init: OnSeekBarChangeListener.() -> Unit) {
+    val listener = OnSeekBarChangeListener()
+    listener.init()
+    this.setOnSeekBarChangeListener(listener)
+}
+
+private typealias ProgressChanged = (seekBar: SeekBar?, progress: Int, fromUser: Boolean) -> Unit
+private typealias StartTrackingTouch = (seekBar: SeekBar?) -> Unit
+private typealias StopTrackingTouch = (seekBar: SeekBar?) -> Unit
+
+class OnSeekBarChangeListener : SeekBar.OnSeekBarChangeListener {
+    private var progressChanged: ProgressChanged? = null
+    private var startTrackingTouch: StartTrackingTouch? = null
+    private var stopTrackingTouch: StopTrackingTouch? = null
+
+    fun onProgressChanged(progressChanged: ProgressChanged?) {
+        this.progressChanged = progressChanged
+    }
+
+    fun onStartTrackingTouch(startTrackingTouch: StartTrackingTouch?) {
+        this.startTrackingTouch = startTrackingTouch
+    }
+
+    fun onStopTrackingTouch(stopTrackingTouch: StopTrackingTouch?) {
+        this.stopTrackingTouch = stopTrackingTouch
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+        progressChanged?.invoke(seekBar, progress, fromUser)
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar?) {
+        startTrackingTouch?.invoke(seekBar)
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar?) {
+        stopTrackingTouch?.invoke(seekBar)
+    }
+}
diff --git a/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnTabSelectedListener.kt b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnTabSelectedListener.kt
new file mode 100644
index 00000000..b635eddd
--- /dev/null
+++ b/app/src/main/java/com/skyd/imomoe/view/listener/dsl/OnTabSelectedListener.kt
@@ -0,0 +1,43 @@
+package com.skyd.imomoe.view.listener.dsl
+
+import com.google.android.material.tabs.TabLayout
+
+fun TabLayout.addOnTabSelectedListener(init: OnTabSelectedListener.() -> Unit) {
+    val listener = OnTabSelectedListener()
+    listener.init()
+    this.addOnTabSelectedListener(listener)
+}
+
+private typealias TabSelected = (tab: TabLayout.Tab?) -> Unit
+private typealias TabUnselected = (tab: TabLayout.Tab?) -> Unit
+private typealias TabReselected = (tab: TabLayout.Tab?) -> Unit
+
+class OnTabSelectedListener : TabLayout.OnTabSelectedListener {
+    private var tabSelected: TabSelected? = null
+    private var tabUnselected: TabUnselected? = null
+    private var tabReselected: TabReselected? = null
+
+    fun onTabSelected(tabSelected: TabSelected?) {
+        this.tabSelected = tabSelected
+    }
+
+    fun onTabUnselected(tabUnselected: TabUnselected?) {
+        this.tabUnselected = tabUnselected
+    }
+
+    fun onTabReselected(tabReselected: TabReselected?) {
+        this.tabReselected = tabReselected
+    }
+
+    override fun onTabSelected(tab: TabLayout.Tab?) {
+        tabSelected?.invoke(tab)
+    }
+
+    override fun onTabUnselected(tab: TabLayout.Tab?) {
+        tabUnselected?.invoke(tab)
+    }
+
+    override fun onTabReselected(tab: TabLayout.Tab?) {
+        tabReselected?.invoke(tab)
+    }
+}
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDetailViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDetailViewModel.kt
index cb2cb76f..4ea0f143 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDetailViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDetailViewModel.kt
@@ -21,7 +21,7 @@ class AnimeDetailViewModel : ViewModel() {
     var cover: ImageBean = ImageBean("", "", "", "")
     var title: String = ""
     var animeDetailList: MutableList<IAnimeDetailBean> = ArrayList()
-    var mldAnimeDetailList: MutableLiveData<Pair<GetDataEnum, MutableList<IAnimeDetailBean>>> =
+    var mldAnimeDetailList: MutableLiveData<Pair<ResponseDataType, MutableList<IAnimeDetailBean>>> =
         MutableLiveData()
 
     //www.yhdm.io
@@ -31,10 +31,10 @@ class AnimeDetailViewModel : ViewModel() {
                 animeDetailModel.getAnimeDetailData(partUrl).apply {
                     cover = first
                     title = second
-                    mldAnimeDetailList.postValue(Pair(GetDataEnum.REFRESH, third))
+                    mldAnimeDetailList.postValue(Pair(ResponseDataType.REFRESH, third))
                 }
             } catch (e: Exception) {
-                mldAnimeDetailList.postValue(Pair(GetDataEnum.FAILED, ArrayList()))
+                mldAnimeDetailList.postValue(Pair(ResponseDataType.FAILED, ArrayList()))
                 e.printStackTrace()
                 (App.context.getString(R.string.get_data_failed) + "\n" + e.message).showToastOnIOThread()
             }
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDownloadViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDownloadViewModel.kt
index f905a4d8..84020c1a 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDownloadViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeDownloadViewModel.kt
@@ -7,14 +7,14 @@ import com.skyd.imomoe.bean.AnimeCoverBean
 import com.skyd.imomoe.config.Const
 import com.skyd.imomoe.database.entity.AnimeDownloadEntity
 import com.skyd.imomoe.database.getAppDataBase
+import com.skyd.imomoe.util.Util.directorySize
+import com.skyd.imomoe.util.Util.fileSize
 import com.skyd.imomoe.util.comparator.EpisodeTitleComparator
-import com.skyd.imomoe.util.MD5.getMD5
-import com.skyd.imomoe.util.Util.getDirectorySize
-import com.skyd.imomoe.util.Util.getFileSize
 import com.skyd.imomoe.util.Util.getFormatSize
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper.Companion.deleteAnimeFromXml
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper.Companion.getAnimeFromXml
 import com.skyd.imomoe.util.downloadanime.AnimeDownloadHelper.Companion.save2Xml
+import com.skyd.imomoe.util.toMD5
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
@@ -50,7 +50,7 @@ class AnimeDownloadViewModel : ViewModel() {
                                     file.name,
                                     null,
                                     "",
-                                    size = getFormatSize(getDirectorySize(file).toDouble()),
+                                    size = getFormatSize(file.directorySize().toDouble()),
                                     episodeCount = episodeCount.toString() + "P",
                                     path = if (i == 0) 0 else 1
                                 )
@@ -107,7 +107,7 @@ class AnimeDownloadViewModel : ViewModel() {
                         // 试图从数据库中取出不在xml里的视频的数据，如果没找到则是null
                         val unsavedAnime: AnimeDownloadEntity? =
                             getAppDataBase().animeDownloadDao()
-                                .getAnimeDownload(getMD5(file) ?: "")
+                                .getAnimeDownload(file.toMD5() ?: "")
                         if (unsavedAnime != null && unsavedAnime.fileName == null) {
                             unsavedAnime.fileName = file.name
                             getAppDataBase().animeDownloadDao()
@@ -136,12 +136,8 @@ class AnimeDownloadViewModel : ViewModel() {
                             null,
                             "",
                             size = getFormatSize(
-                                getFileSize(
-                                    File(
-                                        animeFilePath +
-                                                directoryName + "/" + anime.fileName
-                                    )
-                                ).toDouble()
+                                File(animeFilePath + directoryName + "/" + anime.fileName)
+                                    .fileSize().toDouble()
                             ),
                             path = path
                         )
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeShowViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeShowViewModel.kt
index aaa17091..88dbfdf3 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeShowViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/AnimeShowViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.bean.IAnimeShowBean
 import com.skyd.imomoe.bean.PageNumberBean
 import com.skyd.imomoe.model.DataSourceManager
@@ -24,7 +24,7 @@ class AnimeShowViewModel : ViewModel() {
     var childViewPool: SerializableRecycledViewPool? = null
     var viewPool: SerializableRecycledViewPool? = null
     var animeShowList: MutableList<IAnimeShowBean> = ArrayList()
-    var mldGetAnimeShowList: MutableLiveData<Pair<GetDataEnum, MutableList<IAnimeShowBean>>> =
+    var mldGetAnimeShowList: MutableLiveData<Pair<ResponseDataType, MutableList<IAnimeShowBean>>> =
         MutableLiveData()   // value：-1错误；0重新获取；1刷新
     var pageNumberBean: PageNumberBean? = null
 
@@ -41,13 +41,13 @@ class AnimeShowViewModel : ViewModel() {
                     pageNumberBean = second
                     mldGetAnimeShowList.postValue(
                         Pair(
-                            if (isRefresh) GetDataEnum.REFRESH else GetDataEnum.LOAD_MORE, first
+                            if (isRefresh) ResponseDataType.REFRESH else ResponseDataType.LOAD_MORE, first
                         )
                     )
                     isRequesting = false
                 }
             } catch (e: Exception) {
-                mldGetAnimeShowList.postValue(Pair(GetDataEnum.FAILED, ArrayList()))
+                mldGetAnimeShowList.postValue(Pair(ResponseDataType.FAILED, ArrayList()))
                 isRequesting = false
                 e.printStackTrace()
                 (App.context.getString(R.string.get_data_failed) + "\n" + e.message).showToastOnIOThread()
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/ClassifyViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/ClassifyViewModel.kt
index 89cab089..bf421622 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/ClassifyViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/ClassifyViewModel.kt
@@ -8,7 +8,7 @@ import com.skyd.imomoe.App
 import com.skyd.imomoe.R
 import com.skyd.imomoe.bean.AnimeCoverBean
 import com.skyd.imomoe.bean.ClassifyBean
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.bean.PageNumberBean
 import com.skyd.imomoe.model.DataSourceManager
 import com.skyd.imomoe.model.impls.ClassifyModel
@@ -24,10 +24,10 @@ class ClassifyViewModel : ViewModel() {
     }
     var isRequesting = false
     var classifyTabList: MutableList<ClassifyBean> = ArrayList()        //上方分类数据
-    var mldClassifyTabList: MutableLiveData<Pair<MutableList<ClassifyBean>, GetDataEnum>> =
+    var mldClassifyTabList: MutableLiveData<Pair<MutableList<ClassifyBean>, ResponseDataType>> =
         MutableLiveData()
     var classifyList: MutableList<AnimeCoverBean> = ArrayList()       //下方tv数据
-    var mldClassifyList: MutableLiveData<Pair<GetDataEnum, MutableList<AnimeCoverBean>>> =
+    var mldClassifyList: MutableLiveData<Pair<ResponseDataType, MutableList<AnimeCoverBean>>> =
         MutableLiveData()
     var pageNumberBean: PageNumberBean? = null
 
@@ -43,11 +43,11 @@ class ClassifyViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 mldClassifyTabList.postValue(
-                    Pair(classifyModel.getClassifyTabData(), GetDataEnum.REFRESH)
+                    Pair(classifyModel.getClassifyTabData(), ResponseDataType.REFRESH)
                 )
             } catch (e: Exception) {
                 classifyTabList.clear()
-                mldClassifyTabList.postValue(Pair(ArrayList(), GetDataEnum.FAILED))
+                mldClassifyTabList.postValue(Pair(ArrayList(), ResponseDataType.FAILED))
                 e.printStackTrace()
                 (App.context.getString(R.string.get_data_failed) + "\n" + e.message).showToastOnIOThread()
             }
@@ -62,12 +62,12 @@ class ClassifyViewModel : ViewModel() {
                 classifyModel.getClassifyData(partUrl).apply {
                     pageNumberBean = second
                     mldClassifyList.postValue(
-                        Pair(if (isRefresh) GetDataEnum.REFRESH else GetDataEnum.LOAD_MORE, first)
+                        Pair(if (isRefresh) ResponseDataType.REFRESH else ResponseDataType.LOAD_MORE, first)
                     )
                 }
             } catch (e: Exception) {
                 pageNumberBean = null
-                mldClassifyList.postValue(Pair(GetDataEnum.FAILED, ArrayList()))
+                mldClassifyList.postValue(Pair(ResponseDataType.FAILED, ArrayList()))
                 e.printStackTrace()
                 (App.context.getString(R.string.get_data_failed) + "\n" + e.message).showToastOnIOThread()
             }
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/RankListViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/RankListViewModel.kt
index 424f191c..73d1ab1f 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/RankListViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/RankListViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.skyd.imomoe.bean.AnimeCoverBean
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.bean.PageNumberBean
 import com.skyd.imomoe.model.DataSourceManager
 import com.skyd.imomoe.model.impls.RankListModel
@@ -24,7 +24,7 @@ class RankListViewModel : ViewModel() {
     var isRequesting = false
     var rankList: MutableList<AnimeCoverBean> = Collections.synchronizedList(ArrayList())
     var pageNumberBean: PageNumberBean? = null
-    var mldRankData: MutableLiveData<Pair<GetDataEnum, MutableList<AnimeCoverBean>>> =
+    var mldRankData: MutableLiveData<Pair<ResponseDataType, MutableList<AnimeCoverBean>>> =
         MutableLiveData()
 
     fun getRankListData(partUrl: String, isRefresh: Boolean = true) {
@@ -37,14 +37,14 @@ class RankListViewModel : ViewModel() {
                     pageNumberBean = second
                     mldRankData.postValue(
                         Pair(
-                            if (isRefresh) GetDataEnum.REFRESH else GetDataEnum.LOAD_MORE,
+                            if (isRefresh) ResponseDataType.REFRESH else ResponseDataType.LOAD_MORE,
                             first.toMutableList()
                         )
                     )
                     isRequesting = false
                 }
             } catch (e: Exception) {
-                mldRankData.postValue(Pair(GetDataEnum.FAILED, ArrayList()))
+                mldRankData.postValue(Pair(ResponseDataType.FAILED, ArrayList()))
                 isRequesting = false
                 e.printStackTrace()
                 e.message?.showToastOnIOThread(Toast.LENGTH_LONG)
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/SearchViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/SearchViewModel.kt
index fe3ddcd9..3d4df39f 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/SearchViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/SearchViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
 import com.skyd.imomoe.bean.AnimeCoverBean
-import com.skyd.imomoe.bean.GetDataEnum
+import com.skyd.imomoe.bean.ResponseDataType
 import com.skyd.imomoe.bean.PageNumberBean
 import com.skyd.imomoe.bean.SearchHistoryBean
 import com.skyd.imomoe.database.getAppDataBase
@@ -24,7 +24,7 @@ class SearchViewModel : ViewModel() {
     }
 
     var searchResultList: MutableList<AnimeCoverBean> = ArrayList()
-    var mldSearchResultList: MutableLiveData<Pair<GetDataEnum, MutableList<AnimeCoverBean>>> =
+    var mldSearchResultList: MutableLiveData<Pair<ResponseDataType, MutableList<AnimeCoverBean>>> =
         MutableLiveData()
     var keyWord = ""
     var searchHistoryList: MutableList<SearchHistoryBean> = ArrayList()
@@ -41,11 +41,11 @@ class SearchViewModel : ViewModel() {
                     pageNumberBean = second
                     this@SearchViewModel.keyWord = keyWord
                     mldSearchResultList.postValue(
-                        Pair(if (isRefresh) GetDataEnum.REFRESH else GetDataEnum.LOAD_MORE, first)
+                        Pair(if (isRefresh) ResponseDataType.REFRESH else ResponseDataType.LOAD_MORE, first)
                     )
                 }
             } catch (e: Exception) {
-                mldSearchResultList.postValue(Pair(GetDataEnum.FAILED, ArrayList()))
+                mldSearchResultList.postValue(Pair(ResponseDataType.FAILED, ArrayList()))
                 e.printStackTrace()
                 (App.context.getString(R.string.get_data_failed) + "\n" + e.message).showToastOnIOThread()
             }
diff --git a/app/src/main/java/com/skyd/imomoe/viewmodel/SettingViewModel.kt b/app/src/main/java/com/skyd/imomoe/viewmodel/SettingViewModel.kt
index 67722ee2..b2b499be 100644
--- a/app/src/main/java/com/skyd/imomoe/viewmodel/SettingViewModel.kt
+++ b/app/src/main/java/com/skyd/imomoe/viewmodel/SettingViewModel.kt
@@ -7,7 +7,7 @@ import coil.util.CoilUtils
 import com.skyd.imomoe.App
 import com.skyd.imomoe.R
 import com.skyd.imomoe.database.getAppDataBase
-import com.skyd.imomoe.util.Util.getDirectorySize
+import com.skyd.imomoe.util.Util.directorySize
 import com.skyd.imomoe.util.Util.getFormatSize
 import com.skyd.imomoe.util.Util.showToastOnIOThread
 import com.skyd.imomoe.util.coil.CoilUtil
@@ -40,7 +40,8 @@ class SettingViewModel : ViewModel() {
             mldCacheSize.postValue(
                 try {
                     getFormatSize(
-                        getDirectorySize(CoilUtils.createDefaultCache(App.context).directory).toDouble()
+                        CoilUtils.createDefaultCache(App.context).directory.directorySize()
+                            .toDouble()
                     )
                 } catch (e: Exception) {
                     e.printStackTrace()
diff --git a/app/src/main/res/drawable/ic_arrow_circle_down_main_color_2_24_skin.xml b/app/src/main/res/drawable/ic_arrow_circle_down_main_color_2_24_skin.xml
index ea8d4b52..afa202f5 100644
--- a/app/src/main/res/drawable/ic_arrow_circle_down_main_color_2_24_skin.xml
+++ b/app/src/main/res/drawable/ic_arrow_circle_down_main_color_2_24_skin.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/foreground_main_color_2_skin"
-        android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-4h-2l0,4H8l4,4l4,-4H13z" />
+        android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-3c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1l0,3H9.21c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.79c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.79c0.31,-0.31 0.09,-0.85 -0.35,-0.85H13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_circle_down_white_24_skin.xml b/app/src/main/res/drawable/ic_arrow_circle_down_white_24_skin.xml
index 45a4a0a0..ac8a6e92 100644
--- a/app/src/main/res/drawable/ic_arrow_circle_down_white_24_skin.xml
+++ b/app/src/main/res/drawable/ic_arrow_circle_down_white_24_skin.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/foreground_white_skin"
-        android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-4h-2l0,4H8l4,4l4,-4H13z" />
+        android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-3c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1l0,3H9.21c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.79c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.79c0.31,-0.31 0.09,-0.85 -0.35,-0.85H13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fast_forward_white_24.xml b/app/src/main/res/drawable/ic_fast_forward_white_24.xml
new file mode 100644
index 00000000..e4749cc2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fast_forward_white_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground_white_skin"
+        android:pathData="M5.58,16.89l5.77,-4.07c0.56,-0.4 0.56,-1.24 0,-1.63L5.58,7.11C4.91,6.65 4,7.12 4,7.93v8.14c0,0.81 0.91,1.28 1.58,0.82zM13,7.93v8.14c0,0.81 0.91,1.28 1.58,0.82l5.77,-4.07c0.56,-0.4 0.56,-1.24 0,-1.63l-5.77,-4.07c-0.67,-0.47 -1.58,0 -1.58,0.81z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_fast_rewind_white_24.xml b/app/src/main/res/drawable/ic_fast_rewind_white_24.xml
new file mode 100644
index 00000000..546e4515
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fast_rewind_white_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground_white_skin"
+        android:pathData="M11,16.07L11,7.93c0,-0.81 -0.91,-1.28 -1.58,-0.82l-5.77,4.07c-0.56,0.4 -0.56,1.24 0,1.63l5.77,4.07c0.67,0.47 1.58,0 1.58,-0.81zM12.66,12.82l5.77,4.07c0.66,0.47 1.58,-0.01 1.58,-0.82L20.01,7.93c0,-0.81 -0.91,-1.28 -1.58,-0.82l-5.77,4.07c-0.57,0.4 -0.57,1.24 0,1.64z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_restore_white_24.xml b/app/src/main/res/drawable/ic_restore_white_24.xml
new file mode 100644
index 00000000..e035c1b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_restore_white_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground_white_skin"
+        android:pathData="M13.25,3c-5.09,-0.14 -9.26,3.94 -9.26,9L2.2,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.32,-0.31 0.09,-0.85 -0.35,-0.85h-1.8c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.43 -0.39,1.13 0.08,1.5 1.52,1.19 3.44,1.9 5.52,1.9 5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.74,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.33,-0.74 -0.75,-0.74z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_everyday_anime.xml b/app/src/main/res/layout/fragment_everyday_anime.xml
index fd0d02a7..3e18455a 100644
--- a/app/src/main/res/layout/fragment_everyday_anime.xml
+++ b/app/src/main/res/layout/fragment_everyday_anime.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:background="@color/main_color_2_skin"
+        android:elevation="5dp"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7b018cec..3109ce08 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:background="@color/main_color_2_skin"
+        android:elevation="5dp"
         android:paddingHorizontal="7dp">
 
         <ImageView
@@ -83,10 +84,10 @@
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tl_home_fragment"
         android:layout_width="match_parent"
-        android:elevation="5dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/cl_home_fragment_header"
         android:background="@color/white_skin"
+        android:elevation="5dp"
         app:tabIndicatorColor="@color/foreground_main_color_2_skin"
         app:tabMode="scrollable"
         app:tabTextColor="@color/foreground_main_color_2_skin" />
diff --git a/app/src/main/res/layout/item_anime_cover_10.xml b/app/src/main/res/layout/item_anime_cover_10.xml
index f164d49c..4a9aba8b 100644
--- a/app/src/main/res/layout/item_anime_cover_10.xml
+++ b/app/src/main/res/layout/item_anime_cover_10.xml
@@ -27,6 +27,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center_vertical"
+        android:maxWidth="110dp"
         android:textColor="@color/widget_everyday_anime_item_text_color"
         android:textSize="17sp"
         tools:text="第10集" />
diff --git a/app/src/main/res/layout/item_anime_cover_3.xml b/app/src/main/res/layout/item_anime_cover_3.xml
index 40366ca2..5eff8909 100644
--- a/app/src/main/res/layout/item_anime_cover_3.xml
+++ b/app/src/main/res/layout/item_anime_cover_3.xml
@@ -8,8 +8,8 @@
 
     <androidx.cardview.widget.CardView
         android:id="@+id/cv_anime_cover_3_cover"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="90dp"
+        android:layout_height="120dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="7dp"
         android:layout_marginBottom="7dp"
@@ -19,32 +19,19 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="90dp"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/iv_anime_cover_3_cover"
-                android:layout_width="90dp"
-                android:layout_height="120dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_launcher_background" />
+        <ImageView
+            android:id="@+id/iv_anime_cover_3_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/ic_launcher_background" />
 
-            <View
-                android:id="@+id/view_anime_cover_3_night"
-                android:layout_width="90dp"
-                android:layout_height="0px"
-                android:background="@color/transparent_skin"
-                app:layout_constraintBottom_toBottomOf="@id/iv_anime_cover_3_cover"
-                app:layout_constraintEnd_toEndOf="@id/iv_anime_cover_3_cover"
-                app:layout_constraintStart_toStartOf="@id/iv_anime_cover_3_cover"
-                app:layout_constraintTop_toTopOf="@id/iv_anime_cover_3_cover" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <View
+            android:id="@+id/view_anime_cover_3_night"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/transparent_skin" />
     </androidx.cardview.widget.CardView>
 
     <com.skyd.imomoe.view.component.textview.TypefaceTextView
diff --git a/app/src/main/res/layout/item_anime_cover_6.xml b/app/src/main/res/layout/item_anime_cover_6.xml
index 88371b3d..03fab2c7 100644
--- a/app/src/main/res/layout/item_anime_cover_6.xml
+++ b/app/src/main/res/layout/item_anime_cover_6.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,29 +10,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_launcher_background" />
 
     <View
         android:id="@+id/view_anime_cover_6_night"
-        android:layout_width="0px"
-        android:layout_height="0px"
-        android:background="@color/transparent_skin"
-        app:layout_constraintBottom_toBottomOf="@id/iv_anime_cover_6_cover"
-        app:layout_constraintEnd_toEndOf="@id/iv_anime_cover_6_cover"
-        app:layout_constraintStart_toStartOf="@id/iv_anime_cover_6_cover"
-        app:layout_constraintTop_toTopOf="@id/iv_anime_cover_6_cover" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/transparent_skin" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
         android:background="@color/gray_2"
-        android:paddingVertical="7dp"
-        app:layout_constraintBottom_toBottomOf="@id/iv_anime_cover_6_cover"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        android:paddingVertical="7dp">
 
         <com.skyd.imomoe.view.component.textview.TypefaceTextView
             android:id="@+id/tv_anime_cover_6_title"
@@ -87,4 +78,4 @@
             app:typeface="bPRTypeface"
             tools:text="全12集" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_anime_cover_8.xml b/app/src/main/res/layout/item_anime_cover_8.xml
index f0f395a4..b3e3f000 100644
--- a/app/src/main/res/layout/item_anime_cover_8.xml
+++ b/app/src/main/res/layout/item_anime_cover_8.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
-    android:layout_marginBottom="2dp"
-    app:cardCornerRadius="5dp">
+    android:layout_marginBottom="2dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0px"
+        app:cardCornerRadius="5dp"
+        app:layout_constraintDimensionRatio="7:10"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/iv_anime_cover_8_cover"
             android:layout_width="match_parent"
-            android:layout_height="0px"
+            android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="7:10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             tools:src="@drawable/ic_launcher_background" />
 
         <View
             android:id="@+id/view_anime_cover_8_night"
             android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:background="@color/transparent_skin"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_height="match_parent"
+            android:background="@color/transparent_skin" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:background="@drawable/shape_gray_transparent_2_angle_90"
             android:orientation="vertical"
             android:paddingHorizontal="7dp"
@@ -71,5 +66,5 @@
                 tools:ignore="SmallSp"
                 tools:text="全12集" />
         </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+    </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_anime_cover_9.xml b/app/src/main/res/layout/item_anime_cover_9.xml
index 172853b5..c8fdd127 100644
--- a/app/src/main/res/layout/item_anime_cover_9.xml
+++ b/app/src/main/res/layout/item_anime_cover_9.xml
@@ -8,8 +8,8 @@
 
     <androidx.cardview.widget.CardView
         android:id="@+id/cv_anime_cover_9_cover"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="120dp"
+        android:layout_height="90dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
@@ -19,31 +19,26 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="120dp"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/iv_anime_cover_9_cover"
-                android:layout_width="120dp"
-                android:layout_height="90dp"
-                android:scaleType="centerCrop"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_launcher_background" />
+        <ImageView
+            android:id="@+id/iv_anime_cover_9_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/ic_launcher_background" />
 
-            <View
-                android:id="@+id/view_anime_cover_9_night"
-                android:layout_width="120dp"
-                android:layout_height="0px"
-                android:background="@color/transparent_skin"
-                app:layout_constraintBottom_toBottomOf="@id/iv_anime_cover_9_cover"
-                app:layout_constraintEnd_toEndOf="@id/iv_anime_cover_9_cover"
-                app:layout_constraintStart_toStartOf="@id/iv_anime_cover_9_cover"
-                app:layout_constraintTop_toTopOf="@id/iv_anime_cover_9_cover" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <View
+            android:id="@+id/view_anime_cover_9_night"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/transparent_skin"
+            app:layout_constraintBottom_toBottomOf="@id/iv_anime_cover_9_cover"
+            app:layout_constraintEnd_toEndOf="@id/iv_anime_cover_9_cover"
+            app:layout_constraintStart_toStartOf="@id/iv_anime_cover_9_cover"
+            app:layout_constraintTop_toTopOf="@id/iv_anime_cover_9_cover" />
     </androidx.cardview.widget.CardView>
 
     <com.skyd.imomoe.view.component.textview.TypefaceTextView
diff --git a/app/src/main/res/layout/item_horizontal_recycler_view_1.xml b/app/src/main/res/layout/item_horizontal_recycler_view_1.xml
index 8efe218d..0fadbeb3 100644
--- a/app/src/main/res/layout/item_horizontal_recycler_view_1.xml
+++ b/app/src/main/res/layout/item_horizontal_recycler_view_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -9,16 +9,13 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_horizontal_recycler_view_1"
         android:layout_width="0px"
-        android:layout_height="0px"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
         android:orientation="horizontal"
         android:paddingVertical="3dp"
         android:paddingStart="16dp"
         android:paddingEnd="0px"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/iv_horizontal_recycler_view_1_more"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     <ImageView
         android:id="@+id/iv_horizontal_recycler_view_1_more"
@@ -26,9 +23,6 @@
         android:layout_height="50dp"
         android:background="?android:selectableItemBackground"
         android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_keyboard_arrow_down_main_color_2_24_skin" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_more_1.xml b/app/src/main/res/layout/item_more_1.xml
index 0c67ef8c..cefe226e 100644
--- a/app/src/main/res/layout/item_more_1.xml
+++ b/app/src/main/res/layout/item_more_1.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_weight="1"
+    android:orientation="vertical"
     android:paddingVertical="30dp">
 
     <ImageView
         android:id="@+id/iv_more_1"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_centerHorizontal="true"
+        android:layout_gravity="center_horizontal"
         android:background="@drawable/bg_circle_main_color_2_50_skin"
         android:padding="13dp"
         tools:src="@drawable/ic_settings_white_24" />
@@ -19,11 +19,10 @@
         android:id="@+id/tv_more_1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/iv_more_1"
-        android:layout_centerHorizontal="true"
+        android:layout_gravity="center_horizontal"
         android:layout_marginTop="10dp"
         android:textColor="@color/foreground_main_color_2_skin"
         android:textSize="15sp"
         tools:text="设置" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_anime_video_player.xml b/app/src/main/res/layout/layout_anime_video_player.xml
index 7b2cb70f..6f2c0773 100644
--- a/app/src/main/res/layout/layout_anime_video_player.xml
+++ b/app/src/main/res/layout/layout_anime_video_player.xml
@@ -21,7 +21,7 @@
             android:gravity="center" />
     </FrameLayout>
 
-    <master.flame.danmaku.ui.widget.DanmakuView
+    <com.kuaishou.akdanmaku.ui.DanmakuView
         android:id="@+id/danmaku_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -133,7 +133,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_circle_corner_edge_main_color_2_ripper_5_skin"
             android:gravity="center_vertical"
-            android:hint="@string/send_a_danmu"
+            android:hint="@string/send_a_danmaku"
             android:imeOptions="actionSend"
             android:paddingHorizontal="10dp"
             android:paddingVertical="2dp"
diff --git a/app/src/main/res/layout/layout_anime_video_player_land.xml b/app/src/main/res/layout/layout_anime_video_player_land.xml
index cd34270a..1e314f7c 100644
--- a/app/src/main/res/layout/layout_anime_video_player_land.xml
+++ b/app/src/main/res/layout/layout_anime_video_player_land.xml
@@ -19,7 +19,7 @@
             android:gravity="center" />
     </FrameLayout>
 
-    <master.flame.danmaku.ui.widget.DanmakuView
+    <com.kuaishou.akdanmaku.ui.DanmakuView
         android:id="@+id/danmaku_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
@@ -34,6 +34,12 @@
         android:layout_alignParentBottom="true"
         android:scaleType="fitCenter" />
 
+    <!--  要在这个位置，若往上，则深色会遮不住某些view，若往下，深色会遮住控制view  -->
+    <View
+        android:id="@+id/view_player_night_screen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <!--高度都加了20dp，让阴影往下延伸一点-->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_bottom"
@@ -127,7 +133,7 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginVertical="5dp"
             android:background="@drawable/shape_fill_circle_corner_danmu_6"
-            android:hint="@string/send_a_danmu"
+            android:hint="@string/send_a_danmaku"
             android:imeOptions="actionSend"
             android:paddingHorizontal="10dp"
             android:singleLine="true"
@@ -318,17 +324,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.skyd.imomoe.view.component.textview.TypefaceTextView
-            android:id="@+id/tv_system_time"
+        <TextClock
+            android:id="@+id/tc_system_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
+            android:layout_marginEnd="16dp"
+            android:format24Hour="HH:mm"
             android:textColor="@color/foreground_white_skin"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_setting"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="17:00" />
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
@@ -369,8 +375,7 @@
         android:layout_alignParentEnd="true"
         android:background="@color/gray_2"
         android:clickable="true"
-        android:focusable="true"
-        tools:visibility="gone">
+        android:focusable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -434,26 +439,131 @@
                     app:drawableTopCompat="@drawable/selector_vertical_reverse_button_skin" />
             </RadioGroup>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray_1" />
+
             <CheckBox
                 android:id="@+id/cb_bottom_progress"
                 android:layout_width="match_parent"
                 android:layout_height="35dp"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="4dp"
                 android:buttonTint="@color/foreground_main_color_2_skin"
                 android:text="@string/bottom_progress"
                 android:textColor="@color/foreground_white_skin" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/gray_1" />
+
             <TextView
                 android:id="@+id/tv_open_by_external_player"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/shape_circle_corner_edge_white_ripper_5_skin"
                 android:gravity="center"
                 android:paddingVertical="9dp"
                 android:text="@string/open_by_external_player"
                 android:textColor="@color/foreground_white_skin" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray_1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/danmaku"
+                android:textColor="@color/foreground_white_skin" />
+
+            <TextView
+                android:id="@+id/tv_input_custom_danmaku_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/shape_circle_corner_edge_white_ripper_5_skin"
+                android:gravity="center"
+                android:paddingVertical="9dp"
+                android:text="@string/input_custom_danmaku_url"
+                android:textColor="@color/foreground_white_skin" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_player_rewind_danmaku_progress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:text="@string/rewind_danmaku_progress"
+                    android:textColor="@color/foreground_white_skin"
+                    android:visibility="gone"
+                    app:drawableTopCompat="@drawable/ic_fast_rewind_white_24"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/tv_player_reset_danmaku_progress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:text="@string/reset_danmaku_progress"
+                    android:textColor="@color/foreground_white_skin"
+                    android:visibility="gone"
+                    app:drawableTopCompat="@drawable/ic_restore_white_24"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/tv_player_forward_danmaku_progress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:text="@string/forward_danmaku_progress"
+                    android:textColor="@color/foreground_white_skin"
+                    android:visibility="gone"
+                    app:drawableTopCompat="@drawable/ic_fast_forward_white_24"
+                    tools:visibility="visible" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray_1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/player_night_screen"
+                android:textColor="@color/foreground_white_skin" />
+
+            <SeekBar
+                android:id="@+id/sb_player_night_screen"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:max="100"
+                android:paddingVertical="10dp"
+                android:progress="0" />
             <!--            <CheckBox-->
             <!--                android:id="@+id/cb_media_codec"-->
             <!--                android:layout_width="wrap_content"-->
diff --git a/app/src/main/res/layout/layout_toolbar_1.xml b/app/src/main/res/layout/layout_toolbar_1.xml
index ec7884fa..b58a1a10 100644
--- a/app/src/main/res/layout/layout_toolbar_1.xml
+++ b/app/src/main/res/layout/layout_toolbar_1.xml
@@ -41,8 +41,8 @@
         android:layout_height="50dp"
         android:background="?android:selectableItemBackground"
         android:padding="14dp"
-        android:src="@drawable/ic_share_white_24"
         android:visibility="gone"
+        tools:src="@drawable/ic_share_white_24"
         tools:visibility="visible" />
 
     <ImageView
@@ -51,7 +51,7 @@
         android:layout_height="50dp"
         android:background="?android:selectableItemBackground"
         android:padding="11dp"
-        android:src="@drawable/ic_star_border_white_24"
         android:visibility="gone"
+        tools:src="@drawable/ic_star_border_white_24"
         tools:visibility="visible" />
 </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 84d58009..af38353e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,7 +14,7 @@
     <color name="gray_1">#878787</color>
     <color name="gray_2">#72000000</color>
     <color name="gray_3">#EAEAEA</color>
-    <color name="gray_4">#0C000000</color>
+    <color name="gray_4">#5E000000</color>
     <color name="gray_5">#2B2B2B</color>
     <color name="golden_1">#E4CD00</color>
     <color name="silvery_1">#9E9E9E</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c4c8a6d..d2a457d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,15 +135,16 @@
     <string name="get_complex_video_finished">结束获取…%s</string>
     <string name="get_complex_videos">获取复杂视频链接</string>
     <string name="please_choose_a_video_link">请选择一个视频链接(共%s条)</string>
-    <string name="load_danmu_failed">弹幕加载失败</string>
+    <string name="load_danmaku_failed">弹幕加载失败</string>
     <string name="cancel_to_get_video_url">取消获取视频链接…</string>
     <string name="fail_to_parse_page_url">解析网页地址失败</string>
-    <string name="loading_danmu">加载弹幕中…</string>
-    <string name="the_video_has_danmu">此视频含弹幕</string>
-    <string name="send_a_danmu">发个弹幕吧…</string>
-    <string name="send_danmu_failed">发送弹幕失败，%s</string>
-    <string name="please_input_danmu_text">请输入弹幕内容！</string>
-    <string name="danmu_exist_shield_content">存在被屏蔽文字，发送失败！</string>
+    <string name="loading_danmaku">加载弹幕中…</string>
+    <string name="the_video_has_danmaku">此视频含弹幕</string>
+    <string name="send_a_danmaku">发个弹幕吧…</string>
+    <string name="send_a_danmaku_is_disabled">发送弹幕功能不可用</string>
+    <string name="send_danmaku_failed">发送弹幕失败，%s</string>
+    <string name="please_input_danmaku_text">请输入弹幕内容！</string>
+    <string name="danmaku_exist_shield_content">存在被屏蔽文字，发送失败！</string>
     <string name="custom_data_source">自定义数据源(beta)</string>
     <string name="custom_data_source_describe">高级功能，具体使用方法请访问Github仓库</string>
     <string name="using_custom_data_source">注意，自定义数据源功能已启用，请确保Jar包无恶意代码！</string>
@@ -161,4 +162,15 @@
     <string name="replay_video">重新播放</string>
     <string name="jump_to_browser_http_warning">此网址使用HTTP协议，不能保证安全性，是否要继续打开浏览器访问？</string>
     <string name="jump_to_data_source_website_warning">若要访问，请千万不要在页面下载任何APP和Jar包等可执行文件</string>
+    <string name="input_custom_danmaku_url">输入自定义弹幕链接</string>
+    <string name="input_danmaku_url">请输入弹幕链接</string>
+    <string name="danmaku_loaded">弹幕已加载</string>
+    <string name="request_danmaku_failed">弹幕获取失败\n%s</string>
+    <string name="danmaku">弹幕</string>
+    <string name="reset_danmaku_progress">还原</string>
+    <string name="forward_danmaku_progress">+2s</string>
+    <string name="rewind_danmaku_progress">-2s</string>
+    <string name="cannot_rewind_over_10s">后退不能超过10秒！</string>
+    <string name="cannot_forward_over_10s">前进不能超过10秒！</string>
+    <string name="player_night_screen">夜间屏幕</string>
 </resources>
diff --git a/app/src/main/res/values/themes_skin.xml b/app/src/main/res/values/themes_skin.xml
index 6ad79a28..b88e5805 100644
--- a/app/src/main/res/values/themes_skin.xml
+++ b/app/src/main/res/values/themes_skin.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.樱花动漫" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Anime.skin" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/main_color_skin</item>
         <item name="colorPrimaryVariant">@color/foreground_main_color_2_skin</item>
diff --git a/skin/src/main/java/com/skyd/skin/SkinManager.kt b/skin/src/main/java/com/skyd/skin/SkinManager.kt
index 9e82788e..f1f5bffa 100644
--- a/skin/src/main/java/com/skyd/skin/SkinManager.kt
+++ b/skin/src/main/java/com/skyd/skin/SkinManager.kt
@@ -183,109 +183,98 @@ object SkinManager {
         customAttrIds[attrId] = listener
     }
 
+    /**
+     * 多用于动态new的View（手动创建的View）的换肤
+     */
+    fun setViewTag(view: View) {
+        val attrsSet = view.getTag(R.id.change_skin_tag)
+        val tag: SkinAttrsSet = if (attrsSet is SkinAttrsSet) attrsSet
+        else SkinAttrsSet()
+        view.setTag(R.id.change_skin_tag, tag)
+        if (view is ChangeCustomSkinListener) {
+            view.setCustomTag()
+        }
+    }
+
+    /**
+     * 设置自定义View的自定义属性（没在xml里应用的）
+     */
+    fun setCustomViewAttrs(view: View, vararg skinAttr: SkinAttr) {
+        val temp = view.getTag(R.id.change_skin_tag)
+        val tag: SkinAttrsSet = if (temp is SkinAttrsSet) temp
+        else SkinAttrsSet()
+        skinAttr.forEach {
+            tag.attrsMap[it.tag()] = it
+        }
+        view.setTag(R.id.change_skin_tag, tag)
+    }
+
+    /**
+     * 设置自定义View的自定义属性（没在xml里应用的）
+     */
+    fun setCustomViewAttrs(view: View, skinAttrsSet: SkinAttrsSet) {
+        val temp = view.getTag(R.id.change_skin_tag)
+        val tag: SkinAttrsSet = if (temp is SkinAttrsSet) temp
+        else SkinAttrsSet()
+        tag.attrsMap.putAll(skinAttrsSet.attrsMap)
+    }
+
+    /**
+     * 获取自定义View的自定义属性（没在xml里应用的）
+     */
+    fun getCustomViewAttrs(view: View): SkinAttrsSet? {
+        val attrsSet = view.getTag(R.id.change_skin_tag)
+        if (attrsSet is SkinAttrsSet) {
+            return attrsSet
+        }
+        return null
+    }
+
     private fun setSkinTag(context: Context, attrs: AttributeSet, view: View) {
         val typedArray = context.obtainStyledAttributes(attrs, attrIds)
         val skinAttrsSet = SkinAttrsSet()
         val defValue = -1
         attrIds.forEachIndexed { index, i ->
             var resId = typedArray.getResourceId(index, defValue)
-            when (i) {
-                R.attr.background, android.R.attr.background -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[BackgroundAttr.TAG] =
-                        BackgroundAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.src -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[SrcAttr.TAG] =
-                        SrcAttr().apply { attrResourceRefId = resId }
-                }
+            val attr = when (i) {
+                R.attr.background, android.R.attr.background -> BackgroundAttr()
+                android.R.attr.src -> SrcAttr()
                 android.R.attr.textColor -> {
                     if (resId == -1 && view is TextView) {
                         resId = getTextColorResId(attrs)
                     }
-                    if (resId != -1) skinAttrsSet.attrsMap[TextColorAttr.TAG] =
-                        TextColorAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.drawableStart -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[DrawableStartAttr.TAG] =
-                        DrawableStartAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.drawableEnd -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[DrawableEndAttr.TAG] =
-                        DrawableEndAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.tabIndicatorColor -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[TabIndicatorColorAttr.TAG] =
-                        TabIndicatorColorAttr().apply { attrResourceRefId = resId }
+                    TextColorAttr()
                 }
+                android.R.attr.drawableStart -> DrawableStartAttr()
+                android.R.attr.drawableEnd -> DrawableEndAttr()
+                R.attr.tabIndicatorColor -> TabIndicatorColorAttr()
                 R.attr.tabTextColor -> {
                     if (resId == -1 && view is TabLayout) {
                         resId = getTextColorResId(attrs)
                     }
-                    if (resId != -1) skinAttrsSet.attrsMap[TabTextColorAttr.TAG] =
-                        TabTextColorAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.scrollbarThumbVertical -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ScrollbarThumbVerticalAttr.TAG] =
-                        ScrollbarThumbVerticalAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.tint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ImageViewTintAttr.TAG] =
-                        ImageViewTintAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.backgroundTint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[BackgroundTintAttr.TAG] =
-                        BackgroundTintAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.textColorHint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[TextColorHintAttr.TAG] =
-                        TextColorHintAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.drawableTopCompat -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[DrawableTopCompatAttr.TAG] =
-                        DrawableTopCompatAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.colorPrimary -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ColorPrimaryAttr.TAG] =
-                        ColorPrimaryAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.srlPrimaryColor -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[SrlPrimaryColorAttr.TAG] =
-                        SrlPrimaryColorAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.thumbTint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ThumbTintAttr.TAG] =
-                        ThumbTintAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.trackTint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[TrackTintAttr.TAG] =
-                        TrackTintAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.buttonTint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ButtonTintAttr.TAG] =
-                        ButtonTintAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.cardBackgroundColor -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[CardBackgroundColorAttr.TAG] =
-                        CardBackgroundColorAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.indeterminateTint -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[IndeterminateTintAttr.TAG] =
-                        IndeterminateTintAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.thumb -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ThumbAttr.TAG] =
-                        ThumbAttr().apply { attrResourceRefId = resId }
-                }
-                android.R.attr.progressDrawable -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ProgressDrawableAttr.TAG] =
-                        ProgressDrawableAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.contentScrim -> {
-                    if (resId != -1) skinAttrsSet.attrsMap[ContentScrimAttr.TAG] =
-                        ContentScrimAttr().apply { attrResourceRefId = resId }
-                }
-                R.attr.menu -> {
-                }
+                    TabTextColorAttr()
+                }
+                android.R.attr.scrollbarThumbVertical -> ScrollbarThumbVerticalAttr()
+                R.attr.tint -> ImageViewTintAttr()
+                android.R.attr.backgroundTint -> BackgroundTintAttr()
+                android.R.attr.textColorHint -> TextColorHintAttr()
+                R.attr.drawableTopCompat -> DrawableTopCompatAttr()
+                R.attr.colorPrimary -> ColorPrimaryAttr()
+                R.attr.srlPrimaryColor -> SrlPrimaryColorAttr()
+                R.attr.thumbTint -> ThumbTintAttr()
+                R.attr.trackTint -> TrackTintAttr()
+                android.R.attr.buttonTint -> ButtonTintAttr()
+                R.attr.cardBackgroundColor -> CardBackgroundColorAttr()
+                android.R.attr.indeterminateTint -> IndeterminateTintAttr()
+                android.R.attr.thumb -> ThumbAttr()
+                android.R.attr.progressDrawable -> ProgressDrawableAttr()
+                R.attr.contentScrim -> ContentScrimAttr()
+                R.attr.menu -> null
+                else -> null
+            }
+            if (attr != null && resId != -1) {
+                attr.attrResourceRefId = resId
+                skinAttrsSet.attrsMap[attr.tag()] = attr
             }
         }
         customAttrIds.toSortedMap().onEachIndexed { index, entry ->
@@ -362,286 +351,6 @@ object SkinManager {
         SkinResourceProcessor.instance.autoLoadSkinResources()
     }
 
-    fun setViewBackground(view: View?, background: Int) {
-        view ?: return
-        val tag = view.getTag(R.id.change_skin_tag)
-        if (tag is SkinAttrsSet) {
-            tag.attrsMap[BackgroundAttr.TAG].let {
-                if (it == null) tag.attrsMap[BackgroundAttr.TAG] = BackgroundAttr().apply {
-                    attrResourceRefId = background
-                } else it.attrResourceRefId = background
-            }
-            view.tag = tag
-        }
-    }
-
-    fun setViewSrc(imageView: ImageView?, src: Int) {
-        imageView ?: return
-        val tag = imageView.getTag(R.id.change_skin_tag)
-        if (tag is SkinAttrsSet) {
-            tag.attrsMap[SrcAttr.TAG].let {
-                if (it == null) tag.attrsMap[SrcAttr.TAG] = SrcAttr().apply {
-                    attrResourceRefId = src
-                } else it.attrResourceRefId = src
-            }
-            imageView.tag = tag
-        }
-    }
-
-    fun setViewTextColor(textView: TextView?, textColor: Int) {
-        textView ?: return
-        val tag = textView.getTag(R.id.change_skin_tag)
-        if (tag is SkinAttrsSet) {
-            tag.attrsMap[TextColorAttr.TAG].let {
-                if (it == null) tag.attrsMap[TextColorAttr.TAG] = TextColorAttr().apply {
-                    attrResourceRefId = textColor
-                } else it.attrResourceRefId = textColor
-            }
-            textView.tag = tag
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun setScrollbarThumbVertical(view: View, resourceId: Int) {
-        if (resourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val drawable = ContextCompat.getDrawable(view.context, resourceId)
-                view.verticalScrollbarThumbDrawable = drawable
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(resourceId)
-                if (skinResourceId is Int) {
-                    view.verticalScrollbarThumbDrawable = ColorDrawable(skinResourceId)
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.verticalScrollbarThumbDrawable = drawable
-                }
-            }
-        }
-    }
-
-    fun setBackground(view: View, backgroundResourceId: Int) {
-        if (backgroundResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val drawable = ContextCompat.getDrawable(view.context, backgroundResourceId)
-                view.background = drawable
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(backgroundResourceId)
-                if (skinResourceId is Int) {
-                    view.setBackgroundColor(skinResourceId)
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.background = drawable
-                }
-            }
-        }
-    }
-
-    fun setBackgroundTint(view: View, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.backgroundTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.backgroundTintList = color
-            }
-        }
-    }
-
-    fun setThumb(view: SeekBar, backgroundResourceId: Int) {
-        if (backgroundResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val drawable = ContextCompat.getDrawable(view.context, backgroundResourceId)
-                view.thumb = drawable
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(backgroundResourceId)
-                if (skinResourceId is Int) {
-                    view.setBackgroundColor(skinResourceId)
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.thumb = drawable
-                }
-            }
-        }
-    }
-
-    fun setProgressDrawable(view: ProgressBar, backgroundResourceId: Int) {
-        if (backgroundResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val drawable = ContextCompat.getDrawable(view.context, backgroundResourceId)
-                view.progressDrawable = drawable
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(backgroundResourceId)
-                if (skinResourceId is Int) {
-                    view.progressDrawable = ColorDrawable(skinResourceId)
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.progressDrawable = drawable
-                }
-            }
-        }
-    }
-
-    fun setSrc(view: ImageView, srcResourceId: Int) {
-        if (srcResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                // 兼容包转换
-                view.setImageResource(srcResourceId)
-                val drawable = ContextCompat.getDrawable(view.context, srcResourceId)
-                view.setImageDrawable(drawable)
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(srcResourceId)
-                // 兼容包转换
-                if (skinResourceId is Int) {
-                    view.setImageResource(skinResourceId)
-                    // setImageBitmap(); // Bitmap未添加
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.setImageDrawable(drawable)
-                }
-            }
-        }
-    }
-
-    fun setDrawableTopCompat(view: TextView, srcResourceId: Int) {
-        if (srcResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                    null,
-                    ContextCompat.getDrawable(view.context, srcResourceId),
-                    null,
-                    null
-                )
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(srcResourceId)
-                // 兼容包转换
-                if (skinResourceId is Int) {
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                        null,
-                        ContextCompat.getDrawable(view.context, srcResourceId),
-                        null,
-                        null
-                    )
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(null, drawable, null, null)
-                }
-            }
-        }
-    }
-
-    fun setDrawableStart(view: TextView, srcResourceId: Int) {
-        if (srcResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                    ContextCompat.getDrawable(view.context, srcResourceId),
-                    null, null, null
-                )
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(srcResourceId)
-                // 兼容包转换
-                if (skinResourceId is Int) {
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                        ContextCompat.getDrawable(view.context, srcResourceId),
-                        null, null, null
-                    )
-                    // setImageBitmap(); // Bitmap未添加
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(drawable, null, null, null)
-                }
-            }
-        }
-    }
-
-    fun setDrawableEnd(view: TextView, srcResourceId: Int) {
-        if (srcResourceId > 0) {
-            // 是否默认皮肤
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                    null,
-                    null, ContextCompat.getDrawable(view.context, srcResourceId), null
-                )
-            } else {
-                // 获取皮肤包资源
-                val skinResourceId = skinResProcessor.getBackgroundOrSrc(srcResourceId)
-                // 兼容包转换
-                if (skinResourceId is Int) {
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                        null,
-                        null, ContextCompat.getDrawable(view.context, srcResourceId), null
-                    )
-                    // setImageBitmap(); // Bitmap未添加
-                } else {
-                    val drawable = skinResourceId as Drawable
-                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, drawable, null)
-                }
-            }
-        }
-    }
-
-    fun setTabTextColor(view: TabLayout, textColorResourceId: Int) {
-        if (textColorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, textColorResourceId)
-                view.tabTextColors = color
-            } else {
-                val color = skinResProcessor.getColorStateList(textColorResourceId)
-                view.tabTextColors = color
-            }
-        }
-    }
-
-    fun setTabIndicatorColor(view: TabLayout, textColorResourceId: Int) {
-        if (textColorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColor(view.context, textColorResourceId)
-                view.setSelectedTabIndicatorColor(color)
-            } else {
-                val color = skinResProcessor.getColor(textColorResourceId)
-                view.setSelectedTabIndicatorColor(color)
-            }
-        }
-    }
-
-    fun setColorSchemeColors(view: SwipeRefreshLayout, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColor(view.context, colorResourceId)
-                view.setColorSchemeColors(color)
-            } else {
-                val color = skinResProcessor.getColor(colorResourceId)
-                view.setColorSchemeColors(color)
-            }
-        }
-    }
-
     fun setSrlPrimaryColorAttr(view: SmartRefreshLayout, colorResourceId: Int) {
         if (colorResourceId > 0) {
             val skinResProcessor = SkinResourceProcessor.instance
@@ -655,136 +364,6 @@ object SkinManager {
         }
     }
 
-    fun setImageViewTint(view: ImageView, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.imageTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.imageTintList = color
-            }
-        }
-    }
-
-    fun setColorSchemeColors(view: MaterialHeader, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColor(view.context, colorResourceId)
-                view.setColorSchemeColors(color)
-            } else {
-                val color = skinResProcessor.getColor(colorResourceId)
-                view.setColorSchemeColors(color)
-            }
-        }
-    }
-
-    fun setAnimatingColor(view: BallPulseFooter, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColor(view.context, colorResourceId)
-                view.setAnimatingColor(color)
-            } else {
-                val color = skinResProcessor.getColor(colorResourceId)
-                view.setAnimatingColor(color)
-            }
-        }
-    }
-
-    fun setTextColor(view: TextView, textColorResourceId: Int) {
-        if (textColorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, textColorResourceId)
-                view.setTextColor(color)
-            } else {
-                val color = skinResProcessor.getColorStateList(textColorResourceId)
-                view.setTextColor(color)
-            }
-        }
-    }
-
-    fun setTextColorHint(view: TextView, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.setHintTextColor(color)
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.setHintTextColor(color)
-            }
-        }
-    }
-
-    fun setThumbTint(view: SwitchCompat, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.thumbTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.thumbTintList = color
-            }
-        }
-    }
-
-    fun setButtonTint(view: CompoundButton, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.buttonTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.buttonTintList = color
-            }
-        }
-    }
-
-    fun setTrackTint(view: SwitchCompat, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.trackTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.trackTintList = color
-            }
-        }
-    }
-
-    fun setIndeterminateTint(view: ProgressBar, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.indeterminateTintList = color
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.indeterminateTintList = color
-            }
-        }
-    }
-
-    fun setCardBackgroundColor(view: CardView, colorResourceId: Int) {
-        if (colorResourceId > 0) {
-            val skinResProcessor = SkinResourceProcessor.instance
-            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val color = ContextCompat.getColorStateList(view.context, colorResourceId)
-                view.setCardBackgroundColor(color)
-            } else {
-                val color = skinResProcessor.getColorStateList(colorResourceId)
-                view.setCardBackgroundColor(color)
-            }
-        }
-    }
-
     fun setTypeface(view: TextView, textTypefaceResourceId: Int) {
         if (textTypefaceResourceId > 0) {
             val skinResProcessor = SkinResourceProcessor.instance
diff --git a/skin/src/main/java/com/skyd/skin/core/SkinAttrsSet.kt b/skin/src/main/java/com/skyd/skin/core/SkinAttrsSet.kt
index c3a63adc..f1275554 100644
--- a/skin/src/main/java/com/skyd/skin/core/SkinAttrsSet.kt
+++ b/skin/src/main/java/com/skyd/skin/core/SkinAttrsSet.kt
@@ -8,7 +8,5 @@ import com.skyd.skin.core.attrs.SkinAttr
 class SkinAttrsSet {
     var attrsMap: HashMap<String, SkinAttr> = HashMap()
 
-    override fun toString(): String {
-        return attrsMap.toString()
-    }
+    override fun toString() = attrsMap.toString()
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundAttr.kt
index 34209ab4..9a61dc94 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundAttr.kt
@@ -1,17 +1,29 @@
 package com.skyd.skin.core.attrs
 
-import android.util.Log
+import android.graphics.drawable.Drawable
 import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class BackgroundAttr : SkinAttr() {
-    companion object {
-        const val TAG = "background"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1) SkinManager.setBackground(view, attrResourceRefId)
+        if (attrResourceRefId != -1) {
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.background = ContextCompat.getDrawable(view.context, attrResourceRefId)
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                if (skinResourceId is Int) {
+                    view.setBackgroundColor(skinResourceId)
+                } else {
+                    view.background = skinResourceId as Drawable
+                }
+            }
+        }
     }
+
+    override fun tag(): String = "background"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundTintAttr.kt
index 1763b45d..84c0647e 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/BackgroundTintAttr.kt
@@ -1,14 +1,21 @@
 package com.skyd.skin.core.attrs
 
 import android.view.View
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class BackgroundTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "backgroundTint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1) SkinManager.setBackgroundTint(view, attrResourceRefId)
+        if (attrResourceRefId != -1) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.backgroundTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.backgroundTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
+        }
     }
+
+    override fun tag(): String = "backgroundTint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ButtonTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ButtonTintAttr.kt
index 07bc66f4..ddf819b1 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ButtonTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ButtonTintAttr.kt
@@ -2,15 +2,21 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import android.widget.CompoundButton
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class ButtonTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "buttonTint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is CompoundButton)
-            SkinManager.setButtonTint(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is CompoundButton) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.buttonTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.buttonTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
+        }
     }
+
+    override fun tag(): String = "buttonTint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/CardBackgroundColorAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/CardBackgroundColorAttr.kt
index 667db50d..a89161b4 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/CardBackgroundColorAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/CardBackgroundColorAttr.kt
@@ -2,15 +2,22 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import androidx.cardview.widget.CardView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class CardBackgroundColorAttr : SkinAttr() {
-    companion object {
-        const val TAG = "cardBackgroundColor"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is CardView)
-            SkinManager.setCardBackgroundColor(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is CardView) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setCardBackgroundColor(
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+                )
+            } else {
+                view.setCardBackgroundColor(skinResProcessor.getColorStateList(attrResourceRefId))
+            }
+        }
     }
+
+    override fun tag(): String = "cardBackgroundColor"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ColorPrimaryAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ColorPrimaryAttr.kt
index b63eb6d1..0d7ed2cf 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ColorPrimaryAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ColorPrimaryAttr.kt
@@ -1,22 +1,28 @@
 package com.skyd.skin.core.attrs
 
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.skyd.skin.SkinManager
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ColorPrimaryAttr : SkinAttr() {
-    companion object {
-        const val TAG = "colorPrimary"
-    }
-
     override fun applySkin(view: View) {
         if (attrResourceRefId == -1) return
         // 按需添加
         when (view) {
             is SwipeRefreshLayout -> {
-                SkinManager.setColorSchemeColors(view, attrResourceRefId)
+                val skinResProcessor = SkinResourceProcessor.instance
+                if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                    view.setColorSchemeColors(
+                        ContextCompat.getColor(view.context, attrResourceRefId)
+                    )
+                } else {
+                    view.setColorSchemeColors(skinResProcessor.getColor(attrResourceRefId))
+                }
             }
         }
     }
+
+    override fun tag(): String = "colorPrimary"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ContentScrimAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ContentScrimAttr.kt
index 4546b666..9dc78620 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ContentScrimAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ContentScrimAttr.kt
@@ -8,26 +8,22 @@ import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ContentScrimAttr : SkinAttr() {
-    companion object {
-        const val TAG = "contentScrim"
-    }
-
     override fun applySkin(view: View) {
         if (view is CollapsingToolbarLayout && attrResourceRefId != -1) {
             val skinResProcessor = SkinResourceProcessor.instance
             if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
-                val drawable = ContextCompat.getDrawable(view.context, attrResourceRefId)
-                view.contentScrim = drawable
+                view.contentScrim = ContextCompat.getDrawable(view.context, attrResourceRefId)
             } else {
                 // 获取皮肤包资源
                 val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
                 if (skinResourceId is Int) {
                     view.setContentScrimColor(skinResourceId)
                 } else {
-                    val drawable = skinResourceId as Drawable
-                    view.contentScrim = drawable
+                    view.contentScrim = skinResourceId as Drawable
                 }
             }
         }
     }
+
+    override fun tag(): String = "contentScrim"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableEndAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableEndAttr.kt
index 115258f0..7e387c0d 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableEndAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableEndAttr.kt
@@ -1,18 +1,39 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.TextView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class DrawableEndAttr : SkinAttr() {
-    companion object {
-        const val TAG = "drawableEnd"
-    }
-
     override fun applySkin(view: View) {
         if (view is TextView && attrResourceRefId != -1) {
-            SkinManager.setDrawableEnd(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    null,
+                    null, ContextCompat.getDrawable(view.context, attrResourceRefId), null
+                )
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                // 兼容包转换
+                if (skinResourceId is Int) {
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        null,
+                        null, ContextCompat.getDrawable(view.context, attrResourceRefId), null
+                    )
+                    // setImageBitmap(); // Bitmap未添加
+                } else {
+                    val drawable = skinResourceId as Drawable
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, drawable, null)
+                }
+            }
         }
     }
+
+    override fun tag(): String = "drawableEnd"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableStartAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableStartAttr.kt
index 01cc83c0..47d2204a 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableStartAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableStartAttr.kt
@@ -1,18 +1,39 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.TextView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class DrawableStartAttr : SkinAttr() {
-    companion object {
-        const val TAG = "drawableStart"
-    }
-
     override fun applySkin(view: View) {
         if (view is TextView && attrResourceRefId != -1) {
-            SkinManager.setDrawableStart(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    ContextCompat.getDrawable(view.context, attrResourceRefId),
+                    null, null, null
+                )
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                // 兼容包转换
+                if (skinResourceId is Int) {
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        ContextCompat.getDrawable(view.context, attrResourceRefId),
+                        null, null, null
+                    )
+                    // setImageBitmap(); // Bitmap未添加
+                } else {
+                    val drawable = skinResourceId as Drawable
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(drawable, null, null, null)
+                }
+            }
         }
     }
+
+    override fun tag(): String = "drawableStart"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableTopCompatAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableTopCompatAttr.kt
index e2f37239..24440474 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/DrawableTopCompatAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/DrawableTopCompatAttr.kt
@@ -1,18 +1,42 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.TextView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class DrawableTopCompatAttr : SkinAttr() {
-    companion object {
-        const val TAG = "drawableTopCompat"
-    }
-
     override fun applySkin(view: View) {
         if (view is TextView && attrResourceRefId != -1) {
-            SkinManager.setDrawableTopCompat(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    null,
+                    ContextCompat.getDrawable(view.context, attrResourceRefId),
+                    null,
+                    null
+                )
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                // 兼容包转换
+                if (skinResourceId is Int) {
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                        null,
+                        ContextCompat.getDrawable(view.context, attrResourceRefId),
+                        null,
+                        null
+                    )
+                } else {
+                    val drawable = skinResourceId as Drawable
+                    view.setCompoundDrawablesRelativeWithIntrinsicBounds(null, drawable, null, null)
+                }
+            }
         }
     }
+
+    override fun tag(): String = "drawableTopCompat"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ImageViewTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ImageViewTintAttr.kt
index 36c37a46..de26287d 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ImageViewTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ImageViewTintAttr.kt
@@ -2,17 +2,22 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import android.widget.ImageView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ImageViewTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "imageViewTint"
-    }
-
     override fun applySkin(view: View) {
         if (view is ImageView && attrResourceRefId != -1) {
-            SkinManager.setImageViewTint(view, attrResourceRefId)
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.imageTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.imageTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
         }
     }
+
+    override fun tag(): String = "imageViewTint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/IndeterminateTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/IndeterminateTintAttr.kt
index 6f0ede74..663468aa 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/IndeterminateTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/IndeterminateTintAttr.kt
@@ -2,15 +2,21 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import android.widget.ProgressBar
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class IndeterminateTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "indeterminateTint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is ProgressBar)
-            SkinManager.setIndeterminateTint(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is ProgressBar) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.indeterminateTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.indeterminateTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
+        }
     }
+
+    override fun tag(): String = "indeterminateTint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ProgressDrawableAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ProgressDrawableAttr.kt
index f462da93..c2f83e12 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ProgressDrawableAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ProgressDrawableAttr.kt
@@ -1,18 +1,31 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ProgressBar
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ProgressDrawableAttr : SkinAttr() {
-    companion object {
-        const val TAG = "progressDrawable"
-    }
-
     override fun applySkin(view: View) {
         if (attrResourceRefId != -1 && view is ProgressBar) {
-            SkinManager.setProgressDrawable(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.progressDrawable = ContextCompat.getDrawable(view.context, attrResourceRefId)
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                if (skinResourceId is Int) {
+                    view.progressDrawable = ColorDrawable(skinResourceId)
+                } else {
+                    view.progressDrawable = skinResourceId as Drawable
+                }
+            }
         }
     }
+
+    override fun tag(): String = "progressDrawable"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ScrollbarThumbVerticalAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ScrollbarThumbVerticalAttr.kt
index 6a0366d8..b0afac05 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ScrollbarThumbVerticalAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ScrollbarThumbVerticalAttr.kt
@@ -1,18 +1,34 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.view.View
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ScrollbarThumbVerticalAttr : SkinAttr() {
-    companion object {
-        const val TAG = "scrollbarThumbVertical"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            SkinManager.setScrollbarThumbVertical(view, attrResourceRefId)
+        if (attrResourceRefId != -1) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                // 是否默认皮肤
+                val skinResProcessor = SkinResourceProcessor.instance
+                if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                    view.verticalScrollbarThumbDrawable =
+                        ContextCompat.getDrawable(view.context, attrResourceRefId)
+                } else {
+                    // 获取皮肤包资源
+                    val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                    if (skinResourceId is Int) {
+                        view.verticalScrollbarThumbDrawable = ColorDrawable(skinResourceId)
+                    } else {
+                        view.verticalScrollbarThumbDrawable = skinResourceId as Drawable
+                    }
+                }
+            }
         }
     }
+
+    override fun tag(): String = "scrollbarThumbVertical"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/SkinAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/SkinAttr.kt
index c25a8dad..16c137e8 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/SkinAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/SkinAttr.kt
@@ -9,4 +9,5 @@ abstract class SkinAttr : Cloneable {
 
     abstract fun applySkin(view: View)
 
+    abstract fun tag(): String
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/SrcAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/SrcAttr.kt
index 94baee69..0b70987c 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/SrcAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/SrcAttr.kt
@@ -1,18 +1,34 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class SrcAttr : SkinAttr() {
-    companion object {
-        const val TAG = "src"
-    }
-
     override fun applySkin(view: View) {
         if (view is ImageView && attrResourceRefId != -1) {
-            SkinManager.setSrc(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                // 兼容包转换
+                view.setImageResource(attrResourceRefId)
+                view.setImageDrawable(ContextCompat.getDrawable(view.context, attrResourceRefId))
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                // 兼容包转换
+                if (skinResourceId is Int) {
+                    view.setImageResource(skinResourceId)
+                    // setImageBitmap(); // Bitmap未添加
+                } else {
+                    view.setImageDrawable(skinResourceId as Drawable)
+                }
+            }
         }
     }
+
+    override fun tag(): String = "src"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/SrlPrimaryColorAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/SrlPrimaryColorAttr.kt
index 5ccce3bf..b08b9a97 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/SrlPrimaryColorAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/SrlPrimaryColorAttr.kt
@@ -1,16 +1,16 @@
 package com.skyd.skin.core.attrs
 
 import android.view.View
+import androidx.core.content.ContextCompat
 import com.scwang.smart.refresh.footer.BallPulseFooter
 import com.scwang.smart.refresh.header.MaterialHeader
 import com.scwang.smart.refresh.layout.SmartRefreshLayout
 import com.skyd.skin.SkinManager
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class SrlPrimaryColorAttr : SkinAttr() {
     companion object {
-        const val TAG = "srlPrimaryColor"
-
         // 设置SrlPrimaryColorAttr时，同时设置刷新头和尾的值
         var materialHeaderColorSchemeRes: Int = -1
         var ballPulseFooterAnimatingColorRes: Int = -1
@@ -19,16 +19,35 @@ class SrlPrimaryColorAttr : SkinAttr() {
     override fun applySkin(view: View) {
         if (view is SmartRefreshLayout && attrResourceRefId != -1) {
             SkinManager.setSrlPrimaryColorAttr(view, attrResourceRefId)
-            view.refreshHeader.let {
-                if (materialHeaderColorSchemeRes != -1 && it is MaterialHeader) {
-                    SkinManager.setColorSchemeColors(it, materialHeaderColorSchemeRes)
+            val skinResProcessor = SkinResourceProcessor.instance
+            view.refreshHeader.let { header ->
+                if (materialHeaderColorSchemeRes != -1 && header is MaterialHeader) {
+                    if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                        header.setColorSchemeColors(
+                            ContextCompat.getColor(header.context, materialHeaderColorSchemeRes)
+                        )
+                    } else {
+                        header.setColorSchemeColors(
+                            skinResProcessor.getColor(materialHeaderColorSchemeRes)
+                        )
+                    }
                 }
             }
-            view.refreshFooter.let {
-                if (ballPulseFooterAnimatingColorRes != -1 && it is BallPulseFooter) {
-                    SkinManager.setAnimatingColor(it, materialHeaderColorSchemeRes)
+            view.refreshFooter.let { footer ->
+                if (ballPulseFooterAnimatingColorRes != -1 && footer is BallPulseFooter) {
+                    if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                        footer.setAnimatingColor(
+                            ContextCompat.getColor(footer.context, materialHeaderColorSchemeRes)
+                        )
+                    } else {
+                        footer.setAnimatingColor(
+                            skinResProcessor.getColor(materialHeaderColorSchemeRes)
+                        )
+                    }
                 }
             }
         }
     }
+
+    override fun tag(): String = "srlPrimaryColor"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/TabIndicatorColorAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/TabIndicatorColorAttr.kt
index 64484f59..b8a01a19 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/TabIndicatorColorAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/TabIndicatorColorAttr.kt
@@ -1,18 +1,24 @@
 package com.skyd.skin.core.attrs
 
 import android.view.View
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
 import com.google.android.material.tabs.TabLayout
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class TabIndicatorColorAttr : SkinAttr() {
-    companion object {
-        const val TAG = "tabIndicatorColor"
-    }
-
     override fun applySkin(view: View) {
         if (view is TabLayout && attrResourceRefId != -1) {
-            SkinManager.setTabIndicatorColor(view, attrResourceRefId)
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setSelectedTabIndicatorColor(
+                    ContextCompat.getColor(view.context, attrResourceRefId)
+                )
+            } else {
+                view.setSelectedTabIndicatorColor(skinResProcessor.getColor(attrResourceRefId))
+            }
         }
     }
+
+    override fun tag(): String = "tabIndicatorColor"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/TabTextColorAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/TabTextColorAttr.kt
index 6b41feae..12d73c80 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/TabTextColorAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/TabTextColorAttr.kt
@@ -1,18 +1,23 @@
 package com.skyd.skin.core.attrs
 
 import android.view.View
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
 import com.google.android.material.tabs.TabLayout
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class TabTextColorAttr : SkinAttr() {
-    companion object {
-        const val TAG = "tabTextColor"
-    }
-
     override fun applySkin(view: View) {
         if (view is TabLayout && attrResourceRefId != -1) {
-            SkinManager.setTabTextColor(view, attrResourceRefId)
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.tabTextColors =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.tabTextColors = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
         }
     }
+
+    override fun tag(): String = "tabTextColor"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/TextColorAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/TextColorAttr.kt
index bc1c0cc8..241aeb09 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/TextColorAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/TextColorAttr.kt
@@ -2,17 +2,21 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import android.widget.TextView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class TextColorAttr : SkinAttr() {
-    companion object {
-        const val TAG = "textColor"
-    }
-
     override fun applySkin(view: View) {
         if (view is TextView && attrResourceRefId != -1) {
-            SkinManager.setTextColor(view, attrResourceRefId)
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setTextColor(ContextCompat.getColorStateList(view.context, attrResourceRefId))
+            } else {
+                view.setTextColor(skinResProcessor.getColorStateList(attrResourceRefId))
+            }
         }
     }
+
+    override fun tag(): String = "textColor"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/TextColorHintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/TextColorHintAttr.kt
index 151625d7..7075533f 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/TextColorHintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/TextColorHintAttr.kt
@@ -2,15 +2,22 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import android.widget.TextView
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class TextColorHintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "textColorHint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is TextView)
-            SkinManager.setTextColorHint(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is TextView) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.setHintTextColor(
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+                )
+            } else {
+                view.setHintTextColor(skinResProcessor.getColorStateList(attrResourceRefId))
+            }
+        }
     }
+
+    override fun tag(): String = "textColorHint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ThumbAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ThumbAttr.kt
index ecabb846..5b455774 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ThumbAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ThumbAttr.kt
@@ -1,18 +1,30 @@
 package com.skyd.skin.core.attrs
 
+import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.SeekBar
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 
 class ThumbAttr : SkinAttr() {
-    companion object {
-        const val TAG = "thumb"
-    }
-
     override fun applySkin(view: View) {
         if (attrResourceRefId != -1 && view is SeekBar) {
-            SkinManager.setThumb(view, attrResourceRefId)
+            // 是否默认皮肤
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.thumb = ContextCompat.getDrawable(view.context, attrResourceRefId)
+            } else {
+                // 获取皮肤包资源
+                val skinResourceId = skinResProcessor.getBackgroundOrSrc(attrResourceRefId)
+                if (skinResourceId is Int) {
+                    view.setBackgroundColor(skinResourceId)
+                } else {
+                    view.thumb = skinResourceId as Drawable
+                }
+            }
         }
     }
+
+    override fun tag(): String = "thumb"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/ThumbTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/ThumbTintAttr.kt
index 664a43e0..9c484308 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/ThumbTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/ThumbTintAttr.kt
@@ -2,15 +2,21 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import androidx.appcompat.widget.SwitchCompat
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class ThumbTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "thumbTint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is SwitchCompat)
-            SkinManager.setThumbTint(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is SwitchCompat) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.thumbTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.thumbTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
+        }
     }
+
+    override fun tag(): String = "thumbTint"
 }
\ No newline at end of file
diff --git a/skin/src/main/java/com/skyd/skin/core/attrs/TrackTintAttr.kt b/skin/src/main/java/com/skyd/skin/core/attrs/TrackTintAttr.kt
index 391bab6f..90cbad4f 100644
--- a/skin/src/main/java/com/skyd/skin/core/attrs/TrackTintAttr.kt
+++ b/skin/src/main/java/com/skyd/skin/core/attrs/TrackTintAttr.kt
@@ -2,15 +2,21 @@ package com.skyd.skin.core.attrs
 
 import android.view.View
 import androidx.appcompat.widget.SwitchCompat
-import com.skyd.skin.SkinManager
+import androidx.core.content.ContextCompat
+import com.skyd.skin.core.SkinResourceProcessor
 
 class TrackTintAttr : SkinAttr() {
-    companion object {
-        const val TAG = "trackTint"
-    }
-
     override fun applySkin(view: View) {
-        if (attrResourceRefId != -1 && view is SwitchCompat)
-            SkinManager.setTrackTint(view, attrResourceRefId)
+        if (attrResourceRefId != -1 && view is SwitchCompat) {
+            val skinResProcessor = SkinResourceProcessor.instance
+            if (skinResProcessor.usingDefaultSkin() && skinResProcessor.usingInnerAppSkin()) {
+                view.trackTintList =
+                    ContextCompat.getColorStateList(view.context, attrResourceRefId)
+            } else {
+                view.trackTintList = skinResProcessor.getColorStateList(attrResourceRefId)
+            }
+        }
     }
+
+    override fun tag(): String = "trackTint"
 }
\ No newline at end of file
diff --git a/skin_blue/src/main/res/values/themes_skin_blue.xml b/skin_blue/src/main/res/values/themes_skin_blue.xml
index 12ce64cf..61cc84a8 100644
--- a/skin_blue/src/main/res/values/themes_skin_blue.xml
+++ b/skin_blue/src/main/res/values/themes_skin_blue.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.樱花动漫.blue" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Anime.skin.blue" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/main_color_skin_blue</item>
         <item name="colorPrimaryVariant">@color/foreground_main_color_2_skin_blue</item>
diff --git a/skin_dark/src/androidTest/java/com/cyeasybuy/skin_dark/ExampleInstrumentedTest.kt b/skin_dark/src/androidTest/java/com/skyd/skin_dark/ExampleInstrumentedTest.kt
similarity index 95%
rename from skin_dark/src/androidTest/java/com/cyeasybuy/skin_dark/ExampleInstrumentedTest.kt
rename to skin_dark/src/androidTest/java/com/skyd/skin_dark/ExampleInstrumentedTest.kt
index efa3bc5d..a3b0ecbb 100644
--- a/skin_dark/src/androidTest/java/com/cyeasybuy/skin_dark/ExampleInstrumentedTest.kt
+++ b/skin_dark/src/androidTest/java/com/skyd/skin_dark/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_dark
+package com.skyd.skin_dark
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/skin_dark/src/main/res/values/themes_skin_dark.xml b/skin_dark/src/main/res/values/themes_skin_dark.xml
index 90fa811b..7862e092 100644
--- a/skin_dark/src/main/res/values/themes_skin_dark.xml
+++ b/skin_dark/src/main/res/values/themes_skin_dark.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.樱花动漫.dark" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Anime.skin.dark" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/main_color_skin_dark</item>
         <item name="colorPrimaryVariant">@color/foreground_main_color_2_skin_dark</item>
diff --git a/skin_dark/src/test/java/com/cyeasybuy/skin_dark/ExampleUnitTest.kt b/skin_dark/src/test/java/com/skyd/skin_dark/ExampleUnitTest.kt
similarity index 90%
rename from skin_dark/src/test/java/com/cyeasybuy/skin_dark/ExampleUnitTest.kt
rename to skin_dark/src/test/java/com/skyd/skin_dark/ExampleUnitTest.kt
index afa4ebdc..12483eb3 100644
--- a/skin_dark/src/test/java/com/cyeasybuy/skin_dark/ExampleUnitTest.kt
+++ b/skin_dark/src/test/java/com/skyd/skin_dark/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_dark
+package com.skyd.skin_dark
 
 import org.junit.Test
 
diff --git a/skin_lemon/src/androidTest/java/com/cyeasybuy/skin_lemon/ExampleInstrumentedTest.kt b/skin_lemon/src/androidTest/java/com/skyd/skin_lemon/ExampleInstrumentedTest.kt
similarity index 95%
rename from skin_lemon/src/androidTest/java/com/cyeasybuy/skin_lemon/ExampleInstrumentedTest.kt
rename to skin_lemon/src/androidTest/java/com/skyd/skin_lemon/ExampleInstrumentedTest.kt
index 6b5e0cc7..8c545268 100644
--- a/skin_lemon/src/androidTest/java/com/cyeasybuy/skin_lemon/ExampleInstrumentedTest.kt
+++ b/skin_lemon/src/androidTest/java/com/skyd/skin_lemon/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_lemon
+package com.skyd.skin_lemon
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/skin_lemon/src/main/res/values/themes_skin_lemon.xml b/skin_lemon/src/main/res/values/themes_skin_lemon.xml
index fbaca65c..28975626 100644
--- a/skin_lemon/src/main/res/values/themes_skin_lemon.xml
+++ b/skin_lemon/src/main/res/values/themes_skin_lemon.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.樱花动漫.lemon" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Anime.skin.lemon" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/main_color_skin_lemon</item>
         <item name="colorPrimaryVariant">@color/foreground_main_color_2_skin_lemon</item>
diff --git a/skin_lemon/src/test/java/com/cyeasybuy/skin_lemon/ExampleUnitTest.kt b/skin_lemon/src/test/java/com/skyd/skin_lemon/ExampleUnitTest.kt
similarity index 90%
rename from skin_lemon/src/test/java/com/cyeasybuy/skin_lemon/ExampleUnitTest.kt
rename to skin_lemon/src/test/java/com/skyd/skin_lemon/ExampleUnitTest.kt
index 0c6e6d3d..450d8330 100644
--- a/skin_lemon/src/test/java/com/cyeasybuy/skin_lemon/ExampleUnitTest.kt
+++ b/skin_lemon/src/test/java/com/skyd/skin_lemon/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_lemon
+package com.skyd.skin_lemon
 
 import org.junit.Test
 
diff --git a/skin_sweat_soybean/src/androidTest/java/com/cyeasybuy/skin_sweat_soybean/ExampleInstrumentedTest.kt b/skin_sweat_soybean/src/androidTest/java/com/skyd/skin_sweat_soybean/ExampleInstrumentedTest.kt
similarity index 94%
rename from skin_sweat_soybean/src/androidTest/java/com/cyeasybuy/skin_sweat_soybean/ExampleInstrumentedTest.kt
rename to skin_sweat_soybean/src/androidTest/java/com/skyd/skin_sweat_soybean/ExampleInstrumentedTest.kt
index e5202305..46684dd3 100644
--- a/skin_sweat_soybean/src/androidTest/java/com/cyeasybuy/skin_sweat_soybean/ExampleInstrumentedTest.kt
+++ b/skin_sweat_soybean/src/androidTest/java/com/skyd/skin_sweat_soybean/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_sweat_soybean
+package com.skyd.skin_sweat_soybean
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/skin_sweat_soybean/src/main/AndroidManifest.xml b/skin_sweat_soybean/src/main/AndroidManifest.xml
index 906f4e61..d422bad1 100644
--- a/skin_sweat_soybean/src/main/AndroidManifest.xml
+++ b/skin_sweat_soybean/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.cyeasybuy.skin_sweat_soybean" />
\ No newline at end of file
+<manifest package="com.skyd.skin_sweat_soybean" />
\ No newline at end of file
diff --git a/skin_sweat_soybean/src/main/res/values/themes_skin_sweat_soybean.xml b/skin_sweat_soybean/src/main/res/values/themes_skin_sweat_soybean.xml
index 48df0774..62dc7716 100644
--- a/skin_sweat_soybean/src/main/res/values/themes_skin_sweat_soybean.xml
+++ b/skin_sweat_soybean/src/main/res/values/themes_skin_sweat_soybean.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.樱花动漫.sweat_soybean" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Anime.skin.sweat_soybean" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/main_color_skin_sweat_soybean</item>
         <item name="colorPrimaryVariant">@color/foreground_main_color_2_skin_sweat_soybean</item>
diff --git a/skin_sweat_soybean/src/test/java/com/cyeasybuy/skin_sweat_soybean/ExampleUnitTest.kt b/skin_sweat_soybean/src/test/java/com/skyd/skin_sweat_soybean/ExampleUnitTest.kt
similarity index 88%
rename from skin_sweat_soybean/src/test/java/com/cyeasybuy/skin_sweat_soybean/ExampleUnitTest.kt
rename to skin_sweat_soybean/src/test/java/com/skyd/skin_sweat_soybean/ExampleUnitTest.kt
index 9074cb1a..39a70472 100644
--- a/skin_sweat_soybean/src/test/java/com/cyeasybuy/skin_sweat_soybean/ExampleUnitTest.kt
+++ b/skin_sweat_soybean/src/test/java/com/skyd/skin_sweat_soybean/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.cyeasybuy.skin_sweat_soybean
+package com.skyd.skin_sweat_soybean
 
 import org.junit.Test
 
diff --git a/version.gradle b/version.gradle
index f0e38b0f..ad403db8 100644
--- a/version.gradle
+++ b/version.gradle
@@ -19,7 +19,7 @@ kotlinx.kotlinx_coroutines_android = "org.jetbrains.kotlinx:kotlinx-coroutines-a
 deps.kotlinx = kotlinx
 
 def support = [:]
-support.constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0"
+support.constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.1"
 support.material = "com.google.android.material:material:1.4.0"
 support.appcompat = "androidx.appcompat:appcompat:1.3.1"
 support.swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -52,15 +52,15 @@ greenrobot.eventbus = "org.greenrobot:eventbus:3.2.0"
 deps.greenrobot = greenrobot
 
 def jsoup = [:]
-jsoup.jsoup = "org.jsoup:jsoup:1.13.1"
+jsoup.jsoup = "org.jsoup:jsoup:1.14.3"
 deps.jsoup = jsoup
 
 def shuyu = [:]
-shuyu.GSYVideoPlayer = "com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.6-jitpack"
+shuyu.GSYVideoPlayer = "com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.7-release-jitpack"
 deps.shuyu = shuyu
 
 def getActivity = [:]
-getActivity.XXPermissions = "com.github.getActivity:XXPermissions:12.5"
+getActivity.XXPermissions = "com.github.getActivity:XXPermissions:13.2"
 deps.getActivity = getActivity
 
 def filedownloader = [:]
@@ -89,7 +89,7 @@ nanohttpd.nanohttpd = "org.nanohttpd:nanohttpd:2.3.1"
 deps.nanohttpd = nanohttpd
 
 def coil_kt = [:]
-coil_kt.coil = "io.coil-kt:coil:1.3.2"
+coil_kt.coil = "io.coil-kt:coil:1.4.0"
 deps.coil_kt = coil_kt
 
 def smart = [:]
@@ -98,10 +98,6 @@ smart.refresh_header_material = "com.scwang.smart:refresh-header-material:2.0.3"
 smart.refresh_footer_ball = "com.scwang.smart:refresh-footer-ball:2.0.3"            // 球脉冲加载
 deps.smart = smart
 
-def ctiao = [:]
-ctiao.DanmakuFlameMaster = "com.github.ctiao:DanmakuFlameMaster:0.9.25"
-deps.ctiao = ctiao
-
 def umsdk = [:]
 umsdk.common = "com.umeng.umsdk:common:9.4.2"
 umsdk.asms = "com.umeng.umsdk:asms:1.4.1"   // asms包依赖
@@ -109,4 +105,8 @@ umsdk.push = "com.umeng.umsdk:push:6.4.0"
 umsdk.apm = "com.umeng.umsdk:apm:1.4.1"     // U-APM产品包依赖
 deps.umsdk = umsdk
 
+def kuaishou = [:]
+kuaishou.akdanmaku = "com.kuaishou:akdanmaku:1.0.3"
+deps.kuaishou = kuaishou
+
 ext.deps = deps