From f6a6c928368bcefc8a032fef2080bc251f2ee709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9C=8B=E9=A3=9E?= Date: Thu, 17 Oct 2024 15:35:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BF=AE=E6=94=B9=EF=BC=9A20?= =?UTF-8?q?24-10-17.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Quick-annotations/build.gradle | 2 +- .../processor/GenerateRequestProcessor.kt | 2 +- Quick/build.gradle | 4 +-- .../com/wpf/app/quick/ability/QuickView.kt | 2 +- .../app/quick/activity/QuickBaseActivity.kt | 2 +- .../app/quick/activity/QuickBaseFragment.kt | 4 +-- .../activity/viewmodel/QuickViewModel.kt | 5 +-- QuickBind/build.gradle | 22 +++--------- .../app/quickbind/annotations/BindFragment.kt | 2 +- .../quickbind/annotations/BindFragment2.kt | 2 +- .../quickbind/annotations/BindFragments2.kt | 2 +- .../quickbind/plugins/BindFragment2Plugin.kt | 2 +- .../quickbind/plugins/BindFragmentPlugin.kt | 2 +- .../quickbind/plugins/BindFragments2Plugin.kt | 2 +- .../quickbind/plugins/BindFragmentsPlugin.kt | 2 +- .../wpf/app/quickbind/utils/GetFragment.kt | 2 +- QuickDialog/build.gradle | 3 -- .../quickdialog/QuickBaseBottomSheetDialog.kt | 15 ++++---- .../QuickBaseBottomSheetDialogFragment.kt | 6 ++-- .../wpf/app/quickdialog/QuickBaseDialog.kt | 2 +- .../quickdialog/QuickBaseDialogFragment.kt | 4 +-- .../app/quickdialog/listeners/DialogSize.kt | 1 + QuickNetwork/build.gradle | 1 - .../wpf/app/quicknetwork/base/JobRequest.kt | 2 ++ .../wpf/app/quicknetwork/base/WpfRequest.kt | 2 ++ QuickRecyclerView/build.gradle | 2 +- .../wpf/app/quickrecyclerview/QuickAdapter.kt | 4 +-- .../ability/helper/ListHelper.kt | 30 ++-------------- .../app/quickutil/bind}/BindBaseFragment.kt | 2 +- .../network}/RequestCoroutineScope.kt | 6 +++- .../wpf/app/quickutil/utils}/QuickContext.kt | 2 +- .../com/wpf/app/quickutil/utils}/SheetInit.kt | 2 +- QuickWidget/build.gradle | 7 ---- .../bottomsheet/QuickBottomSheetView.kt | 4 +-- .../quickwork/ability/helper/ListHelper.kt | 36 +++++++++++++++++++ .../ability/helper/RefreshListHelper.kt | 8 ++--- .../request2list}/QuickRefreshRecyclerView.kt | 5 ++- .../quickwork/request2list}/Request2List.kt | 4 +-- .../request2list}/Request2RefreshView.kt | 5 +-- .../quickwork/request2list}/RequestData.kt | 4 +-- app/build.gradle | 2 +- .../wpf/app/quick/demo/model/ListRequest.kt | 2 +- .../wanandroid/fragment/RecommendFragment.kt | 6 ++-- .../quick/demo/wanandroid/model/WanRequest.kt | 2 +- build.gradle | 2 +- gradle.properties | 2 +- 46 files changed, 112 insertions(+), 120 deletions(-) rename {QuickBind/src/main/java/com/wpf/app/quickbind/interfaces => QuickUtil/src/main/java/com/wpf/app/quickutil/bind}/BindBaseFragment.kt (92%) rename {QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base => QuickUtil/src/main/java/com/wpf/app/quickutil/network}/RequestCoroutineScope.kt (85%) rename {QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners => QuickUtil/src/main/java/com/wpf/app/quickutil/utils}/QuickContext.kt (98%) rename {QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners => QuickUtil/src/main/java/com/wpf/app/quickutil/utils}/SheetInit.kt (92%) create mode 100644 QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/ListHelper.kt rename {QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview => QuickWork/src/main/java/com/wpf/app/quickwork/request2list}/QuickRefreshRecyclerView.kt (95%) rename {QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/listeners => QuickWork/src/main/java/com/wpf/app/quickwork/request2list}/Request2List.kt (98%) rename {QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/helper => QuickWork/src/main/java/com/wpf/app/quickwork/request2list}/Request2RefreshView.kt (69%) rename {QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/data => QuickWork/src/main/java/com/wpf/app/quickwork/request2list}/RequestData.kt (87%) diff --git a/Quick-annotations/build.gradle b/Quick-annotations/build.gradle index 817dda87..5ff0cc89 100644 --- 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') \ No newline at end of file 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 index 7be98ef0..5fe768c7 100644 --- 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 index b61268f7..1892a56f 100644 --- 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 index 179edc11..5deb0910 100644 --- 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 index 9910ba1b..a9e39a03 100644 --- 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 index 1dc30ce6..da15ad29 100644 --- 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 index 0213383e..66560fc7 100644 --- 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 : ViewModel(), LifecycleObserver, ViewLifecycle, RequestCoroutineScope { +open class QuickViewModel : ViewModel(), LifecycleObserver, ViewLifecycle, + RequestCoroutineScope { override var jobManager: MutableList = mutableListOf() var quickView: T? = null open fun onViewCreated(baseView: T) { diff --git a/QuickBind/build.gradle b/QuickBind/build.gradle index 2e154516..6d8042f1 100644 --- 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 index 5bbd812f..684c421b 100644 --- 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 index 5cc795b2..e9317111 100644 --- 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 index 3456dd41..ee699cfb 100644 --- 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 index 3f360623..36658307 100644 --- 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 index 5d183a6a..92759d52 100644 --- 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 index 3691a216..b50aa96d 100644 --- 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 index e732bd76..a26f229f 100644 --- 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 index 021bef67..a0e7d3ab 100644 --- 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 index 9e65a943..0bdffa63 100644 --- 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 index 8840041e..9709d598 100644 --- 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 = 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 index 3656da68..15a30e90 100644 --- 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 index b3f3d738..5cf43cdb 100644 --- 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 index 28bd8e79..da20b9ad 100644 --- 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 index 97416f03..6938965c 100644 --- 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 index 7b036a6d..daba4e50 100644 --- 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 index 5a3a2ace..d0a3745e 100644 --- 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 index 46239043..45bdd62e 100644 --- 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 index 44ffa15a..f0c56ba5 100644 --- 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 index 261dfb81..39f9d0eb 100644 --- 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>() private var mRecyclerView: RecyclerView? = null private var mQuickAdapterListener: QuickAdapterListener? = null - internal var mDataList: MutableList? = null - internal var allDataList: MutableList? = null + var mDataList: MutableList? = null + var allDataList: MutableList? = null val headerViews = mutableListOf() val footerViews = mutableListOf() diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/ability/helper/ListHelper.kt b/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/ability/helper/ListHelper.kt index f94d4593..958bea5a 100644 --- a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/ability/helper/ListHelper.kt +++ b/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/ability/helper/ListHelper.kt @@ -3,12 +3,11 @@ package com.wpf.app.quickrecyclerview.ability.helper import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView.LayoutManager -import com.wpf.app.quickutil.ability.helper.addView -import com.wpf.app.quickutil.ability.scope.ContextScope import com.wpf.app.quickrecyclerview.QuickRecyclerView -import com.wpf.app.quickrecyclerview.QuickRefreshRecyclerView import com.wpf.app.quickrecyclerview.data.QuickItemData import com.wpf.app.quickrecyclerview.utils.SpaceType +import com.wpf.app.quickutil.ability.helper.addView +import com.wpf.app.quickutil.ability.scope.ContextScope import com.wpf.app.quickutil.helper.matchWrapMarginLayoutParams fun ContextScope.list( @@ -33,29 +32,4 @@ fun ContextScope.list( } addView(list, layoutParams) return list -} - - -fun ContextScope.refreshList( - layoutParams: ViewGroup.LayoutParams = matchWrapMarginLayoutParams(), - layoutManager: LayoutManager = LinearLayoutManager(context), - space: Int? = null, - spaceType: Int = SpaceType.Center.type, - includeFirst: Boolean = false, - includeLast: Boolean = false, - dataList: List? = null, - builder: (QuickRecyclerView.() -> Unit)? = null, -): QuickRefreshRecyclerView { - val list = QuickRefreshRecyclerView(context).apply { - space?.let { - setSpace(it, spaceType, includeFirst, includeLast) - } - this.layoutManager = layoutManager - dataList?.let { - setData(it.toMutableList()) - } - builder?.invoke(this) - } - addView(list, layoutParams) - return list } \ No newline at end of file diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/interfaces/BindBaseFragment.kt b/QuickUtil/src/main/java/com/wpf/app/quickutil/bind/BindBaseFragment.kt similarity index 92% rename from QuickBind/src/main/java/com/wpf/app/quickbind/interfaces/BindBaseFragment.kt rename to QuickUtil/src/main/java/com/wpf/app/quickutil/bind/BindBaseFragment.kt index 4f673ad5..3959c309 100644 --- a/QuickBind/src/main/java/com/wpf/app/quickbind/interfaces/BindBaseFragment.kt +++ b/QuickUtil/src/main/java/com/wpf/app/quickutil/bind/BindBaseFragment.kt @@ -1,4 +1,4 @@ -package com.wpf.app.quickbind.interfaces +package com.wpf.app.quickutil.bind import android.app.Activity import android.os.Bundle diff --git a/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/RequestCoroutineScope.kt b/QuickUtil/src/main/java/com/wpf/app/quickutil/network/RequestCoroutineScope.kt similarity index 85% rename from QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/RequestCoroutineScope.kt rename to QuickUtil/src/main/java/com/wpf/app/quickutil/network/RequestCoroutineScope.kt index f024965a..e45c77e5 100644 --- a/QuickNetwork/src/main/java/com/wpf/app/quicknetwork/base/RequestCoroutineScope.kt +++ b/QuickUtil/src/main/java/com/wpf/app/quickutil/network/RequestCoroutineScope.kt @@ -1,4 +1,4 @@ -package com.wpf.app.quicknetwork.base +package com.wpf.app.quickutil.network import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope @@ -6,6 +6,10 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlin.coroutines.CoroutineContext +/** + * Created by 王朋飞 on 2022/7/22. + * 注解使用此类，移动需要修改注解代码 + */ interface RequestCoroutineScope: CoroutineScope { override val coroutineContext: CoroutineContext get() = Dispatchers.Main diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/QuickContext.kt b/QuickUtil/src/main/java/com/wpf/app/quickutil/utils/QuickContext.kt similarity index 98% rename from QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/QuickContext.kt rename to QuickUtil/src/main/java/com/wpf/app/quickutil/utils/QuickContext.kt index 83dc6599..925089aa 100644 --- a/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/QuickContext.kt +++ b/QuickUtil/src/main/java/com/wpf/app/quickutil/utils/QuickContext.kt @@ -1,4 +1,4 @@ -package com.wpf.app.quickdialog.listeners +package com.wpf.app.quickutil.utils import android.app.Activity import android.content.Context diff --git a/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/SheetInit.kt b/QuickUtil/src/main/java/com/wpf/app/quickutil/utils/SheetInit.kt similarity index 92% rename from QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/SheetInit.kt rename to QuickUtil/src/main/java/com/wpf/app/quickutil/utils/SheetInit.kt index 6f43b344..6e6a640b 100644 --- a/QuickDialog/src/main/java/com/wpf/app/quickdialog/listeners/SheetInit.kt +++ b/QuickUtil/src/main/java/com/wpf/app/quickutil/utils/SheetInit.kt @@ -1,4 +1,4 @@ -package com.wpf.app.quickdialog.listeners +package com.wpf.app.quickutil.utils import com.google.android.material.bottomsheet.BottomSheetBehavior diff --git a/QuickWidget/build.gradle b/QuickWidget/build.gradle index a34f29ea..c20f92ca 100644 --- a/QuickWidget/build.gradle +++ b/QuickWidget/build.gradle @@ -27,9 +27,6 @@ android { } dependencies { - - implementation deps.androidx.appcompat - implementation deps.androidx.material //约束布局 implementation deps.androidx.constraintlayout @@ -38,15 +35,11 @@ dependencies { implementation deps.flexbox if (IS_REMOTE.toBoolean()) { - api deps.quickbind.bind api deps.quickbind.util api deps.quickbind.recyclerview - api deps.quickbind.dialog } else { - api project(":QuickBind") api project(":QuickUtil") api project(":QuickRecyclerView") - api project(":QuickDialog") } } diff --git a/QuickWidget/src/main/java/com/wpf/app/quickwidget/bottomsheet/QuickBottomSheetView.kt b/QuickWidget/src/main/java/com/wpf/app/quickwidget/bottomsheet/QuickBottomSheetView.kt index 26d6bc7b..d40e1341 100644 --- a/QuickWidget/src/main/java/com/wpf/app/quickwidget/bottomsheet/QuickBottomSheetView.kt +++ b/QuickWidget/src/main/java/com/wpf/app/quickwidget/bottomsheet/QuickBottomSheetView.kt @@ -11,9 +11,9 @@ import android.widget.LinearLayout import androidx.annotation.CallSuper import androidx.coordinatorlayout.widget.CoordinatorLayout import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.wpf.app.quickdialog.listeners.QuickContext -import com.wpf.app.quickdialog.listeners.SheetInit import com.wpf.app.quickutil.helper.generic.forceTo +import com.wpf.app.quickutil.utils.QuickContext +import com.wpf.app.quickutil.utils.SheetInit /** diff --git a/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/ListHelper.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/ListHelper.kt new file mode 100644 index 00000000..ec6baf88 --- /dev/null +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/ListHelper.kt @@ -0,0 +1,36 @@ +package com.wpf.app.quickwork.ability.helper + +import android.view.ViewGroup +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView.LayoutManager +import com.wpf.app.quickutil.ability.helper.addView +import com.wpf.app.quickutil.ability.scope.ContextScope +import com.wpf.app.quickrecyclerview.QuickRecyclerView +import com.wpf.app.quickrecyclerview.data.QuickItemData +import com.wpf.app.quickrecyclerview.utils.SpaceType +import com.wpf.app.quickutil.helper.matchWrapMarginLayoutParams +import com.wpf.app.quickwork.request2list.QuickRefreshRecyclerView + +fun ContextScope.refreshList( + layoutParams: ViewGroup.LayoutParams = matchWrapMarginLayoutParams(), + layoutManager: LayoutManager = LinearLayoutManager(context), + space: Int? = null, + spaceType: Int = SpaceType.Center.type, + includeFirst: Boolean = false, + includeLast: Boolean = false, + dataList: List? = null, + builder: (QuickRecyclerView.() -> Unit)? = null, +): QuickRefreshRecyclerView { + val list = QuickRefreshRecyclerView(context).apply { + space?.let { + setSpace(it, spaceType, includeFirst, includeLast) + } + this.layoutManager = layoutManager + dataList?.let { + setData(it.toMutableList()) + } + builder?.invoke(this) + } + addView(list, layoutParams) + return list +} \ No newline at end of file diff --git a/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/RefreshListHelper.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/RefreshListHelper.kt index 407a5a2c..56d5bfd0 100644 --- a/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/RefreshListHelper.kt +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/ability/helper/RefreshListHelper.kt @@ -17,11 +17,11 @@ import com.wpf.app.quickutil.ability.scope.ContextScope import com.wpf.app.quickutil.ability.scope.ViewGroupScope import com.wpf.app.quickutil.ability.scope.createViewGroupScope import com.wpf.app.quickbind.helper.binddatahelper.BindData2ViewHelper -import com.wpf.app.quickrecyclerview.QuickRefreshRecyclerView +import com.wpf.app.quickwork.request2list.QuickRefreshRecyclerView import com.wpf.app.quickrecyclerview.data.QuickItemData -import com.wpf.app.quickrecyclerview.data.RequestData -import com.wpf.app.quickrecyclerview.helper.Request2RefreshView -import com.wpf.app.quickrecyclerview.listeners.Request2ListWithView +import com.wpf.app.quickwork.request2list.RequestData +import com.wpf.app.quickwork.request2list.Request2RefreshView +import com.wpf.app.quickwork.request2list.Request2ListWithView import com.wpf.app.quickutil.helper.InitViewHelper import com.wpf.app.quickutil.helper.matchMarginLayoutParams import com.wpf.app.quickutil.helper.matchWrapMarginLayoutParams diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/QuickRefreshRecyclerView.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/QuickRefreshRecyclerView.kt similarity index 95% rename from QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/QuickRefreshRecyclerView.kt rename to QuickWork/src/main/java/com/wpf/app/quickwork/request2list/QuickRefreshRecyclerView.kt index a8112a6a..9460de2e 100644 --- a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/QuickRefreshRecyclerView.kt +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/QuickRefreshRecyclerView.kt @@ -1,13 +1,12 @@ -package com.wpf.app.quickrecyclerview +package com.wpf.app.quickwork.request2list import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import com.wpf.app.quicknetwork.utils.RequestCallback +import com.wpf.app.quickrecyclerview.QuickRecyclerView import com.wpf.app.quickrecyclerview.data.QuickItemData -import com.wpf.app.quickrecyclerview.data.RequestData import com.wpf.app.quickrecyclerview.listeners.RefreshResult -import com.wpf.app.quickrecyclerview.listeners.Request2ListWithView import com.wpf.app.quickutil.helper.generic.asTo import com.wpf.app.quickutil.helper.generic.nullDefault diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/listeners/Request2List.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2List.kt similarity index 98% rename from QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/listeners/Request2List.kt rename to QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2List.kt index e1fd447c..c6d3ef40 100644 --- a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/listeners/Request2List.kt +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2List.kt @@ -1,12 +1,10 @@ -package com.wpf.app.quickrecyclerview.listeners +package com.wpf.app.quickwork.request2list import androidx.annotation.CallSuper import com.wpf.app.quicknetwork.base.BaseRequest import com.wpf.app.quicknetwork.base.BaseResponseI import com.wpf.app.quicknetwork.utils.RequestCallback -import com.wpf.app.quickrecyclerview.QuickRefreshRecyclerView import com.wpf.app.quickrecyclerview.data.QuickItemData -import com.wpf.app.quickrecyclerview.data.RequestData /** * Created by 王朋飞 on 2022/7/13. diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/helper/Request2RefreshView.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2RefreshView.kt similarity index 69% rename from QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/helper/Request2RefreshView.kt rename to QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2RefreshView.kt index 04298e23..e67ad1e7 100644 --- a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/helper/Request2RefreshView.kt +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/Request2RefreshView.kt @@ -1,10 +1,7 @@ -package com.wpf.app.quickrecyclerview.helper +package com.wpf.app.quickwork.request2list import com.wpf.app.quickbind.annotations.BindD2VHelper -import com.wpf.app.quickrecyclerview.QuickRefreshRecyclerView import com.wpf.app.quickrecyclerview.data.QuickItemData -import com.wpf.app.quickrecyclerview.data.RequestData -import com.wpf.app.quickrecyclerview.listeners.Request2ListWithView object Request2RefreshView : BindD2VHelper> { diff --git a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/data/RequestData.kt b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/RequestData.kt similarity index 87% rename from QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/data/RequestData.kt rename to QuickWork/src/main/java/com/wpf/app/quickwork/request2list/RequestData.kt index a1d91572..57af58dc 100644 --- a/QuickRecyclerView/src/main/java/com/wpf/app/quickrecyclerview/data/RequestData.kt +++ b/QuickWork/src/main/java/com/wpf/app/quickwork/request2list/RequestData.kt @@ -1,4 +1,4 @@ -package com.wpf.app.quickrecyclerview.data +package com.wpf.app.quickwork.request2list import androidx.annotation.CallSuper @@ -36,7 +36,7 @@ open class RequestData @JvmOverloads constructor( offset += size } - internal fun resetData(build: T.() -> Unit) { + fun resetData(build: T.() -> Unit) { build.invoke(this as T) this.firstPage = this.page } diff --git a/app/build.gradle b/app/build.gradle index 87c386fb..995e0a63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,7 @@ dependencies { ksp deps.quickbind.compiler_ksp } else { implementation project(":QuickWork") - ksp deps.quickbind.compiler_ksp_jitpack + ksp deps.quickbind.compiler_ksp_local } //ktx核心 implementation deps.androidx.annotation diff --git a/app/src/main/java/com/wpf/app/quick/demo/model/ListRequest.kt b/app/src/main/java/com/wpf/app/quick/demo/model/ListRequest.kt index 436ec7b2..d458ece8 100644 --- a/app/src/main/java/com/wpf/app/quick/demo/model/ListRequest.kt +++ b/app/src/main/java/com/wpf/app/quick/demo/model/ListRequest.kt @@ -1,6 +1,6 @@ package com.wpf.app.quick.demo.model -import com.wpf.app.quickrecyclerview.data.RequestData +import com.wpf.app.quickwork.request2list.RequestData /** * Created by 王朋飞 on 2022/7/8. diff --git a/app/src/main/java/com/wpf/app/quick/demo/wanandroid/fragment/RecommendFragment.kt b/app/src/main/java/com/wpf/app/quick/demo/wanandroid/fragment/RecommendFragment.kt index 643c2e1f..2fe5754b 100644 --- a/app/src/main/java/com/wpf/app/quick/demo/wanandroid/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/wpf/app/quick/demo/wanandroid/fragment/RecommendFragment.kt @@ -1,17 +1,17 @@ package com.wpf.app.quick.demo.wanandroid.fragment import android.widget.FrameLayout -import com.wpf.app.quickutil.ability.ex.contentView import com.wpf.app.quick.ability.QuickFragment import com.wpf.app.quick.demo.http.request import com.wpf.app.quick.demo.model.ListRequest import com.wpf.app.quick.demo.wanandroid.model.Article import com.wpf.app.quick.demo.widgets.emptyview.TestEmptyView -import com.wpf.app.quickrecyclerview.listeners.requestData2List -import com.wpf.app.quickutil.utils.LogUtil +import com.wpf.app.quickutil.ability.ex.contentView import com.wpf.app.quickutil.helper.generic.forceTo +import com.wpf.app.quickutil.utils.LogUtil import com.wpf.app.quickwidget.emptyview.EmptyHelper.bind import com.wpf.app.quickwork.ability.helper.smartRefreshList +import com.wpf.app.quickwork.request2list.requestData2List class RecommendFragment : QuickFragment( contentView { diff --git a/app/src/main/java/com/wpf/app/quick/demo/wanandroid/model/WanRequest.kt b/app/src/main/java/com/wpf/app/quick/demo/wanandroid/model/WanRequest.kt index 85914b67..1a6b421c 100644 --- a/app/src/main/java/com/wpf/app/quick/demo/wanandroid/model/WanRequest.kt +++ b/app/src/main/java/com/wpf/app/quick/demo/wanandroid/model/WanRequest.kt @@ -1,7 +1,7 @@ package com.wpf.app.quick.demo.wanandroid.model import com.wpf.app.quick.annotations.getclass.GetClass -import com.wpf.app.quickrecyclerview.data.RequestData +import com.wpf.app.quickwork.request2list.RequestData /** * Created by 王朋飞 on 2022/7/8. diff --git a/build.gradle b/build.gradle index c1281e34..3d5d31c9 100755 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ buildscript { 'dialog' : "com.wpf.app.quick:QuickDialog:${release}", 'work' : "com.wpf.app.quick:QuickWork:${release}", 'compiler_ksp' : "com.wpf.app.quick:Quick-gradle-ksp-plugin:${release}", - 'compiler_ksp_jitpack': "com.github.walgr.Quick:Quick-gradle-ksp-plugin:0.10.8", + 'compiler_ksp_local' : "com.wpf.app.quick:Quick-gradle-ksp-plugin:0.10.9", 'transform' : "com.wpf.app.plugin:quick-transform.gradle.plugin:1.0.0", 'transform_jitpack' : "com.github.walgr.Quick:quick.transform:1.0.0", ], diff --git a/gradle.properties b/gradle.properties index 891086ec..f89d4f03 100755 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 -IS_REMOTE=true +IS_REMOTE=false GROUP=com.wpf.app.quick VERSION_NAME=0.10.9