上传添加压缩选项,未完成
This commit is contained in:
@@ -68,9 +68,10 @@ object DirectLinkUpload {
|
|||||||
|
|
||||||
@Keep
|
@Keep
|
||||||
data class Rule(
|
data class Rule(
|
||||||
var uploadUrl: String,
|
var uploadUrl: String, //上传url
|
||||||
var downloadUrlRule: String,
|
var downloadUrlRule: String, //下载链接规则
|
||||||
var summary: String
|
var summary: String, //注释
|
||||||
|
var compress: Boolean = true, //是否压缩
|
||||||
) {
|
) {
|
||||||
|
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
|
|||||||
@@ -11,7 +11,13 @@ import io.legado.app.databinding.DialogDirectLinkUploadConfigBinding
|
|||||||
import io.legado.app.help.DirectLinkUpload
|
import io.legado.app.help.DirectLinkUpload
|
||||||
import io.legado.app.lib.dialogs.selector
|
import io.legado.app.lib.dialogs.selector
|
||||||
import io.legado.app.lib.theme.primaryColor
|
import io.legado.app.lib.theme.primaryColor
|
||||||
import io.legado.app.utils.*
|
import io.legado.app.utils.GSON
|
||||||
|
import io.legado.app.utils.applyTint
|
||||||
|
import io.legado.app.utils.fromJsonObject
|
||||||
|
import io.legado.app.utils.getClipText
|
||||||
|
import io.legado.app.utils.sendToClip
|
||||||
|
import io.legado.app.utils.setLayout
|
||||||
|
import io.legado.app.utils.toastOnUi
|
||||||
import io.legado.app.utils.viewbindingdelegate.viewBinding
|
import io.legado.app.utils.viewbindingdelegate.viewBinding
|
||||||
import splitties.views.onClick
|
import splitties.views.onClick
|
||||||
|
|
||||||
@@ -68,12 +74,14 @@ class DirectLinkUploadConfig : BaseDialogFragment(R.layout.dialog_direct_link_up
|
|||||||
binding.editUploadUrl.setText(rule.uploadUrl)
|
binding.editUploadUrl.setText(rule.uploadUrl)
|
||||||
binding.editDownloadUrlRule.setText(rule.downloadUrlRule)
|
binding.editDownloadUrlRule.setText(rule.downloadUrlRule)
|
||||||
binding.editSummary.setText(rule.summary)
|
binding.editSummary.setText(rule.summary)
|
||||||
|
binding.cbCompress.isChecked = rule.compress
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getRule(): DirectLinkUpload.Rule? {
|
private fun getRule(): DirectLinkUpload.Rule? {
|
||||||
val uploadUrl = binding.editUploadUrl.text?.toString()
|
val uploadUrl = binding.editUploadUrl.text?.toString()
|
||||||
val downloadUrlRule = binding.editDownloadUrlRule.text?.toString()
|
val downloadUrlRule = binding.editDownloadUrlRule.text?.toString()
|
||||||
val summary = binding.editSummary.text?.toString()
|
val summary = binding.editSummary.text?.toString()
|
||||||
|
val compress = binding.cbCompress.isChecked
|
||||||
if (uploadUrl.isNullOrBlank()) {
|
if (uploadUrl.isNullOrBlank()) {
|
||||||
toastOnUi("上传Url不能为空")
|
toastOnUi("上传Url不能为空")
|
||||||
return null
|
return null
|
||||||
@@ -86,7 +94,7 @@ class DirectLinkUploadConfig : BaseDialogFragment(R.layout.dialog_direct_link_up
|
|||||||
toastOnUi("注释不能为空")
|
toastOnUi("注释不能为空")
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return DirectLinkUpload.Rule(uploadUrl, downloadUrlRule, summary)
|
return DirectLinkUpload.Rule(uploadUrl, downloadUrlRule, summary, compress)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun importDefault() {
|
private fun importDefault() {
|
||||||
|
|||||||
@@ -68,6 +68,13 @@
|
|||||||
|
|
||||||
</io.legado.app.ui.widget.text.TextInputLayout>
|
</io.legado.app.ui.widget.text.TextInputLayout>
|
||||||
|
|
||||||
|
<io.legado.app.lib.theme.view.ThemeCheckBox
|
||||||
|
android:id="@+id/cb_compress"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:minHeight="48dp"
|
||||||
|
android:text="@string/is_compress" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.core.widget.NestedScrollView>
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|||||||
@@ -1112,4 +1112,5 @@
|
|||||||
<string name="export_chapter_index">The section index that needs to be exported</string>
|
<string name="export_chapter_index">The section index that needs to be exported</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1115,4 +1115,5 @@
|
|||||||
<string name="export_chapter_index">The section index that needs to be exported</string>
|
<string name="export_chapter_index">The section index that needs to be exported</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1115,4 +1115,5 @@
|
|||||||
<string name="export_chapter_index">The section index that needs to be exported</string>
|
<string name="export_chapter_index">The section index that needs to be exported</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1112,4 +1112,5 @@
|
|||||||
<string name="export_chapter_index">需要輸出的章節</string>
|
<string name="export_chapter_index">需要輸出的章節</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1114,4 +1114,5 @@
|
|||||||
<string name="export_chapter_index">需要輸出的章節</string>
|
<string name="export_chapter_index">需要輸出的章節</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1114,4 +1114,5 @@
|
|||||||
<string name="export_chapter_index">需要输出的章节</string>
|
<string name="export_chapter_index">需要输出的章节</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1115,4 +1115,5 @@
|
|||||||
<string name="export_chapter_index">The section index that needs to be exported</string>
|
<string name="export_chapter_index">The section index that needs to be exported</string>
|
||||||
<string name="shrink_database">压缩数据库</string>
|
<string name="shrink_database">压缩数据库</string>
|
||||||
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
<string name="shrink_database_summary">减小数据库文件的大小</string>
|
||||||
|
<string name="is_compress">是否压缩</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user