Merge pull request #262 from misaka10032w/develop

[Fix] 适配解析新的网站布局

Author: misaka10032w

app/build.gradle.kts

@@ -37,7 +37,7 @@ android {
         applicationId = "com.yenaly.han1meviewer"
         minSdk = property("min.sdk")?.toString()?.toIntOrNull()
         targetSdk = property("target.sdk")?.toString()?.toIntOrNull()
-        val (code, name) = createVersion(major = 0, minor = 22, patch = 7)
+        val (code, name) = createVersion(major = 0, minor = 23, patch = 0)
         versionCode = code
         versionName = name
 

app/src/main/java/com/yenaly/han1meviewer/logic/Parser.kt

@@ -27,6 +27,7 @@ data class HanimeInfo(
     override val reviews: String? = "",
     override val currentArtist: String? = "",
     val watched: Boolean ?= false,
+    override val upLoadTime: String? = null
 ): VideoItemType , HanimeInfoType {
     companion object {
         const val NORMAL = 0

app/src/main/java/com/yenaly/han1meviewer/logic/model/HanimeInfo.kt

@@ -12,16 +12,16 @@ data class HomePage(
     val banner: Banner?,
     val latestHanime: MutableList<HanimeInfo>,
     val latestRelease: MutableList<HanimeInfo>,
-    val latestUpload: MutableList<HanimeInfo>,
-    val chineseSubtitle: MutableList<HanimeInfo>,
-    val hanimeTheyWatched: MutableList<HanimeInfo>,
-    val hanimeCurrent: MutableList<HanimeInfo>,
-    val hotHanimeMonthly: MutableList<HanimeInfo>,
-    val animeShort: MutableList<HanimeInfo>,
+    val ecchiAnime: MutableList<HanimeInfo>,
+    val shortEpisodeAnime: MutableList<HanimeInfo>,
+    val twoPointFiveDAnime: MutableList<HanimeInfo>,
+    val threeDCG: MutableList<HanimeInfo>,
     val motionAnime: MutableList<HanimeInfo>,
-    val thereDWork: MutableList<HanimeInfo>, //3D作品
-    val douJinWork: MutableList<HanimeInfo>,  //同人
+    val twoDAnime: MutableList<HanimeInfo>,
+    val aiGenerated: MutableList<HanimeInfo>,
+    val mmd: MutableList<HanimeInfo>,
     val cosplay: MutableList<HanimeInfo>,
+    val watchingNow: MutableList<HanimeInfo>,
     val newAnimeTrailer: MutableList<HanimeInfo>,
     val timestamp: Long = System.currentTimeMillis()
 ) {

app/src/main/java/com/yenaly/han1meviewer/logic/model/HomePage.kt

@@ -24,5 +24,6 @@ data class SubscriptionVideosItem(
     override val duration: String? = null,
     override val views: String? = null,
     override val reviews: String? = null,
-    override val currentArtist: String? = null
+    override val currentArtist: String? = null,
+    override val upLoadTime: String?= null,
 ) : Parcelable, VideoItemType

app/src/main/java/com/yenaly/han1meviewer/logic/model/MySubscriptions.kt

@@ -8,4 +8,5 @@ interface VideoItemType {
     val views: String?
     val reviews: String?
     val currentArtist: String?
+    val upLoadTime: String?
 }

app/src/main/java/com/yenaly/han1meviewer/logic/model/VideoItemType.kt

@@ -36,6 +36,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
@@ -229,6 +230,16 @@ fun VideoCardItem(
                         overflow = TextOverflow.Ellipsis,
                         color = MaterialTheme.colorScheme.onSurface
                     )
+                    Spacer(modifier = Modifier.weight(1f))
+                }
+                if (!videoItem.upLoadTime.isNullOrEmpty()) {
+                    Text(
+                        text = videoItem.upLoadTime!!,
+                        fontSize = 11.sp,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        color = MaterialTheme.colorScheme.onSurface
+                    )
                 }
             }
         }
@@ -335,3 +346,38 @@ fun EmptyView(hint: String, picRes: Int = R.drawable.h_chan_speechless) {
         }
     }
 }
+
+@Preview(showBackground = true)
+@Composable
+fun VideoCardPreview(){
+    MaterialTheme {
+        VideoCardItem(fakeVideosItem, onClickVideosItem = { }, onLongClickVideosItem =  {_,_->})
+    }
+}
+
+@Preview
+@Composable
+fun PlaylistItemPreview(){
+    MaterialTheme {
+        PlaylistItem(
+            playlist = fakePlaylists.first(),
+            modifier = Modifier.padding(8.dp).height(140.dp)
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun ArtistPreview(){
+    MaterialTheme {
+        ArtistItem(fakeArtists.first(), onClickArtist = {}, onLongClickArtist = {}, modifier = Modifier)
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun EmptyViewPreview(){
+    MaterialTheme {
+        EmptyView("发生了一些事情")
+    }
+}

app/src/main/java/com/yenaly/han1meviewer/ui/fragment/ComposeItem.kt

@@ -24,39 +24,44 @@ val fakeVideos = listOf(
         videoCode = "101573",
         duration = "04:34",
         views = "44.9万次",
-        reviews = "100%"
+        reviews = "100%",
+        upLoadTime = "2010-12-10"
     ),
     SubscriptionVideosItem(
         title = "姐姐的秘密训练",
         coverUrl = "https://vdownload.hembed.com/image/thumbnail/101574l.jpg",
         videoCode = "101574",
         duration = "23:15",
         views = "22.1万次",
-        reviews = "95%"
+        reviews = "95%",
+        upLoadTime = "2010-12-10"
     ),
     SubscriptionVideosItem(
         title = "放学后的约定",
         coverUrl = "https://vdownload.hembed.com/image/thumbnail/101575l.jpg",
         videoCode = "101575",
         duration = "18:02",
         views = "58.3万次",
-        reviews = "97%"
+        reviews = "97%",
+        upLoadTime = "2010-12-10"
     ),
     SubscriptionVideosItem(
         title = "班长的福利日",
         coverUrl = "https://vdownload.hembed.com/image/thumbnail/101576l.jpg",
         videoCode = "101576",
         duration = "12:47",
         views = "30.0万次",
-        reviews = "92%"
+        reviews = "92%",
+        upLoadTime = "2010-12-10"
     ),
     SubscriptionVideosItem(
         title = "图书馆的秘密角落",
         coverUrl = "https://vdownload.hembed.com/image/thumbnail/101577l.jpg",
         videoCode = "101577",
         duration = "15:20",
         views = "61.7万次",
-        reviews = "99%"
+        reviews = "99%",
+        upLoadTime = "2010-12-10"
     )
 )
 val fakeVideosItem =
@@ -66,7 +71,8 @@ val fakeVideosItem =
         videoCode = "101573",
         duration = "04:34",
         views = "44.9万次",
-        reviews = "100%"
+        reviews = "100%",
+        upLoadTime = "2020-12-12"
     )
 
 fun generateFakeCheckInRecords(