ProgressDialogの進捗メッセージが表示されなかったバグの修正
This commit is contained in:
tateisu
parent
bf85696bc0
commit
dcb02bb39c
|
|
@ -276,13 +276,13 @@ class TootApiClient(
|
|||
tmpOkhttpClient: OkHttpClient? = null,
|
||||
block: () -> Request
|
||||
): Boolean {
|
||||
|
||||
result.response = null
|
||||
result.bodyString = null
|
||||
result.data = null
|
||||
val request = block()
|
||||
|
||||
return try {
|
||||
result.response = null
|
||||
result.bodyString = null
|
||||
result.data = null
|
||||
|
||||
val request = block()
|
||||
|
||||
result.requestInfo = "${request.method} ${progressPath ?: request.url.encodedPath}"
|
||||
|
||||
callback.publishApiProgress(
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import jp.juggler.subwaytooter.App1
|
|||
import jp.juggler.subwaytooter.api.entity.Host
|
||||
import jp.juggler.subwaytooter.dialog.ProgressDialogEx
|
||||
import jp.juggler.subwaytooter.table.SavedAccount
|
||||
import jp.juggler.util.LogCategory
|
||||
import jp.juggler.util.clip
|
||||
import jp.juggler.util.dismissSafe
|
||||
import jp.juggler.util.withCaption
|
||||
import kotlinx.coroutines.*
|
||||
|
|
@ -24,191 +26,192 @@ import java.util.concurrent.atomic.AtomicBoolean
|
|||
*/
|
||||
|
||||
class TootTaskRunner(
|
||||
context : Context,
|
||||
private val progress_style : Int = PROGRESS_SPINNER,
|
||||
private val progressSetupCallback : (progress : ProgressDialogEx) -> Unit = { _ -> }
|
||||
context: Context,
|
||||
private val progress_style: Int = PROGRESS_SPINNER,
|
||||
private val progressSetupCallback: (progress: ProgressDialogEx) -> Unit = { _ -> }
|
||||
) : TootApiCallback {
|
||||
|
||||
companion object {
|
||||
const val PROGRESS_NONE = - 1
|
||||
const val PROGRESS_SPINNER = ProgressDialogEx.STYLE_SPINNER
|
||||
const val PROGRESS_HORIZONTAL = ProgressDialogEx.STYLE_HORIZONTAL
|
||||
|
||||
private val percent_format : NumberFormat by lazy {
|
||||
val v = NumberFormat.getPercentInstance()
|
||||
v.maximumFractionDigits = 0
|
||||
v
|
||||
}
|
||||
}
|
||||
|
||||
private class ProgressInfo {
|
||||
|
||||
// HORIZONTALスタイルの場合、初期メッセージがないと後からメッセージを指定しても表示されない
|
||||
var message = " "
|
||||
var isIndeterminate = true
|
||||
var value = 0
|
||||
var max = 1
|
||||
}
|
||||
|
||||
private val handler : Handler
|
||||
private val client : TootApiClient
|
||||
private val info = ProgressInfo()
|
||||
private var progress : ProgressDialogEx? = null
|
||||
private var progress_prefix : String? = null
|
||||
private var task : Deferred<TootApiResult?>? = null
|
||||
|
||||
private val refContext : WeakReference<Context>
|
||||
|
||||
private var last_message_shown : Long = 0
|
||||
|
||||
private val proc_progress_message = object : Runnable {
|
||||
override fun run() {
|
||||
synchronized(this) {
|
||||
if(progress?.isShowing == true) {
|
||||
showProgressMessage()
|
||||
|
||||
companion object {
|
||||
private val log = LogCategory("TootTaskRunner")
|
||||
|
||||
const val PROGRESS_NONE = -1
|
||||
const val PROGRESS_SPINNER = ProgressDialogEx.STYLE_SPINNER
|
||||
const val PROGRESS_HORIZONTAL = ProgressDialogEx.STYLE_HORIZONTAL
|
||||
|
||||
private val percent_format: NumberFormat by lazy {
|
||||
val v = NumberFormat.getPercentInstance()
|
||||
v.maximumFractionDigits = 0
|
||||
v
|
||||
}
|
||||
}
|
||||
|
||||
private class ProgressInfo {
|
||||
|
||||
// HORIZONTALスタイルの場合、初期メッセージがないと後からメッセージを指定しても表示されない
|
||||
var message = " "
|
||||
var isIndeterminate = true
|
||||
var value = 0
|
||||
var max = 1
|
||||
}
|
||||
|
||||
private val handler: Handler
|
||||
private val client: TootApiClient
|
||||
private val info = ProgressInfo()
|
||||
private var progress: ProgressDialogEx? = null
|
||||
private var progress_prefix: String? = null
|
||||
private var task: Deferred<TootApiResult?>? = null
|
||||
|
||||
private val refContext: WeakReference<Context>
|
||||
|
||||
private var last_message_shown: Long = 0
|
||||
|
||||
private val proc_progress_message = object : Runnable {
|
||||
override fun run() {
|
||||
synchronized(this) {
|
||||
if (progress?.isShowing == true) {
|
||||
showProgressMessage()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
this.refContext = WeakReference(context)
|
||||
this.handler = App1.getAppState(context, "TootTaskRunner.ctor").handler
|
||||
this.client = TootApiClient(context, callback = this)
|
||||
}
|
||||
|
||||
|
||||
val isActive: Boolean
|
||||
get() = task?.isActive ?: true // nullはまだ開始してないのでアクティブということにする
|
||||
|
||||
fun run(callback: TootTask) = this.also {
|
||||
GlobalScope.launch(Dispatchers.Main) {
|
||||
callback.handleResult(
|
||||
try {
|
||||
openProgress()
|
||||
async(Dispatchers.IO) {
|
||||
callback.background(client)
|
||||
}.also {
|
||||
this@TootTaskRunner.task = it
|
||||
}.await()
|
||||
} catch (ex: CancellationException) {
|
||||
null
|
||||
} catch (ex: Throwable) {
|
||||
TootApiResult(ex.withCaption("error"))
|
||||
} finally {
|
||||
dismissProgress()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
this.refContext = WeakReference(context)
|
||||
this.handler = App1.getAppState(context,"TootTaskRunner.ctor").handler
|
||||
this.client = TootApiClient(context, callback = this)
|
||||
}
|
||||
|
||||
private val _isActive = AtomicBoolean(true)
|
||||
|
||||
val isActive : Boolean
|
||||
get() = _isActive.get()
|
||||
|
||||
fun run(callback : TootTask) : TootTaskRunner {
|
||||
GlobalScope.launch(Dispatchers.Main) {
|
||||
openProgress()
|
||||
val result = try {
|
||||
withContext(Dispatchers.IO) {
|
||||
callback.background(client)
|
||||
}
|
||||
}catch(ex:CancellationException){
|
||||
null
|
||||
} catch(ex : Throwable) {
|
||||
TootApiResult(ex.withCaption("error"))
|
||||
}
|
||||
_isActive.set(false)
|
||||
dismissProgress()
|
||||
callback.handleResult(result)
|
||||
}
|
||||
return this
|
||||
}
|
||||
|
||||
fun run(access_info : SavedAccount, callback : TootTask) : TootTaskRunner {
|
||||
client.account = access_info
|
||||
return run(callback)
|
||||
}
|
||||
|
||||
fun run(instance : Host, callback : TootTask) : TootTaskRunner {
|
||||
client.apiHost = instance
|
||||
return run(callback)
|
||||
|
||||
}
|
||||
|
||||
fun progressPrefix(s : String) : TootTaskRunner {
|
||||
this.progress_prefix = s
|
||||
return this
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// implements TootApiClient.Callback
|
||||
|
||||
override val isApiCancelled : Boolean
|
||||
get() = task?.isActive == false
|
||||
|
||||
override suspend fun publishApiProgress(s : String) {
|
||||
synchronized(this) {
|
||||
info.message = s
|
||||
info.isIndeterminate = true
|
||||
}
|
||||
delayProgressMessage()
|
||||
}
|
||||
|
||||
override suspend fun publishApiProgressRatio(value : Int, max : Int) {
|
||||
synchronized(this) {
|
||||
info.isIndeterminate = false
|
||||
info.value = value
|
||||
info.max = max
|
||||
}
|
||||
delayProgressMessage()
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// ProgressDialog
|
||||
|
||||
private fun openProgress() {
|
||||
// open progress
|
||||
if(progress_style != PROGRESS_NONE) {
|
||||
val context = refContext.get()
|
||||
if(context != null && context is Activity) {
|
||||
val progress = ProgressDialogEx(context)
|
||||
this.progress = progress
|
||||
progress.setCancelable(true)
|
||||
progress.setOnCancelListener { task?.cancel() }
|
||||
@Suppress("DEPRECATION")
|
||||
progress.setProgressStyle(progress_style)
|
||||
progressSetupCallback(progress)
|
||||
showProgressMessage()
|
||||
progress.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ダイアログを閉じる
|
||||
private fun dismissProgress() {
|
||||
progress?.dismissSafe()
|
||||
progress = null
|
||||
}
|
||||
|
||||
// ダイアログのメッセージを更新する
|
||||
// 初期化時とメッセージ更新時に呼ばれる
|
||||
@Suppress("DEPRECATION")
|
||||
private fun showProgressMessage() {
|
||||
val progress = this.progress ?: return
|
||||
|
||||
val message = info.message.trim { it <= ' ' }
|
||||
val progress_prefix = this.progress_prefix
|
||||
progress.setMessageEx(
|
||||
if(progress_prefix == null || progress_prefix.isEmpty()) {
|
||||
message
|
||||
} else if(message.isEmpty()) {
|
||||
progress_prefix
|
||||
} else {
|
||||
"$progress_prefix\n$message"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun run(access_info: SavedAccount, callback: TootTask): TootTaskRunner {
|
||||
client.account = access_info
|
||||
return run(callback)
|
||||
}
|
||||
|
||||
fun run(instance: Host, callback: TootTask): TootTaskRunner {
|
||||
client.apiHost = instance
|
||||
return run(callback)
|
||||
|
||||
}
|
||||
|
||||
fun progressPrefix(s: String): TootTaskRunner {
|
||||
this.progress_prefix = s
|
||||
return this
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// implements TootApiClient.Callback
|
||||
|
||||
override val isApiCancelled: Boolean
|
||||
get() = task?.isActive == false
|
||||
|
||||
override suspend fun publishApiProgress(s: String) {
|
||||
synchronized(this) {
|
||||
info.message = s
|
||||
info.isIndeterminate = true
|
||||
}
|
||||
delayProgressMessage()
|
||||
}
|
||||
|
||||
override suspend fun publishApiProgressRatio(value: Int, max: Int) {
|
||||
synchronized(this) {
|
||||
info.isIndeterminate = false
|
||||
info.value = value
|
||||
info.max = max
|
||||
}
|
||||
delayProgressMessage()
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// ProgressDialog
|
||||
|
||||
private fun openProgress() {
|
||||
// open progress
|
||||
if (progress_style != PROGRESS_NONE) {
|
||||
val context = refContext.get()
|
||||
if (context != null && context is Activity) {
|
||||
val progress = ProgressDialogEx(context)
|
||||
this.progress = progress
|
||||
progress.setCancelable(true)
|
||||
progress.setOnCancelListener { task?.cancel() }
|
||||
@Suppress("DEPRECATION")
|
||||
progress.setProgressStyle(progress_style)
|
||||
progressSetupCallback(progress)
|
||||
showProgressMessage()
|
||||
progress.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ダイアログを閉じる
|
||||
private fun dismissProgress() {
|
||||
progress?.dismissSafe()
|
||||
progress = null
|
||||
}
|
||||
|
||||
// ダイアログのメッセージを更新する
|
||||
// 初期化時とメッセージ更新時に呼ばれる
|
||||
@Suppress("DEPRECATION")
|
||||
private fun showProgressMessage() {
|
||||
val progress = this.progress ?: return
|
||||
|
||||
val message = info.message.trim { it <= ' ' }
|
||||
val progress_prefix = this.progress_prefix
|
||||
progress.setMessageEx(
|
||||
when {
|
||||
progress_prefix?.isNotEmpty() != true -> message
|
||||
message.isEmpty() -> progress_prefix
|
||||
else -> "$progress_prefix\n$message"
|
||||
}
|
||||
)
|
||||
|
||||
progress.isIndeterminateEx = info.isIndeterminate
|
||||
if(info.isIndeterminate) {
|
||||
progress.setProgressNumberFormat(null)
|
||||
progress.setProgressPercentFormat(null)
|
||||
} else {
|
||||
progress.progress = info.value
|
||||
progress.max = info.max
|
||||
progress.setProgressNumberFormat("%1$,d / %2$,d")
|
||||
progress.setProgressPercentFormat(percent_format)
|
||||
}
|
||||
|
||||
last_message_shown = SystemClock.elapsedRealtime()
|
||||
}
|
||||
|
||||
// 少し後にダイアログのメッセージを更新する
|
||||
// あまり頻繁に更新せず、しかし繰り返し呼ばれ続けても時々は更新したい
|
||||
// どのスレッドから呼ばれるか分からない
|
||||
private fun delayProgressMessage() {
|
||||
var wait = 100L + last_message_shown - SystemClock.elapsedRealtime()
|
||||
wait = if(wait < 0L) 0L else if(wait > 100L) 100L else wait
|
||||
|
||||
synchronized(this) {
|
||||
handler.removeCallbacks(proc_progress_message)
|
||||
handler.postDelayed(proc_progress_message, wait)
|
||||
}
|
||||
}
|
||||
|
||||
progress.isIndeterminateEx = info.isIndeterminate
|
||||
if (info.isIndeterminate) {
|
||||
progress.setProgressNumberFormat(null)
|
||||
progress.setProgressPercentFormat(null)
|
||||
} else {
|
||||
progress.progress = info.value
|
||||
progress.max = info.max
|
||||
progress.setProgressNumberFormat("%1$,d / %2$,d")
|
||||
progress.setProgressPercentFormat(percent_format)
|
||||
}
|
||||
|
||||
last_message_shown = SystemClock.elapsedRealtime()
|
||||
}
|
||||
|
||||
// 少し後にダイアログのメッセージを更新する
|
||||
// あまり頻繁に更新せず、しかし繰り返し呼ばれ続けても時々は更新したい
|
||||
// どのスレッドから呼ばれるか分からない
|
||||
private fun delayProgressMessage() {
|
||||
var wait = 100L + last_message_shown - SystemClock.elapsedRealtime()
|
||||
wait = wait.clip(0L, 100L)
|
||||
|
||||
synchronized(this) {
|
||||
handler.removeCallbacks(proc_progress_message)
|
||||
handler.postDelayed(proc_progress_message, wait)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ package jp.juggler.subwaytooter.dialog
|
|||
|
||||
import android.app.ProgressDialog
|
||||
import android.content.Context
|
||||
import android.os.Looper
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
|
|
@ -21,8 +22,12 @@ class ProgressDialogEx(context : Context) : ProgressDialog(context) {
|
|||
}
|
||||
|
||||
fun setMessageEx(msg : CharSequence?){
|
||||
GlobalScope.launch(Dispatchers.Main){
|
||||
if( Looper.getMainLooper().thread.id == Thread.currentThread().id){
|
||||
super.setMessage(msg)
|
||||
}else {
|
||||
GlobalScope.launch(Dispatchers.Main) {
|
||||
super.setMessage(msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ inline fun <reified T> systemService(context: Context): T? =
|
|||
fun<T:Comparable<T>> minComparable(a:T,b:T):T = if (a <= b) a else b
|
||||
fun<T:Comparable<T>> maxComparable(a:T,b:T):T = if (a >= b) a else b
|
||||
|
||||
fun <T:Comparable<T>> T.clip(min:T,max:T) = if(this<min) min else if(this>max) max else this
|
||||
|
||||
fun <T:Any> MutableCollection<T>.removeFirst( check:(T)->Boolean ): T?{
|
||||
val it = iterator()
|
||||
while(it.hasNext()){
|
||||
|
|
|
|||
Loading…
Reference in New Issue