日常修改：2024-10-17.

walgr · Oct 17, 2024 · f6a6c92 · f6a6c92
1 parent 65a4093
commit f6a6c92
Show file tree

Hide file tree

Showing 46 changed files with 112 additions and 120 deletions.
diff --git a/Quick-annotations/build.gradle b/Quick-annotations/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 dependencies {
-    compileOnly deps.androidx.annotation
+    implementation deps.androidx.annotation
 }
 
 apply from: rootProject.file('gradle-mvn-push-jar.gradle')
diff --git a/Quick-compiler-ksp/src/main/java/com/wpf/plugins/processor/GenerateRequestProcessor.kt b/Quick-compiler-ksp/src/main/java/com/wpf/plugins/processor/GenerateRequestProcessor.kt
@@ -42,7 +42,7 @@ class GenerateRequestProcessor(environment: SymbolProcessorEnvironment) :
         val wpfRequest = ClassName("com.wpf.app.quicknetwork.base", "WpfRequest")
         val realCall = ClassName("com.wpf.app.quicknetwork.call", "RealCall")
         val requestCoroutineScope =
-            ClassName("com.wpf.app.quicknetwork.base", "RequestCoroutineScope")
+            ClassName("com.wpf.app.quickutil.network", "RequestCoroutineScope")
 
         val defaultFunBuilder = FunSpec.builder(funName)
             .addModifiers(KModifier.INLINE)

diff --git a/Quick/build.gradle b/Quick/build.gradle
@@ -46,13 +46,13 @@ dependencies {
 
     if (IS_REMOTE.toBoolean()) {
         api deps.quickbind.util
-//        api deps.quickbind.network
+        api deps.quickbind.network
         api deps.quickbind.recyclerview
         api deps.quickbind.dialog
         api deps.quickbind.widget
     } else {
         api project(":QuickUtil")
-//        api project(":QuickNetwork")
+        api project(":QuickNetwork")
         api project(":QuickRecyclerView")
         api project(":QuickDialog")
         api project(":QuickWidget")

diff --git a/Quick/src/main/java/com/wpf/app/quick/ability/QuickView.kt b/Quick/src/main/java/com/wpf/app/quick/ability/QuickView.kt
@@ -11,7 +11,7 @@ import com.wpf.app.quickutil.ability.base.QuickAbility
 import com.wpf.app.quickutil.ability.base.QuickGenerateViewAbility
 import com.wpf.app.quickutil.ability.base.QuickInflateViewAbility
 import com.wpf.app.quickutil.ability.base.QuickInitViewAbility
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import com.wpf.app.quickutil.helper.InitViewHelper
 import com.wpf.app.quickutil.helper.match
 import com.wpf.app.quickutil.helper.reset

diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickBaseActivity.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickBaseActivity.kt
@@ -12,7 +12,7 @@ import androidx.activity.result.ActivityResultRegistry
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.Bind
 import com.wpf.app.quickutil.bind.QuickBindWrap

diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/QuickBaseFragment.kt b/Quick/src/main/java/com/wpf/app/quick/activity/QuickBaseFragment.kt
@@ -14,8 +14,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.bind.BindBaseFragment
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.Bind
 import com.wpf.app.quickutil.bind.QuickBindWrap

diff --git a/Quick/src/main/java/com/wpf/app/quick/activity/viewmodel/QuickViewModel.kt b/Quick/src/main/java/com/wpf/app/quick/activity/viewmodel/QuickViewModel.kt
@@ -4,14 +4,15 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.ViewModel
 import com.wpf.app.quickutil.ViewLifecycle
 import com.wpf.app.quickutil.Quick
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import kotlinx.coroutines.Job
 
 /**
  * Created by 王朋飞 on 2022/7/13.
  *
  */
-open class QuickViewModel<T : Quick> : ViewModel(), LifecycleObserver, ViewLifecycle, RequestCoroutineScope {
+open class QuickViewModel<T : Quick> : ViewModel(), LifecycleObserver, ViewLifecycle,
+    RequestCoroutineScope {
     override var jobManager: MutableList<Job> = mutableListOf()
     var quickView: T? = null
     open fun onViewCreated(baseView: T) {

diff --git a/QuickBind/build.gradle b/QuickBind/build.gradle
@@ -27,31 +27,19 @@ android {
 }
 
 dependencies {
-    //ktx核心
-    compileOnly deps.androidx.corektx
-    //activity-ktx
-    compileOnly deps.androidx.activityktx
-    compileOnly deps.androidx.appcompat
-    //fragment-ktx
-    compileOnly deps.androidx.fragmentktx
-    //列表
-    compileOnly deps.androidx.recyclerview
-
-    compileOnly deps.androidx.material
-
     //Glide
-    compileOnly deps.glide
+    implementation deps.glide
     //GSON
-    compileOnly deps.gson
+    implementation deps.gson
     //viewpager2
-    compileOnly deps.viewpager2
+    implementation deps.viewpager2
 
     if (IS_REMOTE.toBoolean()) {
         api deps.quickbind.annotations
-        api deps.quickbind.network
+        api deps.quickbind.util
     } else {
         api project(":Quick-annotations")
-        api project(":QuickNetwork")
+        api project(":QuickUtil")
     }
 }
 

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragment.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragment.kt
@@ -1,6 +1,6 @@
 package com.wpf.app.quickbind.annotations
 
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import kotlin.reflect.KClass
 
 /**

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragment2.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragment2.kt
@@ -1,6 +1,6 @@
 package com.wpf.app.quickbind.annotations
 
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import kotlin.reflect.KClass
 
 /**

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragments2.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/annotations/BindFragments2.kt
@@ -1,6 +1,6 @@
 package com.wpf.app.quickbind.annotations
 
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import kotlin.reflect.KClass
 
 /**

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragment2Plugin.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragment2Plugin.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel
 import androidx.viewpager2.widget.ViewPager2
 import com.wpf.app.quickutil.bind.Bind
 import com.wpf.app.quickbind.annotations.BindFragment2
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickbind.utils.getFragment
 import com.wpf.app.quickbind.viewpager2.adapter.Fragments2StateAdapter
 import com.wpf.app.quickutil.helper.generic.forceTo

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragmentPlugin.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragmentPlugin.kt
@@ -6,7 +6,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModel
 import androidx.viewpager.widget.ViewPager
 import com.wpf.app.quickbind.annotations.BindFragment
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickbind.utils.getFragment
 import com.wpf.app.quickbind.viewpager.adapter.FragmentsAdapter
 import com.wpf.app.quickbind.viewpager.adapter.FragmentsStateAdapter

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragments2Plugin.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragments2Plugin.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModel
 import androidx.viewpager2.widget.ViewPager2
 import com.wpf.app.quickutil.bind.Bind
 import com.wpf.app.quickbind.annotations.BindFragments2
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickbind.viewpager2.adapter.Fragments2StateAdapter
 import com.wpf.app.quickutil.helper.generic.forceTo
 import java.lang.reflect.Field

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragmentsPlugin.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/plugins/BindFragmentsPlugin.kt
@@ -7,7 +7,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModel
 import androidx.viewpager.widget.ViewPager
 import com.wpf.app.quickbind.annotations.BindFragments
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickbind.viewpager.adapter.FragmentsAdapter
 import com.wpf.app.quickbind.viewpager.adapter.FragmentsStateAdapter
 import java.lang.reflect.Field

diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/utils/GetFragment.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/utils/GetFragment.kt
@@ -2,7 +2,7 @@ package com.wpf.app.quickbind.utils
 
 import android.app.Activity
 import androidx.fragment.app.Fragment
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickutil.helper.generic.forceTo
 
 fun getFragment(

diff --git a/QuickDialog/build.gradle b/QuickDialog/build.gradle
@@ -28,14 +28,11 @@ android {
 
 dependencies {
     implementation deps.androidx.material
-    implementation deps.androidx.activityktx
 
     if (IS_REMOTE.toBoolean()) {
         api deps.quickbind.util
-        api deps.quickbind.bind
     } else {
         api project(":QuickUtil")
-        api project(":QuickBind")
     }
 }
 

diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseBottomSheetDialog.kt b/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseBottomSheetDialog.kt
@@ -16,12 +16,12 @@ import com.wpf.app.quickdialog.helper.DialogSheetHelper
 import com.wpf.app.quickdialog.helper.DialogSizeHelper
 import com.wpf.app.quickdialog.listeners.DialogLifecycle
 import com.wpf.app.quickdialog.listeners.DialogSize
-import com.wpf.app.quickdialog.listeners.SheetInit
+import com.wpf.app.quickutil.utils.SheetInit
 import com.wpf.app.quickdialog.minAndMaxLimit.SizeLimitViewGroup
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.QuickBindWrap
 import com.wpf.app.quickutil.helper.InitViewHelper
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import kotlinx.coroutines.Job
 
 /**
@@ -33,7 +33,8 @@ open class QuickBaseBottomSheetDialog(
     @LayoutRes private val layoutId: Int = 0,
     private val layoutView: View? = null,
     private var layoutViewCreate: (Context.() -> View)? = null,
-) : BottomSheetDialog(context, true, null), SheetInit, DialogSize, DialogLifecycle, RequestCoroutineScope, Quick {
+) : BottomSheetDialog(context, true, null),
+    SheetInit, DialogSize, DialogLifecycle, RequestCoroutineScope, Quick {
 
     override var jobManager: MutableList<Job> = mutableListOf()
 
@@ -58,10 +59,7 @@ open class QuickBaseBottomSheetDialog(
         dealSize()
         mView = generateContentView(
             InitViewHelper.init(
-                context,
-                layoutId,
-                layoutView,
-                layoutViewCreate
+                context, layoutId, layoutView, layoutViewCreate
             )
         )
         if (initDialogAdaptiveHeight()) {
@@ -94,6 +92,7 @@ open class QuickBaseBottomSheetDialog(
 
     @Suppress("MemberVisibilityCanBePrivate")
     protected var mScreenWidth = 0
+
     @Suppress("MemberVisibilityCanBePrivate")
     protected var mScreenHeight = 0
 
@@ -106,6 +105,7 @@ open class QuickBaseBottomSheetDialog(
 
     @Suppress("MemberVisibilityCanBePrivate")
     protected var mNewWidth = 0
+
     @Suppress("MemberVisibilityCanBePrivate")
     protected var mNewHeight = 0
 
@@ -137,6 +137,7 @@ open class QuickBaseBottomSheetDialog(
     override fun getLifecycleDialog(): Dialog {
         return this
     }
+
     override var funcPrepare: (() -> Unit)? = null
     override var funcShow: (Dialog.() -> Unit)? = null
     override var funcDismiss: (Dialog.() -> Unit)? = null

diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseBottomSheetDialogFragment.kt b/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseBottomSheetDialogFragment.kt
@@ -22,18 +22,18 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
 import com.wpf.app.quickdialog.helper.DialogSheetHelper
 import com.wpf.app.quickdialog.helper.DialogSizeHelper
 import com.wpf.app.quickdialog.listeners.DialogLifecycle
 import com.wpf.app.quickdialog.listeners.DialogSize
-import com.wpf.app.quickdialog.listeners.SheetInit
+import com.wpf.app.quickutil.utils.SheetInit
 import com.wpf.app.quickdialog.minAndMaxLimit.SizeLimitViewGroup
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.Bind
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickutil.bind.QuickBindWrap
 import com.wpf.app.quickutil.helper.InitViewHelper
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import kotlinx.coroutines.Job
 
 /**

diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseDialog.kt b/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseDialog.kt
@@ -13,7 +13,7 @@ import com.wpf.app.quickdialog.helper.DialogSizeHelper
 import com.wpf.app.quickdialog.listeners.DialogLifecycle
 import com.wpf.app.quickdialog.listeners.DialogSize
 import com.wpf.app.quickdialog.minAndMaxLimit.SizeLimitViewGroup
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.QuickBindWrap
 import com.wpf.app.quickutil.helper.InitViewHelper

diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseDialogFragment.kt b/QuickDialog/src/main/java/com/wpf/app/quickdialog/QuickBaseDialogFragment.kt
@@ -21,12 +21,12 @@ import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import com.wpf.app.quickbind.interfaces.BindBaseFragment
+import com.wpf.app.quickutil.bind.BindBaseFragment
 import com.wpf.app.quickdialog.helper.DialogSizeHelper
 import com.wpf.app.quickdialog.listeners.DialogLifecycle
 import com.wpf.app.quickdialog.listeners.DialogSize
 import com.wpf.app.quickdialog.minAndMaxLimit.SizeLimitViewGroup
-import com.wpf.app.quicknetwork.base.RequestCoroutineScope
+import com.wpf.app.quickutil.network.RequestCoroutineScope
 import com.wpf.app.quickutil.Quick
 import com.wpf.app.quickutil.bind.Bind
 import com.wpf.app.quickutil.bind.QuickBindWrap

diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/DialogSize.kt b/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/DialogSize.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import androidx.annotation.StyleRes
+import com.wpf.app.quickutil.utils.QuickContext
 
 /**
  * Created by 王朋飞 on 2022/6/17.

diff --git a/QuickNetwork/build.gradle b/QuickNetwork/build.gradle
@@ -27,7 +27,6 @@ android {
 }
 
 dependencies {
-    implementation deps.androidx.annotation
     implementation deps.kotlin.kotlinxcoroutinescore
     //retrofit2-okhttp-gson
     api deps.retrofit

diff --git a/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/JobRequest.kt b/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/JobRequest.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quicknetwork.base
 
+import com.wpf.app.quickutil.network.RequestCoroutineScope
+
 
 /**
  * Created by 王朋飞 on 2022/7/22.

diff --git a/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/WpfRequest.kt b/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/WpfRequest.kt
@@ -1,5 +1,7 @@
 package com.wpf.app.quicknetwork.base
 
+import com.wpf.app.quickutil.network.RequestCoroutineScope
+
 /**
  * Created by 王朋飞 on 2022/7/22.
  *

diff --git a/QuickRecyclerView/build.gradle b/QuickRecyclerView/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     } else {
         api project(":QuickUtil")
         api project(":QuickBind")
-        api project(":QuickNetwork")
+//        api project(":QuickNetwork")
     }
 }
 

diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/QuickAdapter.kt b/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/QuickAdapter.kt
@@ -25,8 +25,8 @@ open class QuickAdapter : RecyclerView.Adapter<QuickViewHolder<QuickItemData>>()
     private var mRecyclerView: RecyclerView? = null
     private var mQuickAdapterListener: QuickAdapterListener<QuickItemData>? = null
 
-    internal var mDataList: MutableList<QuickItemData>? = null
-    internal var allDataList: MutableList<QuickItemData>? = null
+    var mDataList: MutableList<QuickItemData>? = null
+    var allDataList: MutableList<QuickItemData>? = null
     val headerViews = mutableListOf<QuickHeaderData>()
     val footerViews = mutableListOf<QuickFooterData>()