DoggyZhang пре 2 дана
родитељ
комит
27e6fd4eae

+ 1 - 0
app/build.gradle

@@ -514,6 +514,7 @@ dependencies {
     api libs.tencent.timpush.fcm
 
     api libs.tencent.atomic.x
+    implementation project(":atomic_x")
 
 //    debugApi "com.tuzhenlei:crashhandler:1.0.1"
 //    debugApi 'cat.ereza:customactivityoncrash:2.3.0'

+ 11 - 12
app/src/main/java/com/adealink/weparty/commonui/toast/util/ToastUtil.kt

@@ -11,32 +11,31 @@ import com.adealink.frame.util.runOnUiThread
 import com.adealink.weparty.BuildConfig
 import com.adealink.weparty.R
 import com.adealink.weparty.commonui.toast.ToastCompat
+import io.trtc.tuikit.atomicx.widget.basicwidget.toast.AtomicToast
+import io.trtc.tuikit.atomicx.widget.basicwidget.toast.AtomicToast.Duration
 
 fun showToast(text: CharSequence) {
-    showToast(text, 0)
+    showToast(text, Toast.LENGTH_SHORT)
 }
 
 fun showToast(text: CharSequence, duration: Int) {
     runOnUiThread {
-        if (ToastCompat.isToastEnabled()) {
-            ToastCompat.makeText(AppUtil.appContext, text, duration).show()
-        } else {
-            ToastCompat.show(text, duration)
-        }
+        AtomicToast.show(AppUtil.appContext, text = text.toString(),  position = AtomicToast.Position.CENTER, duration = Duration.map(duration))
+//        if (ToastCompat.isToastEnabled()) {
+//            ToastCompat.makeText(AppUtil.appContext, text, duration).show()
+//        } else {
+//            ToastCompat.show(text, duration)
+//        }
     }
 }
 
 fun showToast(@StringRes resId: Int) {
-    showToast(resId, 0)
+    showToast(resId, Toast.LENGTH_SHORT)
 }
 
 fun showToast(@StringRes resId: Int, duration: Int) {
     runOnUiThread {
-        if (ToastCompat.isToastEnabled()) {
-            ToastCompat.makeText(AppUtil.appContext, resId, duration).show()
-        } else {
-            ToastCompat.show(getCompatString(resId), duration)
-        }
+        showToast(getCompatString(resId), duration)
     }
 }
 

+ 8 - 1
frame/atomic_x/src/main/java/io/trtc/tuikit/atomicx/widget/basicwidget/toast/AtomicToast.kt

@@ -42,7 +42,14 @@ object AtomicToast {
 
     enum class Duration(val value: Int) {
         SHORT(Toast.LENGTH_SHORT),
-        LONG(Toast.LENGTH_LONG)
+        LONG(Toast.LENGTH_LONG);
+
+        companion object {
+            @JvmStatic
+            fun map(duration: Int): Duration {
+                return entries.find { it.value == duration } ?: SHORT
+            }
+        }
     }
 
     private var toastRef: WeakReference<Toast>? = null