diff --git a/README.md b/README.md index c782f6b..784ff6e 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ XuqmSDK.login( 默认使用外网域名。若要本地联调,可在 `Application.onCreate()` 里切换: ```kotlin -XuqmSDK.useLocalServiceEndpoints("192.168.116.9") +XuqmSDK.useLocalServiceEndpoints("10.0.2.2") // 物理设备可改成你的电脑局域网 IP ``` diff --git a/sample-app/src/main/java/com/xuqm/sdk/sample/config/SampleEnvironment.kt b/sample-app/src/main/java/com/xuqm/sdk/sample/config/SampleEnvironment.kt index 5df7b50..433a7a8 100644 --- a/sample-app/src/main/java/com/xuqm/sdk/sample/config/SampleEnvironment.kt +++ b/sample-app/src/main/java/com/xuqm/sdk/sample/config/SampleEnvironment.kt @@ -13,7 +13,7 @@ object SampleEnvironmentConfig { private set fun external(): SampleEnvironment = SampleEnvironment( - demoBaseUrl = "http://192.168.116.9:8085/", + demoBaseUrl = "https://dev.xuqinmin.com/", serviceHost = null, ) diff --git a/sample-app/src/main/java/com/xuqm/sdk/sample/data/repo/EnvironmentRepository.kt b/sample-app/src/main/java/com/xuqm/sdk/sample/data/repo/EnvironmentRepository.kt index e038c51..7fbc52d 100644 --- a/sample-app/src/main/java/com/xuqm/sdk/sample/data/repo/EnvironmentRepository.kt +++ b/sample-app/src/main/java/com/xuqm/sdk/sample/data/repo/EnvironmentRepository.kt @@ -10,7 +10,7 @@ enum class EnvironmentMode { data class EnvironmentState( val mode: EnvironmentMode = EnvironmentMode.EXTERNAL, - val host: String = "192.168.116.9", + val host: String = "10.0.2.2", ) class EnvironmentRepository(context: Context) { @@ -25,7 +25,7 @@ class EnvironmentRepository(context: Context) { } fun setLocalhost(host: String) { - val normalizedHost = host.trim().ifBlank { "192.168.116.9" } + val normalizedHost = host.trim().ifBlank { "10.0.2.2" } save(EnvironmentState(mode = EnvironmentMode.LOCALHOST, host = normalizedHost)) SampleEnvironmentConfig.useLocalhost(normalizedHost) } @@ -34,7 +34,7 @@ class EnvironmentRepository(context: Context) { val mode = runCatching { EnvironmentMode.valueOf(prefs.getString(KEY_MODE, EnvironmentMode.EXTERNAL.name)!!) }.getOrDefault(EnvironmentMode.EXTERNAL) - val host = prefs.getString(KEY_HOST, "192.168.116.9").orEmpty().ifBlank { "192.168.116.9" } + val host = prefs.getString(KEY_HOST, "10.0.2.2").orEmpty().ifBlank { "10.0.2.2" } return EnvironmentState(mode = mode, host = host) } diff --git a/sample-app/src/main/java/com/xuqm/sdk/sample/ui/environment/EnvironmentScreen.kt b/sample-app/src/main/java/com/xuqm/sdk/sample/ui/environment/EnvironmentScreen.kt index 3d9b06e..3bd19c1 100644 --- a/sample-app/src/main/java/com/xuqm/sdk/sample/ui/environment/EnvironmentScreen.kt +++ b/sample-app/src/main/java/com/xuqm/sdk/sample/ui/environment/EnvironmentScreen.kt @@ -53,7 +53,7 @@ import kotlinx.coroutines.flow.StateFlow data class EnvironmentUiState( val mode: EnvironmentMode = EnvironmentMode.EXTERNAL, - val host: String = "192.168.116.9", + val host: String = "10.0.2.2", val message: String? = null, ) @@ -142,7 +142,7 @@ fun EnvironmentScreen( Text( text = if (state.mode == EnvironmentMode.EXTERNAL) { - "当前使用开发服务:http://192.168.116.9:8085" + "当前使用开发服务:https://dev.xuqinmin.com" } else { "当前使用本地服务:http://${state.host}:8085" }, @@ -171,7 +171,7 @@ fun EnvironmentScreen( }, modifier = Modifier.fillMaxWidth(), label = { Text("本地 Host") }, - placeholder = { Text("192.168.116.9 或你的电脑局域网 IP") }, + placeholder = { Text("10.0.2.2 或你的电脑局域网 IP") }, singleLine = true, enabled = state.mode == EnvironmentMode.LOCALHOST, ) diff --git a/sdk-core/src/main/java/com/xuqm/sdk/core/ServiceEndpoints.kt b/sdk-core/src/main/java/com/xuqm/sdk/core/ServiceEndpoints.kt index 8a642d6..7c9a0fa 100644 --- a/sdk-core/src/main/java/com/xuqm/sdk/core/ServiceEndpoints.kt +++ b/sdk-core/src/main/java/com/xuqm/sdk/core/ServiceEndpoints.kt @@ -1,12 +1,12 @@ package com.xuqm.sdk.core data class ServiceEndpoints( - val controlBaseUrl: String = "http://192.168.116.9:8081/", - val imApiBaseUrl: String = "http://192.168.116.9:8082/", - val imWsUrl: String = "ws://192.168.116.9:8082/ws/im", - val pushBaseUrl: String = "http://192.168.116.9:8083/", - val updateBaseUrl: String = "http://192.168.116.9:8084/", - val fileBaseUrl: String = "http://192.168.116.9:8086/", + val controlBaseUrl: String = "https://dev.xuqinmin.com/", + val imApiBaseUrl: String = "https://im.dev.xuqinmin.com/", + val imWsUrl: String = "wss://im.dev.xuqinmin.com/ws/im", + val pushBaseUrl: String = "https://dev.xuqinmin.com/", + val updateBaseUrl: String = "https://update.dev.xuqinmin.com/", + val fileBaseUrl: String = "https://file.dev.xuqinmin.com/", ) object ServiceEndpointRegistry {