Amirmahdi/drug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bugs of get drugs api fixed

Browse Source
This commit is contained in:
Amirmahdi
2026-05-27 00:15:22 +03:30
parent ee20eca3e0
commit 0a9ba3e7b2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/approagency/drug/data/repository/DrugRepositoryImpl.kt
+1
View File
@@ -43,6 +43,7 @@ class DrugRepositoryImpl(
override suspend fun getGorohDaroei(): Result<DarmanModel> { override suspend fun getGorohDaroei(): Result<DarmanModel> {
return try { return try {
val response = apiService.getGorohDaroei() val response = apiService.getGorohDaroei()
println(response)
return Result.success(response) return Result.success(response)
}catch (e: Exception){ }catch (e: Exception){
Result.failure(e) Result.failure(e)
app/src/main/java/com/approagency/drug/di/AppModule.kt
+9 -10
View File
@@ -24,6 +24,7 @@ import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor import okhttp3.logging.HttpLoggingInterceptor
import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidContext
import org.koin.core.module.dsl.viewModel import org.koin.core.module.dsl.viewModel
import org.koin.core.qualifier.qualifier
import org.koin.dsl.module import org.koin.dsl.module
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory import retrofit2.converter.gson.GsonConverterFactory
@@ -31,7 +32,8 @@ import retrofit2.converter.scalars.ScalarsConverterFactory
import java.net.CookieManager import java.net.CookieManager
import java.net.CookiePolicy import java.net.CookiePolicy
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
val jsonRetrofitQualifier = qualifier("jsonRetrofit")
val scalarRetrofitQualifier = qualifier("scalarRetrofit")
val appModule= module { val appModule= module {
single { LabDatabase.getInstance(androidContext()) } single { LabDatabase.getInstance(androidContext()) }
@@ -55,8 +57,7 @@ val appModule= module {
.build() .build()
} }
// ========== Retrofit for YOUR JSON API ========== single<Retrofit>(jsonRetrofitQualifier) { // Add qualifier
single {
Retrofit.Builder() Retrofit.Builder()
.baseUrl(Config.BASE_URL) .baseUrl(Config.BASE_URL)
.client(get<OkHttpClient>()) .client(get<OkHttpClient>())
@@ -65,23 +66,21 @@ val appModule= module {
} }
single<DrugApiService> { single<DrugApiService> {
val retrofit: Retrofit = get() val retrofit: Retrofit = get(jsonRetrofitQualifier) // Get qualified instance
retrofit.create(DrugApiService::class.java) retrofit.create(DrugApiService::class.java)
} }
// ========== Retrofit for DAROOYAB Website (HTML response) ========== // ========== Retrofit for DAROOYAB Website ==========
// IMPORTANT: Use ScalarsConverterFactory for plain text/HTML, NOT Gson! single<Retrofit>(scalarRetrofitQualifier) { // Add qualifier
single {
Retrofit.Builder() Retrofit.Builder()
.baseUrl(Config.Darro_Url) .baseUrl(Config.Darro_Url)
.client(get<OkHttpClient>()) .client(get<OkHttpClient>())
.addConverterFactory(ScalarsConverterFactory.create()) // This handles String responses .addConverterFactory(ScalarsConverterFactory.create())
.build() .build()
} }
// Create the API service from the Scalars-based Retrofit instance
single<DarooyabApiService> { single<DarooyabApiService> {
val retrofit: Retrofit = get() // Gets the Scalars Retrofit instance val retrofit: Retrofit = get(scalarRetrofitQualifier) // Get qualified instance
retrofit.create(DarooyabApiService::class.java) retrofit.create(DarooyabApiService::class.java)
} }