同步imcys分支内容

README-en_US.md

@@ -0,0 +1,100 @@
+<div align="center">
+
+![](https://github.com/1250422131/bilibilias/blob/develop/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
+
+# BILIBILIAS
+
+![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/1250422131/bilibilias?label=version)
+![Android Sdk Require](https://img.shields.io/badge/android-5.0%2B-informational)
+![GitHub](https://img.shields.io/github/license/1250422131/bilibilias)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.7.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
+
+</div>
+
+---
+
+**Language:**
+- English (United States)
+- [简体中文](./README.md)
+- [繁体中文(台湾)](./README-zh_TW.md)
+
+## Introduction
+
+**BILIBILIAS** is an auxiliary tool for Bilibili video caching, providing one-click caching.
+
+Use it to help you cache videos. Currently, we support a considerable number of features to assist you in completing your work.
+
+UP creators can download some clips as material for video editing.
+
+Please note that the project's maintenance may be stopped at any time.
+
+## Supported Features
+
+- Completed features
+- [x] Scan code login
+- [x] Cache videos/Bilibili exclusive anime that can be played in Mainland China
+- [x] Personal Center -> Help cache your own videos
+- [x] Batch download
+- [x] Background download
+- [x] Support ffmpeg
+- [x] Support download list operations
+
+## Special Thanks for Internationalization Support
+
+[xiwangly: Provided en_US and zh_TW language support](https://github.com/xiwangly2)
+
+## Special Thanks to Open Source Projects
+
+[Ktor: Efficient network requests in coroutines](https://ktor.io/)
+
+[bilibili-API-collect: API interface reference](https://github.com/SocialSisterYi/bilibili-API-collect)
+
+[flexbox: Flexbox layout](https://github.com/google/flexbox-layout)
+
+[jxl: Used for direct generation of Excel files](https://mvnrepository.com/artifact/net.sourceforge.jexcelapi/jxl/2.6.12)
+
+[BRV: Realize animation effects for RecyclerView](https://github.com/liangjingkanji/BRV)
+
+[RxFFmpeg: Support video merging and other operations](https://github.com/microshow/RxFFmpeg)
+
+[KComponent: Component-based routing library](https://github.com/xiaojinzi123/KComponent)
+
+[HighLightPro: Splash screen guide](https://github.com/hyy920109/HighLightPro)
+
+[Appcenter: Distribution and user data statistics](https://appcenter.ms/)
+
+[Baidu Statistics: APP usage data statistics](https://mtj.baidu.com/web/welcome/login)
+
+[xutils: Download implementation](https://github.com/wyouflf/xUtils3)
+
+[DanmakuFlameMaster: Bilibili danmaku engine](https://github.com/bilibili/DanmakuFlameMaster)
+
+[JZVideoPlayer: Jiaozi video player](https://github.com/Jzvd/JZVideo)
+
+[lottie: Partial animation implementation](https://github.com/airbnb/lottie-android)
+
+[UltimateBarX: Immersive layout](https://github.com/Zackratos/UltimateBarX)
+
+## Download
+
+|   System    |                            GitHub                            |                  Official Website                   |
+|:-------:|:------------------------------------------------------------:|:-------------------------------------:|
+| Android | [Release](https://github.com/1250422131/bilibilias/releases) | [Official Website](https://api.misakamoe.com/app/) |
+
+## 🔭Recent Stars
+
+Here are the users who recently starred the **BILIBILIAS** project.
+
+[![Stargazers repo roster for @1250422131/1250422131](https://reporoster.com/stars/1250422131/bilibilias)](https://github.com/1250422131/bilibilias/stargazers)
+
+## 🎢Star Progress
+
+![](https://api.star-history.com/svg?repos=1250422131/bilibilias&type=Date)
+
+## Feedback
+
+QQ Group: 703180724
+Bilibili: [萌新杰少](https://space.bilibili.com/351201307)
+Feedback Community: [兔小巢](https://support.qq.com/product/337496)
+
+## Special Thanks

README-zh_TW.md

@@ -0,0 +1,102 @@
+<div align="center">
+
+![](https://github.com/1250422131/bilibilias/blob/develop/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
+
+# BILIBILIAS
+
+![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/1250422131/bilibilias?label=version)
+![Android Sdk Require](https://img.shields.io/badge/android-5.0%2B-informational)
+![GitHub](https://img.shields.io/github/license/1250422131/bilibilias)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.7.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
+
+</div>
+
+---
+
+**語言選擇:**
+- [English (United States)](./README-en_US.md) (英文版)
+- [简体中文](./READMEmd) (简体中文版)
+- [繁體中文(台灣)](./README-zh_TW.md) (繁體中文版-台灣)
+
+## 簡介
+
+**BILIBILIAS** 是一款B站，哔哩哔哩視頻緩存的輔助工具，一鍵解析緩存。
+
+使用它來幫助你緩存視頻，目前我們也支持了相當多的功能，使用它幫助你完成工作。
+
+UP主可以下載一些剪輯素材，來做視頻。
+
+項目特殊性，隨時可能停止運維。
+
+## 支持的功能
+
+- 完成的功能
+- [x] 掃碼登錄
+- [x] 緩存視頻/大陸支持播放的番劇
+- [x] 個人中心 -> 幫助緩存自己的視頻
+- [x] 批量下載
+- [x] 後臺下載功能
+- [x] 支持ffmpeg
+- [x] 支持下載列表操作
+
+## 感謝國際化支持
+
+[xiwangly：提供en_US，zh_TW語言支持](https://github.com/xiwangly2)
+
+## 感謝開源項目
+
+[Ktor：協程中高效網路請求](https://ktor.io/)
+
+[bilibili-API-collect：API接口參考](https://github.com/SocialSisterYi/bilibili-API-collect)
+
+[flexbox：伸縮佈局](https://github.com/google/flexbox-layout)
+
+[jxl：直接生成excel文件時採用](https://mvnrepository.com/artifact/net.sourceforge.jexcelapi/jxl/2.6.12)
+
+[BRV：實現RV的動畫效果](https://github.com/liangjingkanji/BRV)
+
+[RxFFmpeg：支持視頻合併等操作](https://github.com/microshow/RxFFmpeg)
+
+[KComponent：組件化路由庫](https://github.com/xiaojinzi123/KComponent)
+
+[HighLightPro：開屏引導](https://github.com/hyy920109/HighLightPro)
+
+[Appcenter：分發以及用戶數據統計](https://appcenter.ms/)
+
+[百度統計：APP使用數據統計](https://mtj.baidu.com/web/welcome/login)
+
+[xutils：下載實現](https://github.com/wyouflf/xUtils3)
+
+[DanmakuFlameMaster：烈焰彈幕使](https://github.com/bilibili/DanmakuFlameMaster)
+
+[饺子播放器](https://github.com/Jzvd/JZVideo)
+
+[lottie：部分動畫實現](https://github.com/airbnb/lottie-android)
+
+[UltimateBarX：沉浸式佈局](https://github.com/Zackratos/UltimateBarX)
+
+## 下載
+
+|   系統    |                            GitHub                            |                  官網                   |
+|:-------:|:------------------------------------------------------------:|:-------------------------------------:|
+| Android | [Release](https://github.com/1250422131/bilibilias/releases) | [官網](https://api.misakamoe.com/app/) |
+
+## 🔭最近關注
+
+這裡展示的是最近Star了 **BILIBILIAS** 專案的使用者
+
+[![Stargazers repo roster for @1250422131/1250422131](https://reporoster.com/stars/1250422131/bilibilias)](https://github.com/1250422131/bilibilias/stargazers)
+
+## 🎢Star進展
+
+![](https://api.star-history.com/svg?repos=1250422131/bilibilias&type=Date)
+
+## 問題反饋
+
+企鵝群：703180724
+
+哔哩哔哩：[萌新杰少](https://space.bilibili.com/351201307)
+
+反饋社區：[兔小巢](https://support.qq.com/product/337496)
+
+## 特別感謝

README.md

@@ -13,6 +13,12 @@
 
 ---
 
+**Language:**
+
+- [English (United States)](./README-en_US.md)
+- 简体中文
+- [繁体中文(台湾)](./README-zh_TW.md)
+
 ## 简介
 
 **BILIBILIAS**是一款B站，哔哩哔哩视频缓存的辅助工具，一键解析缓存
@@ -34,9 +40,9 @@ UP主可以下载一些剪辑素材，来做视频
 - [x] 支持ffmpeg
 - [x] 支持下载列表操作
 
-## 感谢翻译支持
+## 感谢国际化支持
 
-[xiwangly：提供英语，繁体翻译](https://github.com/xiwangly2)
+[xiwangly：提供en_US，zh_TW语言支持](https://github.com/xiwangly2)
 
 ## 感谢开源项目
 
@@ -72,8 +78,8 @@ UP主可以下载一些剪辑素材，来做视频
 
 ## 下载
 
-|   系统    |                            GitHub                            |                  官网                   |
-|:-------:|:------------------------------------------------------------:|:-------------------------------------:|
+|   系统    |                            GitHub                            |                  官网                  |
+|:-------:|:------------------------------------------------------------:|:------------------------------------:|
 | Android | [Release](https://github.com/1250422131/bilibilias/releases) | [官网](https://api.misakamoe.com/app/) |
 
 ## 🔭最近关注

app/build.gradle

@@ -20,7 +20,7 @@ android {
         applicationId "com.imcys.bilibilias"
         minSdk 21
         //noinspecton ExpiredTargetSdkVersion
-        targetSdk 33
+        targetSdk 32
         versionCode 203
         versionName "2.0.31"
         //multiDexEnabled true
@@ -132,21 +132,21 @@ dependencies {
 
     implementation project(":common")
     implementation project(":model_ffmpeg")
-    implementation project(":tool_livestream")
     implementation project(":tool_log_export")
+
+    ksp 'com.imcys.deeprecopy:compiler:0.0.1-Alpha-12'
+
     implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation "com.google.dagger:hilt-android:2.44"
+    implementation 'androidx.work:work-runtime-ktx:2.8.1'
     kapt "com.google.dagger:hilt-compiler:2.44"
 
-
     ksp "com.github.xiaojinzi123.KComponent:kcomponent-compiler:1.0.0-rc4"
     implementation 'com.google.android.material:material:1.8.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    //新增
-//    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3"
-//    debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3"
+
 }

app/proguard-package.txt

@@ -1,7 +1,9 @@
-lolita
-kawaii
-love
-Cute_is_justice
+擅长捉弄的高木同学
+高木
+西片
+路人女主的养成方法
+我的妹妹不可能这么可爱
+英梨梨
 未闻花名
 龙王的工作
 从零开始的异世界生活

app/src/androidTest/java/com/imcys/bilibilias/ExampleInstrumentedTest.kt

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.imcys.bilibilias.base.app.App
+import com.imcys.bilibilias.danmaku.change.DmXmlToAss
 import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -15,7 +16,7 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    companion object{
+    companion object {
         var TAG = "ExampleInstrumentedTest"
     }
 
@@ -27,7 +28,7 @@ class ExampleInstrumentedTest {
     }
 
     @Test
-    fun outputJson(){
+    fun outputJson() {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
         val videoIndex: String by lazy {
@@ -41,4 +42,6 @@ class ExampleInstrumentedTest {
         Log.d(TAG, videoIndex)
         Log.d(TAG, bangumiEntry)
     }
-}
+
+}
+

app/src/main/AndroidManifest.xml

@@ -5,13 +5,15 @@
     <uses-permission android:name="android.permission.INTERNET" /> <!-- 允许访问网络状态的权限 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" /> <!-- 百度移动统计SDK -->
+    <uses-permission android:name="android.permission.WRITE_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_MEDIA_VIDEO" />
+
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission

app/src/main/java/com/imcys/bilibilias/base/model/user/UserInfoBean.java

@@ -476,8 +476,8 @@ public static class MedalBean implements Serializable {
                  * score : 1349
                  */
 
-                private int uid;
-                private int target_id;
+                private long uid;
+                private long target_id;
                 private int medal_id;
                 private int level;
                 private String medal_name;
@@ -493,15 +493,15 @@ public static class MedalBean implements Serializable {
                 private int wearing_status;
                 private int score;
 
-                public int getUid() {
+                public long getUid() {
                     return uid;
                 }
 
                 public void setUid(int uid) {
                     this.uid = uid;
                 }
 
-                public int getTarget_id() {
+                public long getTarget_id() {
                     return target_id;
                 }