合并

app/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        applicationId "com.kdanmobile.android.lib"
+        applicationId "com.common.android.lib"
         minSdk 21
         targetSdk 32
         versionCode 1

lib_common/src/main/java/com/convenient/android/common/base/ActivitysUtils.kt

@@ -9,7 +9,6 @@ import kotlin.system.exitProcess
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2019-12-23  15:23
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/base/view/BaseActivity.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.gyf.immersionbar.ImmersionBar
 import com.convenient.android.common.base.ActivitysUtils.finishAllActivitys
-import com.convenient.android.common.base.extension.removeAllFragments
+import com.convenient.android.common.extension.removeAllFragments
 import com.convenient.android.common.manager.AppStatusConstant.STATUS_FORCE_KILLED
 import com.convenient.android.common.manager.AppStatusConstant.STATUS_NORMAL
 import com.convenient.android.common.manager.AppStatusManager

lib_common/src/main/java/com/convenient/android/common/base/view/BaseFragment.kt

@@ -10,7 +10,6 @@ import com.orhanobut.logger.Logger
 
 /**
  *    @author : HuBoWen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/14  3:55 PM
  *    @description：基础Fragment
  */

lib_common/src/main/java/com/convenient/android/common/config/MyPdfBaseModule.kt

@@ -5,7 +5,6 @@ import android.content.Context
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/17  8:01 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/extension/ActivityExtensions.kt

@@ -1,4 +1,4 @@
-package com.convenient.android.common.base.extension
+package com.convenient.android.common.extension
 
 import android.content.Context
 import android.content.Intent

lib_common/src/main/java/com/convenient/android/common/media/MediaBean.kt

@@ -1,4 +1,4 @@
-package com.kdanmobile.android.common.media
+package com.convenient.android.common.media
 
 import android.net.Uri
 import java.io.Serializable

lib_common/src/main/java/com/convenient/android/common/media/SortUtils.kt

@@ -1,7 +1,6 @@
-package com.kdanmobile.android.common.media
+package com.convenient.android.common.media
 
-import com.kdanmobile.android.common.media.config.MediaSortOrder
-import com.kdanmobile.android.common.media.config.MediaSortType
+import com.convenient.android.common.media.config.MediaSortOrder
 
 /**
  * @classname:

lib_common/src/main/java/com/convenient/android/common/media/config/MediaSortOrder.kt

@@ -1,4 +1,4 @@
-package com.kdanmobile.android.common.media.config
+package com.convenient.android.common.media.config
 
 /**
  * @classname:

lib_common/src/main/java/com/convenient/android/common/media/config/MediaSortType.kt

@@ -1,4 +1,4 @@
-package com.kdanmobile.android.common.media.config
+package com.convenient.android.common.media.config
 
 /**
  * @classname:

lib_common/src/main/java/com/convenient/android/common/media/filemedia/FileStore.kt

@@ -1,11 +1,11 @@
-package com.kdanmobile.android.common.media.filemedia
-
-import com.kdanmobile.android.common.extension.listFilesInDirWithFilter
-import com.kdanmobile.android.common.extension.toFile
-import com.kdanmobile.android.common.media.MediaBean
-import com.kdanmobile.android.common.media.SortUtils
-import com.kdanmobile.android.common.media.config.MediaSortOrder
-import com.kdanmobile.android.common.media.config.MediaSortType
+package com.convenient.android.common.media.filemedia
+
+import com.convenient.android.common.extension.listFilesInDirWithFilter
+import com.convenient.android.common.extension.toFile
+import com.convenient.android.common.media.MediaBean
+import com.convenient.android.common.media.SortUtils
+import com.convenient.android.common.media.config.MediaSortOrder
+import com.convenient.android.common.media.config.MediaSortType
 import java.io.File
 
 /**

lib_common/src/main/java/com/convenient/android/common/media/filemedia/FileStoreConfig.kt

@@ -1,7 +1,7 @@
-package com.kdanmobile.android.common.media.filemedia
+package com.convenient.android.common.media.filemedia
 
-import com.kdanmobile.android.common.media.config.MediaSortOrder
-import com.kdanmobile.android.common.media.config.MediaSortType
+import com.convenient.android.common.media.config.MediaSortOrder
+import com.convenient.android.common.media.config.MediaSortType
 import java.io.File
 
 /**

lib_common/src/main/java/com/convenient/android/common/utils/ReflectionUtils.kt

@@ -6,7 +6,6 @@ import java.lang.reflect.Method
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/17  7:19 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/utils/ToastUtil.kt

@@ -8,7 +8,6 @@ import com.convenient.android.common.config.MyPdfBaseModule
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/18  3:24 PM
  *    @description：
  */
@@ -60,10 +59,6 @@ class ToastUtil constructor() {
             if (mContext != null) showToast(mContext, mContext.resources.getString(resourceId), duration)
         }
 
-//        @JvmOverloads
-//        fun showDebugToast(mContext: Context?, text: String?, isLong: Boolean = false) {
-//            if (mContext != null && com.kdanmobile.android.pdfreader.google.pad.BuildConfig.LOG_DEBUG) showToast(mContext, text, if (isLong) Toast.LENGTH_LONG else Toast.LENGTH_SHORT)
-//        }
     }
 
     init {

lib_common/src/main/java/com/convenient/android/common/utils/eventbus/EventBusUtils.kt

@@ -4,7 +4,6 @@ import org.greenrobot.eventbus.EventBus
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/14  4:59 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/utils/eventbus/MessageEvent.kt

@@ -4,7 +4,6 @@ import java.io.Serializable
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/9/14  5:03 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/utils/string/GsonUtil.kt

@@ -12,7 +12,6 @@ import java.util.concurrent.locks.Lock
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/10/26  4:41 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/utils/string/SerializableUtil.kt

@@ -6,7 +6,6 @@ import java.io.*
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/10/19  1:56 PM
  *    @description：
  */

lib_common/src/main/java/com/convenient/android/common/utils/string/SharedPreferencesSave.kt

@@ -6,7 +6,6 @@ import com.convenient.android.common.extension.*
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/10/19  1:53 PM
  *    @description：Sp数据保存相关
  */

lib_common/src/main/java/com/convenient/android/common/utils/systemui/SoftKeyBoardUtils.kt

@@ -11,7 +11,6 @@ typealias KeyBoardHide = (height: Int) -> Unit
 
 /**
  *    @author : hubowen
- *    @e-mail : hubowen@kdanmobile.com
  *    @date   : 2020/11/6  7:03 PM
  *    @description：软键盘打开显示隐藏监听
  */