From 34b6b29c469319f44baa70c28688d3be1e87716c Mon Sep 17 00:00:00 2001 From: waterbang <409071692@qq.com> Date: Tue, 6 Jun 2023 15:53:25 +0800 Subject: [PATCH] :bookmark: Republished version 0.0.1 to deno --- .../microService/browser/jmm/JmmMetadata.kt | 10 +++++----- .../microService/browser/jmm/JsMicroModule.kt | 2 +- .../browser/jmm/ui/JmmManagerView.kt | 8 ++++---- .../ui/download/DownLoadViewModel.kt | 2 +- plaoc/README.md | 4 ++++ scripts/images/logo.png | Bin 8983 -> 10221 bytes 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JmmMetadata.kt b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JmmMetadata.kt index 6242c97000..0f5261093b 100644 --- a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JmmMetadata.kt +++ b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JmmMetadata.kt @@ -6,16 +6,16 @@ import info.bagen.dwebbrowser.microService.helper.Mmid data class JmmMetadata( val id: Mmid, // jmmApp的id val server: MainServer, // 打开应用地址 - val dwebDeeplinks: MutableList = mutableListOf(), + val dweb_deeplinks: MutableList = mutableListOf(), val name: String = "", // 应用名称 - val shortName: String = "", // 应用副标题 + val short_name: String = "", // 应用副标题 val icon: String = "", // 应用图标 val images: List? = null, // 应用截图 val description: String = "", // 应用描述 val author: List? = null, // 开发者,作者 val categories: List? = null, // 应用类型 https://github.com/w3c/manifest/wiki/Categories val version: String = "", // 应用版本 - val new_feature: String = "", // 新特性,新功能 + val new_feature: String? = null, // 新特性,新功能 val home: String = "", // 首页地址 var bundle_url: String = "", // 下载应用地址 val bundle_size: String = "", // 应用大小 @@ -41,10 +41,10 @@ data class JmmMetadata( val defaultJmmMetadata = JmmMetadata( id = "default.user.dweb", - dwebDeeplinks = mutableListOf(), + dweb_deeplinks = mutableListOf(), icon = "https://www.bfmeta.info/imgs/logo3.webp", name = "默认测试数据", - shortName = "该测试数据包含了相关具体信息,请仔细查阅", + short_name = "该测试数据包含了相关具体信息,请仔细查阅", description = "这是一个实例应用,包含了dweb_plugins全部组件的实例。", bundle_url = "https://dweb.waterbang.top/app.plaoc.dweb-1.0.0.zip", bundle_size = "2726400", diff --git a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JsMicroModule.kt b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JsMicroModule.kt index b5e1f706d3..740f1898b4 100644 --- a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JsMicroModule.kt +++ b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/JsMicroModule.kt @@ -19,7 +19,7 @@ fun debugJMM(tag: String, msg: Any? = "", err: Throwable? = null) = open class JsMicroModule(var metadata: JmmMetadata) : MicroModule() { override val dweb_deeplinks: MutableList - get() = this.metadata.dwebDeeplinks + get() = this.metadata.dweb_deeplinks companion object { diff --git a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/ui/JmmManagerView.kt b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/ui/JmmManagerView.kt index 4a36dad028..850cfe2937 100644 --- a/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/ui/JmmManagerView.kt +++ b/android/app/src/main/java/info/bagen/dwebbrowser/microService/browser/jmm/ui/JmmManagerView.kt @@ -367,7 +367,7 @@ private fun AppInfoHeadView(jmmMetadata: JmmMetadata) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = jmmMetadata.shortName, + text = jmmMetadata.short_name, maxLines = 1, color = MaterialTheme.colorScheme.outlineVariant, overflow = TextOverflow.Ellipsis, @@ -514,7 +514,7 @@ private fun NewVersionInfoView(jmmMetadata: JmmMetadata) { .animateContentSize() .clickable { expanded.value = !expanded.value }) { Text( - text = "运用全新的功能,让使用更加安全便捷", + text = jmmMetadata.new_feature ?: "运用全新的功能,让使用更加安全便捷", maxLines = if (expanded.value) Int.MAX_VALUE else 2, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.onSurface @@ -538,10 +538,10 @@ private fun OtherInfoView(jmmMetadata: JmmMetadata) { Spacer(modifier = Modifier.height(HorizontalPadding)) OtherItemView(type = "开发者", content = jmmMetadata.author?.toContent() ?: "me") OtherItemView(type = "大小", content = jmmMetadata.bundle_size.toSpaceSize()) - OtherItemView(type = "类别", content = "娱乐") + OtherItemView(type = "类别", content = jmmMetadata.categories?.toContent()?: "娱乐") OtherItemView(type = "语言", content = "中文") OtherItemView(type = "年龄分级", content = "18+") - OtherItemView(type = "版权", content = "bgwl") + OtherItemView(type = "版权", content = "@${jmmMetadata.author?.get(0) ?:"dweb_browser"}") } } diff --git a/android/app/src/main/java/info/bagen/dwebbrowser/ui/download/DownLoadViewModel.kt b/android/app/src/main/java/info/bagen/dwebbrowser/ui/download/DownLoadViewModel.kt index e4ea507c22..93a76d3f92 100644 --- a/android/app/src/main/java/info/bagen/dwebbrowser/ui/download/DownLoadViewModel.kt +++ b/android/app/src/main/java/info/bagen/dwebbrowser/ui/download/DownLoadViewModel.kt @@ -69,7 +69,7 @@ class DownLoadViewModel(val mmid: Mmid, val url: String) : ViewModel() { ), bundle_url = url, name = "测试", - shortName = "测试", + short_name = "测试", icon = "https://www.bfmeta.info/imgs/logo3.webp", images = listOf( "http://qiniu-waterbang.waterbang.top/bfm/cot-home_2058.webp", diff --git a/plaoc/README.md b/plaoc/README.md index 1b06a0bb90..b125097f09 100644 --- a/plaoc/README.md +++ b/plaoc/README.md @@ -26,3 +26,7 @@ deno task plaoc serve ./plaoc/demo/dist ```bash git tag -a 0.0.1 -m "feat: xxx" ``` + +```bash +git push origin +``` diff --git a/scripts/images/logo.png b/scripts/images/logo.png index 9e5e2e61b193e9e6212bdc8bf5582ee04c87badf..c749c7a074ef84fd8b7b99ea4bf4b596ba8a0c98 100644 GIT binary patch literal 10221 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 literal 8983 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