|
|
@@ -82,12 +82,31 @@ public class LoadingDriver {
|
|
|
if (null != waiter && loadingCount < 1 && null == disposable) {
|
|
|
disposable = Completable.timer(100, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread())
|
|
|
.subscribe(() -> {
|
|
|
- disposable = null;
|
|
|
- loadingCount = 0;
|
|
|
- waiter.hide();
|
|
|
- waiter = null;
|
|
|
- Log.d("APP# LoadingDriver | remove", "|" + " ------------- removed!! " + loadingCount);
|
|
|
+ removeInternal();
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ private void removeInternal() {
|
|
|
+ disposable = null;
|
|
|
+ loadingCount = 0;
|
|
|
+ waiter.hide();
|
|
|
+ waiter = null;
|
|
|
+ Log.d("APP# LoadingDriver | remove", "|" + " ------------- removed!! " + loadingCount);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 로딩 강제 제거
|
|
|
+ *
|
|
|
+ * @param force
|
|
|
+ */
|
|
|
+ public void remove(boolean force) {
|
|
|
+ Log.d("APP# LoadingDriver | remove", "|" + " force: " + force);
|
|
|
+ if (force) {
|
|
|
+ removeInternal();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|