Merge pull request #4 from ltttttttttttt/dev

Dev

LazyPeopleHttp-lib/build.gradle.kts

@@ -55,6 +55,8 @@ kotlin {
                 api("io.ktor:ktor-client-core:$ktorVersion")
                 //kt的跨平台json解析
                 api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationJsonVersion")
+                //compose runtime
+                compileOnly("org.jetbrains.compose.runtime:runtime:1.4.0")
             }
         }
         val commonTest by getting {

LazyPeopleHttp-lib/src/commonMain/kotlin/com/lt/lazy_people_http/call/Call.kt

@@ -1,5 +1,7 @@
 package com.lt.lazy_people_http.call
 
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
 import io.ktor.client.request.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
@@ -26,4 +28,21 @@ interface Call<T> {
      * 自定义一些配置
      */
     fun config(block: HttpRequestBuilder.() -> Unit): Call<T>
+
+    /**
+     * 将[Call]转化为[State]
+     */
+    fun toState(onFailure: ((call: Call<T>, t: Throwable?) -> Unit)? = null): State<T?> {
+        val state = mutableStateOf<T?>(null)
+        enqueue(object : Callback<T> {
+            override fun onResponse(call: Call<T>, response: T) {
+                state.value = response
+            }
+
+            override fun onFailure(call: Call<T>, t: Throwable?) {
+                onFailure?.invoke(call, t)
+            }
+        })
+        return state
+    }
 }

LazyPeopleHttp-lib/src/commonMain/kotlin/com/lt/lazy_people_http/call/RealCall.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.withContext
 
 /**
  * creator: lt  2023/3/10  lt.dygzs@qq.com
- * effect : 使用GlobalScope作用域的协程进行http请求
+ * effect : 进行http请求
  * warning:
  */
 class RealCall<T>(

README.md

@@ -5,6 +5,10 @@
 suspend fun getUser(userId: Int): User
 or
 fun getUser(userId: Int): Call<User>
+
+//In Compose used:
+val user by remember { hf.getUser(0).toState() }
+Text("UserName=${user?.name}")
 ```
 
 Lazy people http, A type-safe HTTP client for JVM(Android, Desktop), iOS, js web.
@@ -124,6 +128,7 @@ private val hf = HttpFunctions::class.createService(config)
 //Implementation class using the interface
 hf.postB("123").enqueue()//callback asynchronous request
 hf.suspendGetB("111")//Coroutine asynchronous request
+val data by remember { hf.get().toState() }//Return responsive State, suitable for Compose
 ```
 
 Step 4.Custom configuration:

README_CN.md

@@ -5,6 +5,10 @@
 suspend fun getUser(userId: Int): User
 或
 fun getUser(userId: Int): Call<User>
+
+//如果使用Compose可以这样用:
+val user by remember { hf.getUser(0).toState() }
+Text("UserName=${user?.name}")
 ```
 
 懒人http客户端, 类型安全的HTTP客户端, 适用于: JVM(Android, Desktop), iOS, js web.
@@ -124,6 +128,7 @@ private val hf = HttpFunctions::class.createService(config)
 //使用接口的实现类
 hf.postB("123").enqueue()//回调异步请求
 hf.suspendGetB("111")//协程异步请求
+val data by remember { hf.get().toState() }//返回响应式的State,适用于Compose
 ```
 
 Step 4.自定义配置:

buildSrc/src/main/kotlin/Versions.kt

@@ -20,4 +20,4 @@ const val ktorVersion = "2.2.4"//ktor版本
 const val serializationJsonVersion = "1.5.0"//json序列号版本
 const val kspVersion = "$kotlinVersion-1.0.10"//ksp版本
 
-const val mVersion = "1.0.8"//此库的版本
+const val mVersion = "1.0.9"//此库的版本

common/src/commonMain/kotlin/com/lt/Lazy_people_http/common/HttpFunctions.kt

@@ -58,7 +58,7 @@ interface HttpFunctions {
     fun getD(@Url("type") url: String): Call<NetBean<String?>>
 
     @GET("{url}")
-    fun get(@Url("url") url: String): Call<MData>
+    fun get(@Url("url") url: String="http://t.weather.sojson.com/api/weather/city/101030100"): Call<MData>
 
     @GET("get/getB")
     suspend fun suspendGetB(name: String): NetBean<UserBean>

common/src/commonMain/kotlin/com/lt/lazy_people_http/common/App.kt

@@ -6,6 +6,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import com.lt.lazy_people_http.call.Call
 import com.lt.lazy_people_http.call.Callback
@@ -69,6 +70,9 @@ fun App() {
         }) {
             Text(text4)
         }
+
+        val data by remember { hf.get().toState() }
+        Text("Call#toState()=${data?.cityInfo?.city}")
     }
 }
 
@@ -95,8 +99,7 @@ fun testAll() {
         assert(hf.getD("success").await().code == 200)
         assert(hf.getD("fail").await().code == 400)
         assert(
-            hf.get("http://t.weather.sojson.com/api/weather/city/101030100")
-                .await().cityInfo?.city == "天津市"
+            hf.get().await().cityInfo?.city == "天津市"
         )
         assert(hf.suspendGetB("2").data.name == "2")
         assert(hf.post_postA("123").data == "123")