): Intent =
+ Intent(this, T::class.java).apply {
+ pairs.forEach { pair ->
+ val name = pair.first
+ when (val value = pair.second) {
+ is Int -> putExtra(name, value)
+ is Byte -> putExtra(name, value)
+ is Char -> putExtra(name, value)
+ is Short -> putExtra(name, value)
+ is Boolean -> putExtra(name, value)
+ is Long -> putExtra(name, value)
+ is Float -> putExtra(name, value)
+ is Double -> putExtra(name, value)
+ is String -> putExtra(name, value)
+ is CharSequence -> putExtra(name, value)
+ is Parcelable -> putExtra(name, value)
+ is Array<*> -> putExtra(name, value)
+ is ArrayList<*> -> putExtra(name, value)
+ is Serializable -> putExtra(name, value)
+ is BooleanArray -> putExtra(name, value)
+ is ByteArray -> putExtra(name, value)
+ is ShortArray -> putExtra(name, value)
+ is CharArray -> putExtra(name, value)
+ is IntArray -> putExtra(name, value)
+ is LongArray -> putExtra(name, value)
+ is FloatArray -> putExtra(name, value)
+ is DoubleArray -> putExtra(name, value)
+ is Bundle -> putExtra(name, value)
+ is Intent -> putExtra(name, value)
+ else -> {
+ }
+ }
+ }
+ }
\ No newline at end of file
diff --git a/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.java b/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.java
deleted file mode 100644
index 4f98dbf..0000000
--- a/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.br3ant.utils.launcher;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
-
-/**
- *
- * copyright: datedu
- * @author : houqiqi
- * e-mail : xxx@xx
- * time : 2019-11-21
- * desc : Activity跳转封装类，把OnActivityResult方式改为Callback方式
- * version: 1.0
- *
- */
-public class DLauncher {
- private static final String TAG = "DLauncher";
- private Context mContext;
-
- private DRouterX mRouterFragmentX;
-
- public static DLauncher init(Fragment fragment) {
- return init(fragment.requireActivity());
- }
-
- public static DLauncher init(Activity activity) {
- return init((FragmentActivity) activity);
- }
-
- public static DLauncher init(FragmentActivity activity) {
- return new DLauncher(activity);
- }
-
-
- private DLauncher(FragmentActivity activity) {
- mContext = activity;
- mRouterFragmentX = getRouterFragmentX(activity);
- }
-
- private DRouterX getRouterFragmentX(FragmentActivity activity) {
- DRouterX routerFragment = findRouterFragmentX(activity);
- if (routerFragment == null) {
- routerFragment = DRouterX.newInstance();
- FragmentManager fragmentManager = activity.getSupportFragmentManager();
- fragmentManager
- .beginTransaction()
- .add(routerFragment, TAG)
- .commitAllowingStateLoss();
- fragmentManager.executePendingTransactions();
- }
- return routerFragment;
- }
-
- private DRouterX findRouterFragmentX(FragmentActivity activity) {
- return (DRouterX) activity.getSupportFragmentManager().findFragmentByTag(TAG);
- }
-
- public void startActivityForResult(Class clazz, Callback callback) {
- Intent intent = new Intent(mContext, clazz);
- startActivityForResult(intent, callback);
- }
-
- public void startActivityForResult(Intent intent, Callback callback) {
- if (mRouterFragmentX != null) {
- mRouterFragmentX.startActivityForResult(intent, callback);
- } else {
- throw new RuntimeException("please do init first!");
- }
- }
-
- public interface Callback {
- void onActivityResult(int resultCode, @Nullable Intent data);
- }
-}
diff --git a/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.kt b/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.kt
new file mode 100644
index 0000000..b5c3e2e
--- /dev/null
+++ b/utils/src/main/java/com/br3ant/utils/launcher/DLauncher.kt
@@ -0,0 +1,84 @@
+package com.br3ant.utils.launcher
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+/**
+ *
+ * copyright: datedu
+ * @author : houqiqi
+ * e-mail : xxx@xx
+ * time : 2019-11-21
+ * desc : Activity跳转封装类，把OnActivityResult方式改为Callback方式
+ * version: 1.0
+
*
+ */
+class DLauncher constructor(activity: FragmentActivity) {
+ private val mContext: Context
+ private val mRouterFragmentX: DRouterX?
+
+ constructor(fragment: Fragment) : this(fragment.requireActivity())
+
+ constructor(activity: Activity) : this(activity as FragmentActivity)
+
+
+ private fun getRouterFragmentX(activity: FragmentActivity): DRouterX? {
+
+ return findRouterFragmentX(activity) ?: DRouterX.newInstance().also {
+ val fragmentManager = activity.supportFragmentManager
+ fragmentManager
+ .beginTransaction()
+ .add(it, TAG)
+ .commitAllowingStateLoss()
+ fragmentManager.executePendingTransactions()
+ }
+ }
+
+ private fun findRouterFragmentX(activity: FragmentActivity): DRouterX? {
+ return activity.supportFragmentManager.findFragmentByTag(TAG) as DRouterX?
+ }
+
+ fun startActivityForResult(clazz: Class<*>?, callback: Callback?) {
+ val intent = Intent(mContext, clazz)
+ startActivityForResult(intent, callback)
+ }
+
+ fun startActivityForResult(intent: Intent?, callback: Callback?) {
+ if (mRouterFragmentX != null) {
+ mRouterFragmentX.startActivityForResult(intent, callback)
+ } else {
+ throw RuntimeException("please do init first!")
+ }
+ }
+
+ suspend fun launcher(intent: Intent?): Bundle? =
+ suspendCancellableCoroutine { continuation ->
+ try {
+ startActivityForResult(intent) { _, data ->
+ continuation.resume(data?.extras)
+ }
+ } catch (e: Exception) {
+ continuation.resumeWithException(e)
+ }
+ }
+
+ fun interface Callback {
+ fun onActivityResult(resultCode: Int, data: Intent?)
+ }
+
+ companion object {
+ private const val TAG = "DLauncher"
+ }
+
+ init {
+ mContext = activity
+ mRouterFragmentX = getRouterFragmentX(activity)
+ }
+}
\ No newline at end of file
diff --git a/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.java b/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.java
deleted file mode 100644
index 827d975..0000000
--- a/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.br3ant.utils.launcher;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.SparseArray;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import java.util.Random;
-
-/**
- *
- * copyright: datedu
- * @author : houqiqi
- * e-mail : xxx@xx
- * time : 2019-11-21
- * desc : 把OnActivityResult方式转换为Callback方式的空Fragment（X兼容包）
- * version: 1.0
- *
- */
-public class DRouterX extends Fragment {
- private SparseArray mCallbacks = new SparseArray<>();
- private Random mCodeGenerator = new Random();
-
- public DRouterX() {
- // Required empty public constructor
- }
-
- public static DRouterX newInstance() {
- return new DRouterX();
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setRetainInstance(true);
- }
-
- public void startActivityForResult(Intent intent, DLauncher.Callback callback) {
- int requestCode = makeRequestCode();
- mCallbacks.put(requestCode, callback);
- startActivityForResult(intent, requestCode);
- }
-
- /**
- * 随机生成唯一的requestCode，最多尝试10次
- *
- * @return
- */
- private int makeRequestCode() {
- int requestCode;
- int tryCount = 0;
- do {
- requestCode = mCodeGenerator.nextInt(0x0000FFFF);
- tryCount++;
- } while (mCallbacks.indexOfKey(requestCode) >= 0 && tryCount < 10);
- return requestCode;
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- DLauncher.Callback callback = mCallbacks.get(requestCode);
- mCallbacks.remove(requestCode);
- if (callback != null) {
- callback.onActivityResult(resultCode, data);
- }
- }
-}
diff --git a/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.kt b/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.kt
new file mode 100644
index 0000000..9e04c6d
--- /dev/null
+++ b/utils/src/main/java/com/br3ant/utils/launcher/DRouterX.kt
@@ -0,0 +1,60 @@
+package com.br3ant.utils.launcher
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.SparseArray
+import androidx.fragment.app.Fragment
+import java.util.*
+
+/**
+ *
+ * copyright: datedu
+ * @author : houqiqi
+ * e-mail : xxx@xx
+ * time : 2019-11-21
+ * desc : 把OnActivityResult方式转换为Callback方式的空Fragment（X兼容包）
+ * version: 1.0
+
*
+ */
+class DRouterX : Fragment() {
+ private val mCallbacks = SparseArray()
+ private val mCodeGenerator = Random()
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ retainInstance = true
+ }
+
+ fun startActivityForResult(intent: Intent?, callback: DLauncher.Callback?) {
+ val requestCode = makeRequestCode()
+ mCallbacks.put(requestCode, callback)
+ startActivityForResult(intent, requestCode)
+ }
+
+ /**
+ * 随机生成唯一的requestCode，最多尝试10次
+ *
+ * @return
+ */
+ private fun makeRequestCode(): Int {
+ var requestCode: Int
+ var tryCount = 0
+ do {
+ requestCode = mCodeGenerator.nextInt(0x0000FFFF)
+ tryCount++
+ } while (mCallbacks.indexOfKey(requestCode) >= 0 && tryCount < 10)
+ return requestCode
+ }
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ val callback = mCallbacks[requestCode]
+ mCallbacks.remove(requestCode)
+ callback?.onActivityResult(resultCode, data)
+ }
+
+ companion object {
+ fun newInstance(): DRouterX {
+ return DRouterX()
+ }
+ }
+}
\ No newline at end of file