日常提交:2022-08-08.

walgr · Aug 8, 2022 · 03c1528 · 03c1528
1 parent d2c2b8b
commit 03c1528
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/QuickBind/src/main/java/com/wpf/app/quickbind/QuickBind.kt b/QuickBind/src/main/java/com/wpf/app/quickbind/QuickBind.kt
@@ -148,15 +148,7 @@ object QuickBind {
     ) {
         if (obj == null) return
         try {
-            val fields: List<Field> = ReflectHelper.getFieldWithParent(obj)
-            for (field in fields) {
-                val annotations = field.annotations.toMutableList()
-                annotations.sortBy { plugins.keys.indexOf(it.annotationClass) }
-                annotations.forEach {
-                    plugins[it.annotationClass]?.dealField(obj, null, field)
-                }
-                annotations.clear()
-            }
+
             if (viewModel != null) {
                 val viewModelFields: List<Field> = ReflectHelper.getFieldWithParent(viewModel)
                 for (field in viewModelFields) {
@@ -167,6 +159,16 @@ object QuickBind {
                     }
                     annotations.clear()
                 }
+            } else {
+                val fields: List<Field> = ReflectHelper.getFieldWithParent(obj)
+                for (field in fields) {
+                    val annotations = field.annotations.toMutableList()
+                    annotations.sortBy { plugins.keys.indexOf(it.annotationClass) }
+                    annotations.forEach {
+                        plugins[it.annotationClass]?.dealField(obj, null, field)
+                    }
+                    annotations.clear()
+                }
             }
         } catch (e: Exception) {
             e.printStackTrace()