-
Notifications
You must be signed in to change notification settings - Fork 239
ДЗ Coroutines #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
shokanm
wants to merge
4
commits into
Otus-Android:development
Choose a base branch
from
shokanm:development
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,40 @@ | ||
package otus.homework.coroutines | ||
|
||
import retrofit2.Call | ||
import retrofit2.Callback | ||
import android.util.Log | ||
import kotlinx.coroutines.* | ||
import retrofit2.Response | ||
import java.net.SocketTimeoutException | ||
import kotlin.coroutines.CoroutineContext | ||
|
||
class CatsPresenter( | ||
private val catsService: CatsService | ||
private val catsServiceFact: CatsService, | ||
private val catsServiceImage: CatsService | ||
) { | ||
|
||
private var _catsView: ICatsView? = null | ||
private val presenterScope = | ||
PresenterScope(Dispatchers.Main, CoroutineName("CatsCoroutine")) | ||
|
||
fun onInitComplete() { | ||
catsService.getCatFact().enqueue(object : Callback<Fact> { | ||
|
||
override fun onResponse(call: Call<Fact>, response: Response<Fact>) { | ||
if (response.isSuccessful && response.body() != null) { | ||
_catsView?.populate(response.body()!!) | ||
presenterScope.launch { | ||
try { | ||
val factResponse = withContext(Dispatchers.IO) { catsServiceFact.getCatFact() } | ||
val imageResponse = withContext(Dispatchers.IO) { catsServiceImage.getCatImage() } | ||
val factImage = FactImage(factResponse, imageResponse) | ||
_catsView?.populate(factImage) | ||
} catch (e: Exception) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Можно сделать один |
||
when (e) { | ||
is SocketTimeoutException -> { | ||
_catsView?.showToast("Не удалось получить ответ от сервером") | ||
} | ||
else -> { | ||
_catsView?.showToast(e.message.toString()) | ||
CrashMonitor.trackWarning() | ||
e.printStackTrace() | ||
} | ||
} | ||
} | ||
|
||
override fun onFailure(call: Call<Fact>, t: Throwable) { | ||
CrashMonitor.trackWarning() | ||
} | ||
}) | ||
} | ||
} | ||
|
||
fun attachView(catsView: ICatsView) { | ||
|
@@ -31,5 +43,14 @@ class CatsPresenter( | |
|
||
fun detachView() { | ||
_catsView = null | ||
presenterScope.cancel() | ||
} | ||
} | ||
|
||
class PresenterScope( | ||
private val dispatchers: CoroutineDispatcher, | ||
private val coroutineName: CoroutineName | ||
) : CoroutineScope { | ||
override val coroutineContext: CoroutineContext | ||
get() = dispatchers + coroutineName | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,15 @@ | ||
package otus.homework.coroutines | ||
|
||
import kotlinx.coroutines.Deferred | ||
import retrofit2.Call | ||
import retrofit2.Response | ||
import retrofit2.http.GET | ||
|
||
interface CatsService { | ||
|
||
@GET("random?animal_type=cat") | ||
fun getCatFact() : Call<Fact> | ||
suspend fun getCatFact() : Fact | ||
|
||
@GET("meow") | ||
suspend fun getCatImage() : Image | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package otus.homework.coroutines | ||
|
||
import android.util.Log | ||
import androidx.lifecycle.LiveData | ||
import androidx.lifecycle.MutableLiveData | ||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.viewModelScope | ||
import kotlinx.coroutines.* | ||
import java.net.SocketTimeoutException | ||
|
||
class CatsViewModel( | ||
private val catsService: CatsService, | ||
private val catsServiceImage: CatsService | ||
) : ViewModel() { | ||
private var _catsResponse = MutableLiveData<Result<FactImage>>() | ||
val catsResponse: LiveData<Result<FactImage>> | ||
get() = _catsResponse | ||
|
||
fun getCatFactImage() { | ||
viewModelScope.launch(CoroutineExceptionHandler { coroutineContext, throwable -> | ||
CrashMonitor.trackWarning() | ||
}) { | ||
|
||
try { | ||
val factResponseDeferred = async { withContext(Dispatchers.IO) {catsService.getCatFact() }} | ||
val imageResponseDeferred = async { withContext(Dispatchers.IO) {catsServiceImage.getCatImage() }} | ||
|
||
val factResponse = factResponseDeferred.await() | ||
val imageResponse = imageResponseDeferred.await() | ||
|
||
/** | ||
* antonkazakov: ... Используй async чтобы распараллелить | ||
* Вопрос: изначально я сделал без async чтобы они выполнялись полседовательно | ||
* чтобы два результата использовать при создании объекта | ||
* FactImage(factResponse, imageResponse) | ||
* теперь при использовании async как это будет работать? | ||
* допустим получаем результат factResponse, imageResponse - неодновременно | ||
* FactImage(factResponse, imageResponse) будет создан из того что пришло первым, | ||
* а второй параметр "уйдет" пустым | ||
* или | ||
* родительская корутину (которая запускает launch) | ||
* "дождется" всех и только потом создаст FactImage(factResponse, imageResponse) ? | ||
*/ | ||
val factImage = FactImage(factResponse, imageResponse) | ||
_catsResponse.value = Result.Success(factImage) | ||
|
||
} catch (e: Exception) { | ||
when (e) { | ||
is SocketTimeoutException -> { | ||
_catsResponse.value = | ||
Result.Error("Не удалось получить ответ от сервером", e) | ||
} | ||
else -> { | ||
_catsResponse.value = Result.Error(e.message.toString(), e) | ||
e.printStackTrace() | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
sealed class Result<out T> { | ||
data class Success<out R>(val value: R) : Result<R>() | ||
data class Error( | ||
val message: String, | ||
val throwable: Throwable? | ||
) : Result<Nothing>() | ||
} |
8 changes: 8 additions & 0 deletions
8
app/src/main/java/otus/homework/coroutines/CatsViewModelFactory.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package otus.homework.coroutines | ||
|
||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.ViewModelProvider | ||
|
||
class CatsViewModelFactory(private val catsService: CatsService, private val catsServiceImage: CatsService): ViewModelProvider.NewInstanceFactory() { | ||
override fun <T : ViewModel?> create(modelClass: Class<T>): T = CatsViewModel(catsService, catsServiceImage) as T | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,33 @@ | ||
package otus.homework.coroutines | ||
|
||
import okhttp3.OkHttpClient | ||
import okhttp3.logging.HttpLoggingInterceptor | ||
import retrofit2.Retrofit | ||
import retrofit2.converter.gson.GsonConverterFactory | ||
|
||
class DiContainer { | ||
|
||
private val retrofit by lazy { | ||
class DiContainer() { | ||
|
||
private val retrofitFact by lazy { | ||
val interceptor = HttpLoggingInterceptor() | ||
interceptor.apply { interceptor.level = HttpLoggingInterceptor.Level.BODY } | ||
val client: OkHttpClient = OkHttpClient.Builder().addInterceptor(interceptor).build() | ||
|
||
Retrofit.Builder() | ||
.baseUrl("https://cat-fact.herokuapp.com/facts/") | ||
.client(client) | ||
.addConverterFactory(GsonConverterFactory.create()) | ||
.build() | ||
} | ||
|
||
private val retrofitImage by lazy { | ||
Retrofit.Builder() | ||
.baseUrl("https://aws.random.cat/") | ||
.addConverterFactory(GsonConverterFactory.create()) | ||
.build() | ||
} | ||
|
||
val service by lazy { retrofit.create(CatsService::class.java) } | ||
val service by lazy { retrofitFact.create(CatsService::class.java) } | ||
val serviceImage by lazy { retrofitImage.create(CatsService::class.java) } | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package otus.homework.coroutines | ||
|
||
import com.google.gson.annotations.SerializedName | ||
|
||
data class FactImage( | ||
val fact: Fact, | ||
val image: Image? | ||
) |
10 changes: 10 additions & 0 deletions
10
app/src/main/java/otus/homework/coroutines/FactImageResponse.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package otus.homework.coroutines | ||
|
||
import com.google.gson.annotations.SerializedName | ||
|
||
data class FactImageResponse( | ||
val fact: Fact? = null, | ||
val image: Image? = null, | ||
var isSuccessful: Boolean? = true, | ||
var errorMessage: String? = null | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package otus.homework.coroutines | ||
|
||
import com.google.gson.annotations.SerializedName | ||
|
||
data class Image( | ||
@field:SerializedName("file") | ||
val file: String | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
А зачем тебе два инстанса одного и того же стейтлесс класса?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
для того чтобы вызывать https://aws.random.cat/ который на другом ретрофит клиенте
private val retrofitImage by lazy {
Retrofit.Builder()
.baseUrl("https://aws.random.cat/")
.addConverterFactory(GsonConverterFactory.create())
.build()
}