update

Author: wzq

app/build.gradle.kts

@@ -1,6 +1,7 @@
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidApp)
+
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.parcelize)
@@ -54,6 +55,7 @@ android {
 }
 
 dependencies {
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
 
     implementation(libs.core.ktx)
     implementation(libs.lifecycle.runtime.ktx)

app/src/main/java/com/wzq/jd/compose/app/data/DataRepos.kt

@@ -0,0 +1,14 @@
+package com.wzq.jd.compose.app.data
+
+import com.wzq.jd.compose.app.data.remote.CustomHttpClient
+import com.wzq.jd.compose.app.data.remote.RemoteDataRepo
+
+/**
+ * create by wzq on 2023/11/27
+ *
+ */
+object DataRepos {
+
+    val remoteRepo by lazy { RemoteDataRepo(client = CustomHttpClient()) }
+
+}

app/src/main/java/com/wzq/jd/compose/app/data/MainApi.kt

@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
  *
  */
 @Serializable
-data class SearchHotWords(
+data class HotWords(
     val id: Int,
     val link: String,
     val name: String,

app/src/main/java/com/wzq/jd/compose/app/data/NetworkUtil.kt

@@ -12,4 +12,17 @@ data class NetResult<T>(
     val errorCode: Int,
     val errorMsg: String
 )
-
+//
+//object KS: KSerializer<Any?> {
+//    override val descriptor: SerialDescriptor
+//        get() = TODO("Not yet implemented")
+//
+//    override fun deserialize(decoder: Decoder): Any? {
+//        return decoder.dec
+//    }
+//
+//    override fun serialize(encoder: Encoder, value: Any?) {
+//    }
+//
+//
+//}

app/src/main/java/com/wzq/jd/compose/app/data/RemoteDataRepo.kt

@@ -0,0 +1,48 @@
+package com.wzq.jd.compose.app.data.remote
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import okhttp3.logging.HttpLoggingInterceptor
+
+/**
+ * create by wzq on 2023/12/19
+ *
+ */
+class CustomHttpClient {
+
+    private val client by lazy {
+        createClient()
+    }
+
+    suspend fun <T> doRequest(block: suspend HttpClient.() -> T) =
+        runCatching { client.block() }.onFailure(defaultErrorHandler)
+
+
+    private fun createClient() = HttpClient(OkHttp) {
+        engine {
+            config {
+                followRedirects(true)
+            }
+            addInterceptor(HttpLoggingInterceptor().apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
+
+        }
+
+        install(ContentNegotiation) {
+            json(Json {
+                prettyPrint = true
+                isLenient = true
+                ignoreUnknownKeys = true
+            })
+        }
+    }
+
+    private val defaultErrorHandler = fun(exception: Throwable) {
+        exception.printStackTrace()
+    }
+
+}

…compose/app/data/model/SearchHotWords.kt …zq/jd/compose/app/data/model/HotWords.ktapp/src/main/java/com/wzq/jd/compose/app/data/model/SearchHotWords.kt renamed to app/src/main/java/com/wzq/jd/compose/app/data/model/HotWords.kt app/src/main/java/com/wzq/jd/compose/app/data/model/SearchHotWords.kt renamed to app/src/main/java/com/wzq/jd/compose/app/data/model/HotWords.kt

@@ -0,0 +1,54 @@
+package com.wzq.jd.compose.app.data.remote
+
+import com.wzq.jd.compose.app.data.model.ArticleItem
+import com.wzq.jd.compose.app.data.model.Categories
+import com.wzq.jd.compose.app.data.model.HotWords
+import com.wzq.jd.compose.app.data.model.NetResult
+import com.wzq.jd.compose.app.data.model.PagingResult
+import io.ktor.client.call.body
+import io.ktor.client.request.forms.submitForm
+import io.ktor.client.request.get
+import io.ktor.client.request.parameter
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import io.ktor.http.parametersOf
+
+/**
+ * create by wzq on 2023/12/1
+ *
+ */
+class RemoteDataRepo(
+    private val baseUrl: String = "https://www.wanandroid.com/",
+    private val client: CustomHttpClient
+) {
+
+    suspend fun getArticleList(pageNum: Int = 0, cid: Int? = null) =
+        client.doRequest<NetResult<PagingResult<ArticleItem>>> {
+            get("${baseUrl}article/list/${pageNum}/json") {
+                if (cid != null) this.parameter("cid", cid)
+            }.body()
+        }
+
+    suspend fun getProjectList(pageNum: Int = 0) =
+        client.doRequest<NetResult<PagingResult<ArticleItem>>> { get("${baseUrl}article/listproject/$pageNum/json").body() }
+
+    suspend fun getKnowledgeCategories(): Result<NetResult<List<Categories>>> =
+        client.doRequest { get("${baseUrl}tree/json").body() }
+
+    suspend fun getHotWords() = client.doRequest<NetResult<List<HotWords>>> {
+        get("${baseUrl}hotkey/json").body()
+    }
+
+    suspend fun getSearchResult(keywords: String) = client.doRequest {
+        submitForm(
+            "${baseUrl}article/query/0/json",
+            parametersOf("k", keywords)
+        ).body<NetResult<PagingResult<ArticleItem>>>()
+    }
+
+    suspend fun test() = client.doRequest<Unit> {
+        this.post("") {
+            setBody(parametersOf("a", "b"))
+        }
+    }
+}

app/src/main/java/com/wzq/jd/compose/app/data/model/NetResult.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.mutableStateMapOf
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.wzq.jd.compose.app.data.NetworkUtil
+import com.wzq.jd.compose.app.data.DataRepos
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.Categories
 import kotlinx.coroutines.launch
@@ -25,7 +25,7 @@ class CategoriesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
                 return@launch
             }
             val cid = categories?.children?.get(index)?.id
-            NetworkUtil.remoteRepo.getArticleList(cid = cid).onSuccess { result ->
+            DataRepos.remoteRepo.getArticleList(cid = cid).onSuccess { result ->
                 pagerData[index] = result.data.listData
             }
         }