Commit Graph
100 Commits
Author SHA1 Message Date
kunfei f4e5eedb37 修复在线tts朗读失败bug 2023-05-13 23:25:08 +08:00
kunfei 0cbf86b83c Merge remote-tracking branch 'origin/master' 2023-05-12 21:21:42 +08:00
kunfei a6775846fb 优化 2023-05-12 21:21:30 +08:00
kunfei 746386739d 优化 2023-05-12 21:20:52 +08:00
kunfei c94b2acb2c 优化 2023-05-11 21:36:51 +08:00
kunfei 7ee01c194f Merge pull request #3080 from ag2s20150909/master
迁移到Androidx Media3
2023-05-11 20:53:39 +08:00
kunfei f8d9089915 Merge remote-tracking branch 'origin/master' 2023-05-11 10:09:20 +08:00
kunfei 5195bbed78 优化 2023-05-11 10:09:04 +08:00
kunfei a69161e468 替换规则添加排除字段 2023-05-10 22:29:08 +08:00
kunfei 11eb96fb11 替换规则添加排除字段 2023-05-10 22:27:21 +08:00
kunfei 0ae216ce10 替换规则添加排除字段 2023-05-10 22:26:30 +08:00
kunfei 12924bb9fc 替换规则添加排除字段 2023-05-10 20:58:45 +08:00
kunfei 80d58535a7 Merge remote-tracking branch 'origin/master' 2023-05-09 08:11:09 +08:00
kunfei ddaad60d46 优化 2023-05-09 08:10:57 +08:00
kunfei 23bf2d2c9e Merge remote-tracking branch 'origin/master' 2023-05-08 23:09:38 +08:00
kunfei 76eb090043 优化 2023-05-08 23:09:25 +08:00
kunfei 67ed43d29b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/src/main/assets/updateLog.md
2023-05-08 21:00:03 +08:00
kunfei 8cdeb33dd6 优化 2023-05-08 20:44:33 +08:00
kunfei 3457eb70e9 优化 2023-05-08 20:39:20 +08:00
kunfei 5969bb133c Merge pull request #3068 from gedoor/dependabot/gradle/com.google.protobuf-protobuf-javalite-3.22.4
Bump com.google.protobuf:protobuf-javalite from 3.22.3 to 3.22.4
2023-05-08 14:26:43 +08:00
kunfei 1b8569cb81 Merge pull request #3067 from gedoor/dependabot/gradle/coroutines_version-1.7.0
Bump coroutines_version from 1.6.4 to 1.7.0
2023-05-08 14:26:30 +08:00
kunfei c1e8add7e3 Merge pull request #3064 from gedoor/cronet
Bump cronet from 113.0.5672.61 to 113.0.5672.76
2023-05-08 14:26:18 +08:00
kunfei 0a69056069 Merge pull request #3065 from h11128/check-source-content-single
单章换源加载字数
2023-05-08 14:26:04 +08:00
kunfei 55c86fe8a2 Merge pull request #3063 from h11128/check-source-content
添加换源加载字数选项,显示当前章节或者最新章节字数
2023-05-08 08:44:38 +08:00
kunfei 77f931fffb 优化 2023-05-06 16:40:51 +08:00
kunfei e3903ded3b 优化 2023-05-06 14:42:26 +08:00
kunfei 58cb296f4e 优化 2023-05-04 22:50:22 +08:00
kunfei aabece0a9e Merge remote-tracking branch 'origin/master' 2023-05-04 22:36:19 +08:00
kunfei 8a511365b6 优化 2023-05-04 22:36:07 +08:00
kunfei d70b685f47 优化 2023-05-03 22:01:07 +08:00
kunfei 44a3591b1b Merge pull request #3049 from MakeHui/dev
更新 web/uploadBook, 添加选择文件功能
2023-05-03 20:39:31 +08:00
kunfei e04f83e225 Update LICENSE 2023-05-03 09:40:27 +08:00
kunfei a97294be68 优化 2023-05-03 09:37:07 +08:00
kunfei 795872477e 优化 2023-05-03 09:12:39 +08:00
kunfei aa253597fe 优化 2023-05-02 22:36:20 +08:00
kunfei ca31385bbe Merge remote-tracking branch 'origin/master' 2023-05-02 21:26:56 +08:00
kunfei fcd5cef265 优化 2023-05-02 21:26:43 +08:00
kunfei 4c152bf44c Merge pull request #3043 from gedoor/dependabot/gradle/kotlin_version-1.8.21
Bump kotlin_version from 1.8.20 to 1.8.21
2023-05-01 18:08:31 +08:00
kunfei 26ea20ce8a Merge pull request #3042 from gedoor/dependabot/gradle/org.jsoup-jsoup-1.16.1
Bump org.jsoup:jsoup from 1.15.4 to 1.16.1
2023-05-01 18:08:19 +08:00
kunfei e1a20d4655 Merge pull request #3041 from gedoor/cronet
Bump cronet from 112.0.5615.135 to 113.0.5672.61
2023-05-01 18:08:07 +08:00
kunfei f083b2a608 Merge pull request #3022 from gedoor/cronet
Bump cronet from 112.0.5615.100 to 112.0.5615.135
2023-04-25 11:02:41 +08:00
kunfei 35d733b7de Merge pull request #3024 from gedoor/dependabot/gradle/androidx.fragment-fragment-ktx-1.5.7
Bump androidx.fragment:fragment-ktx from 1.5.6 to 1.5.7
2023-04-25 11:02:30 +08:00
kunfei 0d4278fce5 Merge pull request #3025 from gedoor/dependabot/gradle/androidx.activity-activity-ktx-1.7.1
Bump androidx.activity:activity-ktx from 1.7.0 to 1.7.1
2023-04-25 11:01:28 +08:00
kunfei 66cd9b3cb2 Merge pull request #3026 from gedoor/dependabot/gradle/exoplayer_version-2.18.6
Bump exoplayer_version from 2.18.5 to 2.18.6
2023-04-25 11:01:18 +08:00
kunfei 6a6fd6bffb Merge pull request #3027 from gedoor/dependabot/gradle/com.squareup.okhttp3-okhttp-4.11.0
Bump com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0
2023-04-25 11:01:07 +08:00
kunfei 8772ac785f 优化 2023-04-21 23:44:32 +08:00
kunfei fe693316d5 Merge remote-tracking branch 'origin/master' 2023-04-21 15:41:23 +08:00
kunfei 4d6b501866 优化 2023-04-21 15:40:39 +08:00
kunfei 138ef6a187 Merge remote-tracking branch 'origin/master' 2023-04-21 14:09:21 +08:00
kunfei 9b9587d70b 优化 2023-04-21 14:04:59 +08:00
kunfei 48bec1efe7 优化 2023-04-21 00:17:59 +08:00
kunfei f704db3384 优化 2023-04-20 23:42:51 +08:00
kunfei 4db8213312 优化 2023-04-20 22:49:12 +08:00
kunfei f817954b7c 优化 2023-04-20 21:22:24 +08:00
kunfei a478f7328d 优化 2023-04-20 08:20:30 +08:00
kunfei ea9b9f95b0 优化 2023-04-19 23:22:14 +08:00
kunfei 3217fc39a3 优化 2023-04-19 22:39:34 +08:00
kunfei 2df413a8ad 优化 2023-04-19 22:37:00 +08:00
kunfei 033139c5ed 优化 2023-04-19 22:31:22 +08:00
kunfei daeec03330 优化 2023-04-19 22:25:01 +08:00
kunfei 28544e483c 优化 2023-04-19 19:48:04 +08:00
kunfei 145016f9a1 Merge remote-tracking branch 'origin/master' 2023-04-19 17:24:26 +08:00
kunfei dc7a3d92b6 优化 2023-04-19 17:24:09 +08:00
kunfei d8cbf2769b Merge remote-tracking branch 'origin/master' 2023-04-19 15:10:11 +08:00
kunfei abeee8acf9 优化 2023-04-19 15:09:57 +08:00
kunfei 6df01b1bf4 优化 2023-04-19 08:54:18 +08:00
kunfei 8224f0b055 添加本地密码设置,用来对备份的敏感信息进行加密和解密 2023-04-18 23:13:17 +08:00
kunfei eb9132ddcc 优化 2023-04-18 20:10:35 +08:00
kunfei 5e6b56076b 优化 2023-04-18 19:57:58 +08:00
kunfei b3571d93d6 优化 2023-04-18 11:22:18 +08:00
kunfei e52caecefd 优化 2023-04-18 11:20:09 +08:00
kunfei 715f0ff59f Merge remote-tracking branch 'origin/master' 2023-04-18 10:57:19 +08:00
kunfei 24e352cccc 优化 2023-04-18 10:57:06 +08:00
kunfei e03b2d7c7e jsLib完成 2023-04-18 09:08:54 +08:00
kunfei 28bcb63d6a 源添加jsLib,未完成 2023-04-17 19:41:20 +08:00
kunfei 17056c8bd3 Merge pull request #3003 from gedoor/dependabot/gradle/cn.hutool-hutool-crypto-5.8.18
Bump cn.hutool:hutool-crypto from 5.8.17 to 5.8.18
2023-04-17 16:39:27 +08:00
kunfei 8e077dab40 Merge pull request #3002 from gedoor/cronet
Bump cronet from 112.0.5615.47 to 112.0.5615.100
2023-04-17 16:38:55 +08:00
kunfei 21c677cb3a 优化 2023-04-17 10:46:16 +08:00
kunfei 27e07509a6 优化 2023-04-17 10:40:12 +08:00
kunfei 4c5715dd5b 优化 2023-04-17 10:37:26 +08:00
kunfei 37421c2c57 优化 2023-04-17 10:26:36 +08:00
kunfei 4944488b7f 优化 2023-04-17 09:33:40 +08:00
kunfei f9cf6267db Merge remote-tracking branch 'origin/master' 2023-04-16 22:52:21 +08:00
kunfei 136a936286 源添加jsLib,未完成 2023-04-16 22:52:07 +08:00
kunfei 3aafda8ac0 Merge pull request #2994 from gedoor/dependabot/gradle/de.undercouch.download-5.4.0
Bump de.undercouch.download from 5.2.1 to 5.4.0
2023-04-16 16:11:44 +08:00
kunfei 78cf6d285a Merge pull request #2992 from gedoor/dependabot/gradle/kotlin_version-1.8.20
Bump kotlin_version from 1.8.0 to 1.8.20
2023-04-16 16:11:02 +08:00
kunfei 9323988c5c Merge pull request #2995 from gedoor/dependabot/gradle/exoplayer_version-2.18.5
Bump exoplayer_version from 2.18.4 to 2.18.5
2023-04-16 16:09:41 +08:00
kunfei b99d78f57b Merge pull request #2996 from gedoor/dependabot/gradle/com.google.gms.google-services-4.3.15
Bump com.google.gms.google-services from 4.3.10 to 4.3.15
2023-04-16 16:09:28 +08:00
kunfei 4ce225e78e Merge pull request #2997 from gedoor/dependabot/gradle/room_version-2.5.1
Bump room_version from 2.5.0 to 2.5.1
2023-04-16 16:09:15 +08:00
kunfei d90627af92 Merge remote-tracking branch 'origin/master' 2023-04-16 16:08:45 +08:00
kunfei 68fa565686 优化 2023-04-16 16:08:33 +08:00
kunfei c3e6f6c54a 优化 2023-04-15 23:41:45 +08:00
kunfei 7227b0b6c0 upgrade agp 8.0 2023-04-15 23:36:24 +08:00
kunfei dc304d31d9 Merge pull request #2982 from gedoor/dependabot/gradle/app/cn.hutool-hutool-crypto-5.8.17
Bump cn.hutool:hutool-crypto from 5.8.16 to 5.8.17 in /app
2023-04-14 14:06:31 +08:00
kunfei 4c72ef255b Merge pull request #2983 from gedoor/dependabot/gradle/app/com.google.protobuf-protobuf-javalite-3.22.3
Bump com.google.protobuf:protobuf-javalite from 3.22.2 to 3.22.3 in /app
2023-04-14 14:06:19 +08:00
kunfei 0c5c49416a Merge remote-tracking branch 'origin/master' 2023-04-12 23:23:52 +08:00
kunfei 7ae88831f8 源添加jsLib,未完成 2023-04-12 23:23:34 +08:00
kunfei c905157e5c Merge pull request #2971 from h11128/fix-wrong-auth-sync
修复从书籍详情目录页进入指定章节时自动跳转到同步章节
2023-04-12 14:04:49 +08:00
kunfei 652ac66554 Merge pull request #2968 from h11128/fix-search-history
优化搜索历史显示
2023-04-11 12:32:17 +08:00
kunfei 0e82d0a2b9 源添加jsLib,未完成 2023-04-10 20:54:52 +08:00