feat: 调整Field表格控件结构

module/joinus/src/main/java/com/adealink/weparty/widget/form/BaseWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/BaseWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form
+package com.adealink.weparty.module.widget.form
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,9 +7,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.LifecycleOwner
 import com.adealink.frame.base.Rlt
 import com.adealink.weparty.commonui.ext.getActivity
-import com.adealink.weparty.widget.form.data.FieldException
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.dialog.ExampleDialog
+import com.adealink.weparty.module.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.dialog.ExampleDialog
 
 abstract class BaseWidgetView<DATA : IWidgetData> @JvmOverloads constructor(
     context: Context,

module/joinus/src/main/java/com/adealink/weparty/widget/form/IStepWidgetData.kt → app/src/main/java/com/adealink/weparty/module/widget/form/IStepWidgetData.kt

@@ -1,6 +1,6 @@
-package com.adealink.weparty.widget.form
+package com.adealink.weparty.module.widget.form
 
-import com.adealink.weparty.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepField
 
 
 enum class WidgetType(val type: Int) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/adapter/MutableTypes.kt → app/src/main/java/com/adealink/weparty/module/widget/form/adapter/MutableTypes.kt

@@ -1,6 +1,6 @@
-package com.adealink.weparty.widget.form.adapter
+package com.adealink.weparty.module.widget.form.adapter
 
-import com.adealink.weparty.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.IWidgetData
 
 
 open class MutableTypes constructor(

module/joinus/src/main/java/com/adealink/weparty/widget/form/adapter/StepWidgetAdapter.kt → app/src/main/java/com/adealink/weparty/module/widget/form/adapter/StepWidgetAdapter.kt

@@ -1,27 +1,27 @@
-package com.adealink.weparty.widget.form.adapter
+package com.adealink.weparty.module.widget.form.adapter
 
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
 import com.adealink.frame.log.Log
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.FieldException
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.field.multiplechoice.MultipleChoiceDelegate
-import com.adealink.weparty.widget.form.field.multiplechoice.MultipleChoiceWidgetData
-import com.adealink.weparty.widget.form.field.multipletext.MultipleTextDelegate
-import com.adealink.weparty.widget.form.field.multipletext.MultipleTextWidgetData
-import com.adealink.weparty.widget.form.field.number.NumberDelegate
-import com.adealink.weparty.widget.form.field.number.NumberWidgetData
-import com.adealink.weparty.widget.form.field.picture.PictureDelegate
-import com.adealink.weparty.widget.form.field.picture.PictureWidgetData
-import com.adealink.weparty.widget.form.field.singlechoice.SingleChoiceDelegate
-import com.adealink.weparty.widget.form.field.singlechoice.SingleChoiceWidgetData
-import com.adealink.weparty.widget.form.field.singletext.SingleTextDelegate
-import com.adealink.weparty.widget.form.field.singletext.SingleTextWidgetData
-import com.adealink.weparty.widget.form.field.voice.VoiceDelegate
-import com.adealink.weparty.widget.form.field.voice.VoiceWidgetData
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.field.multiplechoice.MultipleChoiceDelegate
+import com.adealink.weparty.module.widget.form.field.multiplechoice.MultipleChoiceWidgetData
+import com.adealink.weparty.module.widget.form.field.multipletext.MultipleTextDelegate
+import com.adealink.weparty.module.widget.form.field.multipletext.MultipleTextWidgetData
+import com.adealink.weparty.module.widget.form.field.number.NumberDelegate
+import com.adealink.weparty.module.widget.form.field.number.NumberWidgetData
+import com.adealink.weparty.module.widget.form.field.picture.PictureDelegate
+import com.adealink.weparty.module.widget.form.field.picture.PictureWidgetData
+import com.adealink.weparty.module.widget.form.field.singlechoice.SingleChoiceDelegate
+import com.adealink.weparty.module.widget.form.field.singlechoice.SingleChoiceWidgetData
+import com.adealink.weparty.module.widget.form.field.singletext.SingleTextDelegate
+import com.adealink.weparty.module.widget.form.field.singletext.SingleTextWidgetData
+import com.adealink.weparty.module.widget.form.field.voice.VoiceDelegate
+import com.adealink.weparty.module.widget.form.field.voice.VoiceWidgetData
 
 class StepWidgetAdapter {
 

app/src/main/java/com/adealink/weparty/module/widget/form/adapter/Type.kt

@@ -0,0 +1,8 @@
+package com.adealink.weparty.module.widget.form.adapter
+
+import com.adealink.weparty.module.widget.form.IWidgetData
+
+data class Type<T : IWidgetData>(
+    val clazz: Class<out T>,
+    val delegate: WidgetDelegate<T, *>
+)

module/joinus/src/main/java/com/adealink/weparty/widget/form/adapter/Types.kt → app/src/main/java/com/adealink/weparty/module/widget/form/adapter/Types.kt

@@ -1,6 +1,6 @@
-package com.adealink.weparty.widget.form.adapter
+package com.adealink.weparty.module.widget.form.adapter
 
-import com.adealink.weparty.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.IWidgetData
 
 
 /**

module/joinus/src/main/java/com/adealink/weparty/widget/form/adapter/WidgetDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/adapter/WidgetDelegate.kt

@@ -1,11 +1,11 @@
-package com.adealink.weparty.widget.form.adapter
+package com.adealink.weparty.module.widget.form.adapter
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.data.FieldException
 
 abstract class WidgetDelegate<DATA : IWidgetData, WIDGET : BaseWidgetView<DATA>> {
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/data/Constants.kt → app/src/main/java/com/adealink/weparty/module/widget/form/data/Constants.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.data
+package com.adealink.weparty.module.widget.form.data
 
 const val TAG_WIDGET = "tag_widget"
 const val TAG_WIDGET_VOICE = "${TAG_WIDGET}_voice"

module/joinus/src/main/java/com/adealink/weparty/widget/form/data/FieldData.kt → app/src/main/java/com/adealink/weparty/module/widget/form/data/FieldData.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.data
+package com.adealink.weparty.module.widget.form.data
 
 import android.os.Parcelable
 import com.adealink.frame.base.Rlt
@@ -31,7 +31,9 @@ sealed class StepField<T>(
     @GsonNullable
     @SerializedName("validate") val validate: StepFieldValidate? = null, //校验器
     @GsonNullable
-    @SerializedName("example") val example: StepFieldExample? = null //示例
+    @SerializedName("example") val example: StepFieldExample? = null, //示例
+    @GsonNullable
+    @SerializedName("icon") val icon: String? = null, //图标
 ) : Parcelable {
 
     open fun validate(inputValue: T?): Rlt<Any> {

module/joinus/src/main/java/com/adealink/weparty/widget/form/data/FieldValidateError.kt → app/src/main/java/com/adealink/weparty/module/widget/form/data/FieldValidateError.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.data
+package com.adealink.weparty.module.widget.form.data
 
 import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.base.IError

module/joinus/src/main/java/com/adealink/weparty/widget/form/dialog/ChoiceItemViewBinder.kt → app/src/main/java/com/adealink/weparty/module/widget/form/dialog/ChoiceItemViewBinder.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.dialog
+package com.adealink.weparty.module.widget.form.dialog
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -8,7 +8,7 @@ import com.adealink.weparty.commonui.DEFAULT_FONT_BOLD
 import com.adealink.weparty.commonui.DEFAULT_FONT_REGULAR
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
-import com.adealink.weparty.joinus.databinding.WidgetDialogChooseItemBinding
+import com.adealink.weparty.databinding.WidgetDialogChooseItemBinding
 import com.adealink.weparty.R as APP_R
 
 class ChoiceItemViewBinder(

module/joinus/src/main/java/com/adealink/weparty/widget/form/dialog/ExampleDialog.kt → app/src/main/java/com/adealink/weparty/module/widget/form/dialog/ExampleDialog.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.dialog
+package com.adealink.weparty.module.widget.form.dialog
 
 import android.view.View
 import android.view.ViewGroup
@@ -10,13 +10,13 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.DisplayUtil
 import com.adealink.frame.util.onClick
 import com.adealink.frame.util.runOnUiThread
+import com.adealink.weparty.R
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.widget.BottomDialogFragment
-import com.adealink.weparty.joinus.R
-import com.adealink.weparty.joinus.databinding.WidgetDialogExampleBinding
+import com.adealink.weparty.databinding.WidgetDialogExampleBinding
 import com.adealink.weparty.util.goImagePreviewActivity
-import com.adealink.weparty.widget.form.data.ExampleType
-import com.adealink.weparty.widget.form.data.StepFieldExample
+import com.adealink.weparty.module.widget.form.data.ExampleType
+import com.adealink.weparty.module.widget.form.data.StepFieldExample
 import com.facebook.imagepipeline.image.ImageInfo
 
 class ExampleDialog : BottomDialogFragment(R.layout.widget_dialog_example) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/dialog/MultipleChoiceDialog.kt → app/src/main/java/com/adealink/weparty/module/widget/form/dialog/MultipleChoiceDialog.kt

@@ -1,9 +1,10 @@
-package com.adealink.weparty.widget.form.dialog
+package com.adealink.weparty.module.widget.form.dialog
 
 import androidx.recyclerview.widget.GridLayoutManager
 import com.adealink.frame.base.fastLazy
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.R
 import com.adealink.weparty.commonui.ext.clearItemDecoration
 import com.adealink.weparty.commonui.ext.dp
 import com.adealink.weparty.commonui.ext.gone
@@ -11,9 +12,8 @@ import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.itemdecoration.GridSpacingItemDecoration
 import com.adealink.weparty.commonui.widget.BottomDialogFragment
-import com.adealink.weparty.joinus.R
-import com.adealink.weparty.joinus.databinding.WidgetDialogChooseBinding
-import com.adealink.weparty.widget.form.data.StepFieldConstant
+import com.adealink.weparty.databinding.WidgetDialogChooseBinding
+import com.adealink.weparty.module.widget.form.data.StepFieldConstant
 
 abstract class ChooseItem(
     var selected: Boolean = false

module/joinus/src/main/java/com/adealink/weparty/widget/form/dialog/PriceInputDialog.kt → app/src/main/java/com/adealink/weparty/module/widget/form/dialog/PriceInputDialog.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.dialog
+package com.adealink.weparty.module.widget.form.dialog
 
 import android.annotation.SuppressLint
 import android.text.Editable
@@ -6,15 +6,14 @@ import android.text.TextWatcher
 import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.R
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.text.filter.setDecimalInputFilter
 import com.adealink.weparty.commonui.toast.util.showToast
 import com.adealink.weparty.commonui.widget.BottomDialogFragment
-import com.adealink.weparty.joinus.R
-import com.adealink.weparty.joinus.databinding.WidgetDialogInputPriceBinding
+import com.adealink.weparty.databinding.WidgetDialogInputPriceBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.R as APP_R
 
 class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price) {
 
@@ -53,8 +52,8 @@ class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price
     override fun initViews() {
         super.initViews()
         binding.tvTitle.text = title?.ifEmpty {
-            getCompatString(APP_R.string.common_input_price_title)
-        } ?: getCompatString(APP_R.string.common_input_price_title)
+            getCompatString(R.string.common_input_price_title)
+        } ?: getCompatString(R.string.common_input_price_title)
 
         if (desc.isNullOrEmpty()) {
             binding.tvDesc.gone()
@@ -68,7 +67,7 @@ class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price
             onInputTooMax = {
                 showToast(
                     getCompatString(
-                        APP_R.string.common_input_number_max_limit,
+                        R.string.common_input_number_max_limit,
                         (maxPrice ?: Double.MAX_VALUE).toString()
                     )
                 )
@@ -97,7 +96,7 @@ class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price
                 if (input.isNullOrEmpty()) {
                     binding.btnConfirm.isEnabled = false
                     binding.etPriceInput.hint =
-                        getCompatString(APP_R.string.common_input_price_hint)
+                        getCompatString(R.string.common_input_price_hint)
                 } else {
                     binding.btnConfirm.isEnabled = true
                     binding.etPriceInput.hint = null
@@ -119,7 +118,7 @@ class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price
     private fun confirm() {
         val price = binding.etPriceInput.text?.toString()?.toDoubleOrNull()
         if (price == null || price < 0) {
-            showToast(APP_R.string.common_input_price_invalid)
+            showToast(R.string.common_input_price_invalid)
             return
         }
         val min = minPrice
@@ -127,7 +126,7 @@ class PriceInputDialog : BottomDialogFragment(R.layout.widget_dialog_input_price
         if ((min != null && price < min) || (max != null && price > max)) {
             showToast(
                 getCompatString(
-                    APP_R.string.common_input_price_range_error,
+                    R.string.common_input_price_range_error,
                     formatNumberStr(min ?: 0.0, false),
                     formatNumberStr(max ?: 0.0, false)
                 )

module/joinus/src/main/java/com/adealink/weparty/widget/form/dialog/SingleChoiceDialog.kt → app/src/main/java/com/adealink/weparty/module/widget/form/dialog/SingleChoiceDialog.kt

@@ -1,13 +1,13 @@
-package com.adealink.weparty.widget.form.dialog
+package com.adealink.weparty.module.widget.form.dialog
 
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.R
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.widget.BottomDialogFragment
-import com.adealink.weparty.joinus.R
-import com.adealink.weparty.joinus.databinding.WidgetDialogSingleChooseBinding
-import com.adealink.weparty.widget.form.data.StepFieldConstant
+import com.adealink.weparty.databinding.WidgetDialogSingleChooseBinding
+import com.adealink.weparty.module.widget.form.data.StepFieldConstant
 
 data class SingleChooseItem(
     val option: StepFieldConstant

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multiplechoice/MultipleChoiceDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/multiplechoice/MultipleChoiceDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.multiplechoice
+package com.adealink.weparty.module.widget.form.field.multiplechoice
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class MultipleChoiceDelegate :
     WidgetDelegate<MultipleChoiceWidgetData, MultipleChooseWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multiplechoice/MultipleChoiceWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/multiplechoice/MultipleChoiceWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.multiplechoice
+package com.adealink.weparty.module.widget.form.field.multiplechoice
 
 import android.content.Context
 import android.util.AttributeSet
@@ -11,29 +11,29 @@ import com.adealink.weparty.commonui.commonSelectedDrawable
 import com.adealink.weparty.commonui.ext.getActivity
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
-import com.adealink.weparty.joinus.databinding.WidgetMultipleChooseBinding
+import com.adealink.weparty.databinding.WidgetMultipleChooseBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.DoubleArrayStepField
-import com.adealink.weparty.widget.form.data.DoubleArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.DoubleStepField
-import com.adealink.weparty.widget.form.data.DoubleStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerArrayStepField
-import com.adealink.weparty.widget.form.data.IntegerArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerStepField
-import com.adealink.weparty.widget.form.data.IntegerStepFieldValue
-import com.adealink.weparty.widget.form.data.RequireValueNullError
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
-import com.adealink.weparty.widget.form.dialog.MultipleChoiceDialog
-import com.adealink.weparty.widget.form.dialog.MultipleChooseItem
-import com.adealink.weparty.widget.form.dialog.sameWith
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepField
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.DoubleStepField
+import com.adealink.weparty.module.widget.form.data.DoubleStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepField
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerStepField
+import com.adealink.weparty.module.widget.form.data.IntegerStepFieldValue
+import com.adealink.weparty.module.widget.form.data.RequireValueNullError
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.dialog.MultipleChoiceDialog
+import com.adealink.weparty.module.widget.form.dialog.MultipleChooseItem
+import com.adealink.weparty.module.widget.form.dialog.sameWith
 import com.adealink.weparty.R as APP_R
 
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multipletext/MultipleTextDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/multipletext/MultipleTextDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.multipletext
+package com.adealink.weparty.module.widget.form.field.multipletext
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class MultipleTextDelegate :
     WidgetDelegate<MultipleTextWidgetData, MultipleTextWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multipletext/MultipleTextWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/multipletext/MultipleTextWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.multipletext
+package com.adealink.weparty.module.widget.form.field.multipletext
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -16,33 +16,33 @@ import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.isSuccess
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.text.setMaxLength
-import com.adealink.weparty.joinus.databinding.WidgetMultipleTextBinding
+import com.adealink.weparty.databinding.WidgetMultipleTextBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.ArrayLessThanMinError
-import com.adealink.weparty.widget.form.data.ArrayMoreThanMaxError
-import com.adealink.weparty.widget.form.data.DoubleArrayStepField
-import com.adealink.weparty.widget.form.data.DoubleArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.DoubleStepField
-import com.adealink.weparty.widget.form.data.DoubleStepFieldValue
-import com.adealink.weparty.widget.form.data.FieldValidateError
-import com.adealink.weparty.widget.form.data.IntegerArrayStepField
-import com.adealink.weparty.widget.form.data.IntegerArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerStepField
-import com.adealink.weparty.widget.form.data.IntegerStepFieldValue
-import com.adealink.weparty.widget.form.data.NumberLessThanMinError
-import com.adealink.weparty.widget.form.data.NumberMoreThanMaxError
-import com.adealink.weparty.widget.form.data.RequireValueNullError
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.StringLessThanMinError
-import com.adealink.weparty.widget.form.data.StringMoreThanMaxError
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.ArrayLessThanMinError
+import com.adealink.weparty.module.widget.form.data.ArrayMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepField
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.DoubleStepField
+import com.adealink.weparty.module.widget.form.data.DoubleStepFieldValue
+import com.adealink.weparty.module.widget.form.data.FieldValidateError
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepField
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerStepField
+import com.adealink.weparty.module.widget.form.data.IntegerStepFieldValue
+import com.adealink.weparty.module.widget.form.data.NumberLessThanMinError
+import com.adealink.weparty.module.widget.form.data.NumberMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.RequireValueNullError
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringLessThanMinError
+import com.adealink.weparty.module.widget.form.data.StringMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
 import com.adealink.weparty.R as APP_R
 
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/number/NumberDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/number/NumberDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.number
+package com.adealink.weparty.module.widget.form.field.number
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class NumberDelegate :
     WidgetDelegate<NumberWidgetData, NumberWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/number/NumberWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/number/NumberWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.number
+package com.adealink.weparty.module.widget.form.field.number
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -14,34 +14,34 @@ import com.adealink.weparty.commonui.ext.getActivity
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.isSuccess
 import com.adealink.weparty.commonui.ext.show
-import com.adealink.weparty.joinus.databinding.WidgetNumberBinding
+import com.adealink.weparty.databinding.WidgetNumberBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.ArrayLessThanMinError
-import com.adealink.weparty.widget.form.data.ArrayMoreThanMaxError
-import com.adealink.weparty.widget.form.data.DoubleArrayStepField
-import com.adealink.weparty.widget.form.data.DoubleArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.DoubleStepField
-import com.adealink.weparty.widget.form.data.DoubleStepFieldValue
-import com.adealink.weparty.widget.form.data.FieldValidateError
-import com.adealink.weparty.widget.form.data.IntegerArrayStepField
-import com.adealink.weparty.widget.form.data.IntegerArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerStepField
-import com.adealink.weparty.widget.form.data.IntegerStepFieldValue
-import com.adealink.weparty.widget.form.data.NumberLessThanMinError
-import com.adealink.weparty.widget.form.data.NumberMoreThanMaxError
-import com.adealink.weparty.widget.form.data.RequireValueNullError
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.StringLessThanMinError
-import com.adealink.weparty.widget.form.data.StringMoreThanMaxError
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
-import com.adealink.weparty.widget.form.dialog.PriceInputDialog
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.ArrayLessThanMinError
+import com.adealink.weparty.module.widget.form.data.ArrayMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepField
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.DoubleStepField
+import com.adealink.weparty.module.widget.form.data.DoubleStepFieldValue
+import com.adealink.weparty.module.widget.form.data.FieldValidateError
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepField
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerStepField
+import com.adealink.weparty.module.widget.form.data.IntegerStepFieldValue
+import com.adealink.weparty.module.widget.form.data.NumberLessThanMinError
+import com.adealink.weparty.module.widget.form.data.NumberMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.RequireValueNullError
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringLessThanMinError
+import com.adealink.weparty.module.widget.form.data.StringMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.dialog.PriceInputDialog
 import com.adealink.weparty.R as APP_R
 
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/PictureData.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/picture/PictureData.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.picture
+package com.adealink.weparty.module.widget.form.field.picture
 
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.image.data.PhotoData

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/PictureDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/picture/PictureDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.picture
+package com.adealink.weparty.module.widget.form.field.picture
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class PictureDelegate :
     WidgetDelegate<PictureWidgetData, PictureWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/PictureWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/picture/PictureWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.picture
+package com.adealink.weparty.module.widget.form.field.picture
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -22,26 +22,26 @@ import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.itemdecoration.HorizontalItemDecoration
+import com.adealink.weparty.databinding.WidgetSinglePictureBinding
 import com.adealink.weparty.image.PHOTO_WALL_IMAGE_MAX_HEIGHT
 import com.adealink.weparty.image.PHOTO_WALL_IMAGE_MAX_SIZE_KB
 import com.adealink.weparty.image.PHOTO_WALL_IMAGE_MAX_WIDTH
 import com.adealink.weparty.image.PHOTO_WALL_IMAGE_MIN_QUALITY
 import com.adealink.weparty.imageselect.comp.TakeFromAlbumComp
-import com.adealink.weparty.joinus.databinding.WidgetSinglePictureBinding
 import com.adealink.weparty.module.image.data.PhotoData
 import com.adealink.weparty.module.image.data.sameWith
 import com.adealink.weparty.util.goImagePreviewActivity
 import com.adealink.weparty.util.uploadPhotos
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.UnSupportFieldDataException
-import com.adealink.weparty.widget.form.field.picture.adapter.AddPictureItemViewBinder
-import com.adealink.weparty.widget.form.field.picture.adapter.PictureItemViewBinder
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.UnSupportFieldDataException
+import com.adealink.weparty.module.widget.form.field.picture.adapter.AddPictureItemViewBinder
+import com.adealink.weparty.module.widget.form.field.picture.adapter.PictureItemViewBinder
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import com.adealink.weparty.R as APP_R

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/adapter/AddPictureItemViewBinder.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/picture/adapter/AddPictureItemViewBinder.kt

@@ -1,12 +1,12 @@
-package com.adealink.weparty.widget.form.field.picture.adapter
+package com.adealink.weparty.module.widget.form.field.picture.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.adealink.frame.util.onClick
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
-import com.adealink.weparty.joinus.databinding.WidgetPictureAddPictureItemBinding
-import com.adealink.weparty.widget.form.field.picture.AddPictureItemData
+import com.adealink.weparty.databinding.WidgetPictureAddPictureItemBinding
+import com.adealink.weparty.module.widget.form.field.picture.AddPictureItemData
 
 
 class AddPictureItemViewBinder(

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/adapter/PictureItemViewBinder.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/picture/adapter/PictureItemViewBinder.kt

@@ -1,12 +1,12 @@
-package com.adealink.weparty.widget.form.field.picture.adapter
+package com.adealink.weparty.module.widget.form.field.picture.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.adealink.frame.util.onClick
 import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
-import com.adealink.weparty.joinus.databinding.WidgetPicturePictureItemBinding
-import com.adealink.weparty.widget.form.field.picture.PictureItemData
+import com.adealink.weparty.databinding.WidgetPicturePictureItemBinding
+import com.adealink.weparty.module.widget.form.field.picture.PictureItemData
 
 
 class PictureItemViewBinder(

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singlechoice/SingleChoiceDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/singlechoice/SingleChoiceDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.singlechoice
+package com.adealink.weparty.module.widget.form.field.singlechoice
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class SingleChoiceDelegate :
     WidgetDelegate<SingleChoiceWidgetData, SingleChoiceWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singlechoice/SingleChoiceWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/singlechoice/SingleChoiceWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.singlechoice
+package com.adealink.weparty.module.widget.form.field.singlechoice
 
 import android.content.Context
 import android.util.AttributeSet
@@ -11,29 +11,29 @@ import com.adealink.weparty.commonui.commonSelectedDrawable
 import com.adealink.weparty.commonui.ext.getActivity
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
-import com.adealink.weparty.joinus.databinding.WidgetSingleChooseBinding
+import com.adealink.weparty.databinding.WidgetSingleChooseBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.DoubleArrayStepField
-import com.adealink.weparty.widget.form.data.DoubleArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.DoubleStepField
-import com.adealink.weparty.widget.form.data.DoubleStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerArrayStepField
-import com.adealink.weparty.widget.form.data.IntegerArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerStepField
-import com.adealink.weparty.widget.form.data.IntegerStepFieldValue
-import com.adealink.weparty.widget.form.data.RequireValueNullError
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
-import com.adealink.weparty.widget.form.dialog.SingleChoiceDialog
-import com.adealink.weparty.widget.form.dialog.SingleChooseItem
-import com.adealink.weparty.widget.form.dialog.sameWith
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepField
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.DoubleStepField
+import com.adealink.weparty.module.widget.form.data.DoubleStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepField
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerStepField
+import com.adealink.weparty.module.widget.form.data.IntegerStepFieldValue
+import com.adealink.weparty.module.widget.form.data.RequireValueNullError
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.dialog.SingleChoiceDialog
+import com.adealink.weparty.module.widget.form.dialog.SingleChooseItem
+import com.adealink.weparty.module.widget.form.dialog.sameWith
 import com.adealink.weparty.R as APP_R
 
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singletext/SingleTextDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/singletext/SingleTextDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.singletext
+package com.adealink.weparty.module.widget.form.field.singletext
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class SingleTextDelegate :
     WidgetDelegate<SingleTextWidgetData, SingleTextWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singletext/SingleTextWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/singletext/SingleTextWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.singletext
+package com.adealink.weparty.module.widget.form.field.singletext
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -16,33 +16,33 @@ import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.isSuccess
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.text.setMaxLength
-import com.adealink.weparty.joinus.databinding.WidgetSingleTextBinding
+import com.adealink.weparty.databinding.WidgetSingleTextBinding
 import com.adealink.weparty.util.formatNumberStr
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.ArrayLessThanMinError
-import com.adealink.weparty.widget.form.data.ArrayMoreThanMaxError
-import com.adealink.weparty.widget.form.data.DoubleArrayStepField
-import com.adealink.weparty.widget.form.data.DoubleArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.DoubleStepField
-import com.adealink.weparty.widget.form.data.DoubleStepFieldValue
-import com.adealink.weparty.widget.form.data.FieldValidateError
-import com.adealink.weparty.widget.form.data.IntegerArrayStepField
-import com.adealink.weparty.widget.form.data.IntegerArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.IntegerStepField
-import com.adealink.weparty.widget.form.data.IntegerStepFieldValue
-import com.adealink.weparty.widget.form.data.NumberLessThanMinError
-import com.adealink.weparty.widget.form.data.NumberMoreThanMaxError
-import com.adealink.weparty.widget.form.data.RequireValueNullError
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringArrayStepField
-import com.adealink.weparty.widget.form.data.StringArrayStepFieldValue
-import com.adealink.weparty.widget.form.data.StringLessThanMinError
-import com.adealink.weparty.widget.form.data.StringMoreThanMaxError
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.ArrayLessThanMinError
+import com.adealink.weparty.module.widget.form.data.ArrayMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepField
+import com.adealink.weparty.module.widget.form.data.DoubleArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.DoubleStepField
+import com.adealink.weparty.module.widget.form.data.DoubleStepFieldValue
+import com.adealink.weparty.module.widget.form.data.FieldValidateError
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepField
+import com.adealink.weparty.module.widget.form.data.IntegerArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.IntegerStepField
+import com.adealink.weparty.module.widget.form.data.IntegerStepFieldValue
+import com.adealink.weparty.module.widget.form.data.NumberLessThanMinError
+import com.adealink.weparty.module.widget.form.data.NumberMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.RequireValueNullError
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringArrayStepField
+import com.adealink.weparty.module.widget.form.data.StringArrayStepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringLessThanMinError
+import com.adealink.weparty.module.widget.form.data.StringMoreThanMaxError
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
 import com.adealink.weparty.R as APP_R
 
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/voice/VoiceDelegate.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/voice/VoiceDelegate.kt

@@ -1,9 +1,9 @@
-package com.adealink.weparty.widget.form.field.voice
+package com.adealink.weparty.module.widget.form.field.voice
 
 import android.content.Context
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
-import com.adealink.weparty.widget.form.adapter.WidgetDelegate
+import com.adealink.weparty.module.widget.form.adapter.WidgetDelegate
 
 class VoiceDelegate :
     WidgetDelegate<VoiceWidgetData, VoiceWidgetView>() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/voice/VoiceWidgetView.kt → app/src/main/java/com/adealink/weparty/module/widget/form/field/voice/VoiceWidgetView.kt

@@ -1,4 +1,4 @@
-package com.adealink.weparty.widget.form.field.voice
+package com.adealink.weparty.module.widget.form.field.voice
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -20,22 +20,22 @@ import com.adealink.weparty.commonui.ext.getActivity
 import com.adealink.weparty.commonui.ext.gone
 import com.adealink.weparty.commonui.ext.show
 import com.adealink.weparty.commonui.toast.util.showToast
-import com.adealink.weparty.joinus.databinding.WidgetVoiceBinding
+import com.adealink.weparty.databinding.WidgetVoiceBinding
 import com.adealink.weparty.module.profile.data.VoiceData
 import com.adealink.weparty.module.profile.data.sameWith
 import com.adealink.weparty.permission.PermissionUtils
 import com.adealink.weparty.storage.file.FilePath
 import com.adealink.weparty.util.formatMissTime
 import com.adealink.weparty.util.uploadVoice
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.IWidgetData
-import com.adealink.weparty.widget.form.WidgetType
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
-import com.adealink.weparty.widget.form.data.StringStepField
-import com.adealink.weparty.widget.form.data.StringStepFieldValue
-import com.adealink.weparty.widget.form.data.TAG_WIDGET_VOICE
-import com.adealink.weparty.widget.form.data.UnSupportFieldDataException
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.IWidgetData
+import com.adealink.weparty.module.widget.form.WidgetType
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StringStepField
+import com.adealink.weparty.module.widget.form.data.StringStepFieldValue
+import com.adealink.weparty.module.widget.form.data.TAG_WIDGET_VOICE
+import com.adealink.weparty.module.widget.form.data.UnSupportFieldDataException
 import com.tencent.qcloud.tuicore.TUIConstants.TUICalling
 import com.tencent.qcloud.tuikit.tuichat.component.audio.AudioPlayer
 import com.tencent.qcloud.tuikit.tuichat.component.audio.AudioRecorder

module/joinus/src/main/java/com/adealink/weparty/applyskill/step/ApplySKillFormFragment.kt

@@ -20,10 +20,10 @@ import com.adealink.weparty.joinus.databinding.FragmentApplySkillFormBinding
 import com.adealink.weparty.joinus.step3.viewmodel.Step3ViewModel
 import com.adealink.weparty.joinus.viewmodel.JoinUsViewModel
 import com.adealink.weparty.joinus.viewmodel.JoinUsViewModelFactory
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.adapter.StepWidgetAdapter
-import com.adealink.weparty.widget.form.data.FieldException
-import com.adealink.weparty.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.adapter.StepWidgetAdapter
+import com.adealink.weparty.module.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.data.StepField
 
 class ApplySKillFormFragment : BaseFragment(R.layout.fragment_apply_skill_form) {
 

module/joinus/src/main/java/com/adealink/weparty/joinus/data/JoinUsData.kt

@@ -2,7 +2,7 @@ package com.adealink.weparty.joinus.data
 
 import android.os.Parcelable
 import com.adealink.weparty.util.parseDate
-import com.adealink.weparty.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepField
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize

module/joinus/src/main/java/com/adealink/weparty/joinus/step3/data/Step3Data.kt

@@ -1,6 +1,6 @@
 package com.adealink.weparty.joinus.step3.data
 
-import com.adealink.weparty.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
 import com.google.gson.annotations.SerializedName
 
 enum class Step3Page(val page: String) {

module/joinus/src/main/java/com/adealink/weparty/joinus/step3/page/SKillFormFragment.kt

@@ -22,10 +22,10 @@ import com.adealink.weparty.joinus.step3.viewmodel.Step3ViewModel
 import com.adealink.weparty.joinus.viewmodel.JoinUsViewModel
 import com.adealink.weparty.joinus.viewmodel.JoinUsViewModelFactory
 import com.adealink.weparty.viewmodel.parentFragmentViewModels
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.adapter.StepWidgetAdapter
-import com.adealink.weparty.widget.form.data.FieldException
-import com.adealink.weparty.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.adapter.StepWidgetAdapter
+import com.adealink.weparty.module.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.data.StepField
 
 class SKillFormFragment : BaseFragment(R.layout.fragment_join_us_step_3_skill_form) {
 

module/joinus/src/main/java/com/adealink/weparty/joinus/step3/viewmodel/Step3ViewModel.kt

@@ -14,8 +14,8 @@ import com.adealink.weparty.joinus.step3.data.CategoryFormReq
 import com.adealink.weparty.joinus.step3.data.Step3Page
 import com.adealink.weparty.joinus.step3.data.SubmitFormReq
 import com.adealink.weparty.module.playmate.data.PlaymateCategoryData
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
 import kotlinx.coroutines.launch
 
 class Step3ViewModel : BaseViewModel() {

module/joinus/src/main/java/com/adealink/weparty/playmatesetting/data/PlaymateSettingData.kt

@@ -1,7 +1,7 @@
 package com.adealink.weparty.playmatesetting.data
 
-import com.adealink.weparty.widget.form.data.StepField
-import com.adealink.weparty.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
 import com.google.gson.annotations.SerializedName
 
 data class PlaymateSettingFormReq(

module/joinus/src/main/java/com/adealink/weparty/playmatesetting/page/PlaymateSettingFormFragment.kt

@@ -17,10 +17,10 @@ import com.adealink.weparty.joinus.R
 import com.adealink.weparty.joinus.databinding.FragmentPlaymateSettingFormBinding
 import com.adealink.weparty.joinus.viewmodel.JoinUsViewModelFactory
 import com.adealink.weparty.playmatesetting.viewmodel.PlaymateSettingViewModel
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.adapter.StepWidgetAdapter
-import com.adealink.weparty.widget.form.data.FieldException
-import com.adealink.weparty.widget.form.data.StepField
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.adapter.StepWidgetAdapter
+import com.adealink.weparty.module.widget.form.data.FieldException
+import com.adealink.weparty.module.widget.form.data.StepField
 
 class PlaymateSettingFormFragment : BaseFragment(R.layout.fragment_playmate_setting_form) {
 

module/joinus/src/main/java/com/adealink/weparty/playmatesetting/viewmodel/PlaymateSettingViewModel.kt

@@ -14,8 +14,8 @@ import com.adealink.weparty.playmatesetting.data.PlaymateSettingFormData
 import com.adealink.weparty.playmatesetting.data.PlaymateSettingFormReq
 import com.adealink.weparty.playmatesetting.data.PlaymateSettingFormSubmitReq
 import com.adealink.weparty.playmatesetting.datasource.remote.PlaymateSettingHttpService
-import com.adealink.weparty.widget.form.BaseWidgetView
-import com.adealink.weparty.widget.form.data.StepFieldValue
+import com.adealink.weparty.module.widget.form.BaseWidgetView
+import com.adealink.weparty.module.widget.form.data.StepFieldValue
 import kotlinx.coroutines.launch
 
 class PlaymateSettingViewModel : BaseViewModel() {

module/joinus/src/main/java/com/adealink/weparty/widget/form/adapter/Type.kt

@@ -1,8 +0,0 @@
-package com.adealink.weparty.widget.form.adapter
-
-import com.adealink.weparty.widget.form.IWidgetData
-
-data class Type<T : IWidgetData>(
-    val clazz: Class<out T>,
-    val delegate: WidgetDelegate<T, *>
-)