GitHub main (#499)

* Slider支持滚动到指定位置

* Slider支持滚动到指定位置

* test slider

* revert instance

* update bootstrap

* fix target index calculate error

* fix crash

* fix slider

* YKIndicator

* fix scroll event

* fix selected

* fix selected

* 移除holding-offset等属性

* fix slider item width

* 修复Slider数据不更新的问题，POSITION_NONOE数据总是需要更新

* fix event

* keep

* 修复Grid数据为0时高度计算错误的问题

* fix grdis

* fix fastpreview

* open createTemplateContext

* fix pageSize 0

* 缓存计算结果

* fix blur android.renderscript.RSIllegalArgumentException: Invalid object.

* fix crash

* 自定义View兜底

---------

Co-authored-by: 慕晗 <muhan.zq@antfin.com>

Author: biezhihua

GaiaXAndroid/.idea/codeStyles/Project.xml

@@ -749,7 +749,7 @@ class GXComponentGridTest : GXBaseTest() {
         rootView.executeRecyclerView()
 
         Assert.assertEquals(1080F.dpToPx(), rootView.width())
-        Assert.assertEquals(100F.dpToPx(), rootView.height())
+        Assert.assertEquals(0F.dpToPx(), rootView.height())
     }
 
     @Test

GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/GXComponentGridTest.kt

@@ -987,10 +987,7 @@ class GXComponentScrollTest : GXBaseTest() {
         val rootView = GXTemplateEngine.instance.createView(templateItem, size)
         GXTemplateEngine.instance.bindData(rootView, templateData)
 
-        Assert.assertEquals(
-            0,
-            ((rootView as RecyclerView).layoutManager as LinearLayoutManager).getFieldInt("mPendingScrollPosition")
-        )
+        Assert.assertEquals(0, ((rootView as RecyclerView).layoutManager as LinearLayoutManager).getFieldInt("mPendingScrollPosition"))
 
         GXRegisterCenter.instance.extensionScroll = null
     }
@@ -1053,10 +1050,7 @@ class GXComponentScrollTest : GXBaseTest() {
         val rootView = GXTemplateEngine.instance.createView(templateItem, size)
         GXTemplateEngine.instance.bindData(rootView, templateData)
 
-        Assert.assertEquals(
-            3,
-            ((rootView as RecyclerView).layoutManager as LinearLayoutManager).getFieldInt("mPendingScrollPosition")
-        )
+        Assert.assertEquals(3, ((rootView as RecyclerView).layoutManager as LinearLayoutManager).getFieldInt("mPendingScrollPosition"))
 
         GXTemplateEngine.instance.bindData(rootView,
             GXTemplateEngine.GXTemplateData(JSONObject().apply {

GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/GXComponentScrollTest.kt

@@ -26,8 +26,6 @@ import app.visly.stretch.Size
 import com.alibaba.fastjson.JSONObject
 import com.alibaba.gaiax.context.GXTemplateContext
 import com.alibaba.gaiax.context.clearLayout
-import com.alibaba.gaiax.context.isExistNodeForScroll
-import com.alibaba.gaiax.context.obtainNodeForScroll
 import com.alibaba.gaiax.data.GXDataImpl
 import com.alibaba.gaiax.data.assets.GXAssetsBinaryWithoutSuffixTemplate
 import com.alibaba.gaiax.data.assets.GXAssetsTemplate
@@ -484,6 +482,10 @@ class GXTemplateEngine {
         fun key(size: GXMeasureSize): String {
             return "${bizId}-${templateId}-${size.width}"
         }
+
+        fun key(): String {
+            return "${bizId}-${templateId}"
+        }
     }
 
     internal lateinit var context: Context
@@ -497,7 +499,7 @@ class GXTemplateEngine {
         GXRenderImpl()
     }
 
-    internal fun createTemplateContext(
+    fun createTemplateContext(
         gxTemplateItem: GXTemplateItem,
         gxMeasureSize: GXMeasureSize,
         gxVisualTemplateNode: GXTemplateNode?
@@ -689,8 +691,8 @@ class GXTemplateEngine {
         val gxHostTemplateContext = gxExtendParams?.gxHostTemplateContext
         if (gxHostTemplateContext != null) {
             val itemCacheKey = "${gxExtendParams.gxItemPosition}-${gxExtendParams.gxItemData.hashCode()}"
-            if (gxHostTemplateContext.isExistNodeForScroll(itemCacheKey)) {
-                gxTemplateContext.rootNode = gxHostTemplateContext.obtainNodeForScroll(itemCacheKey)
+            if (gxHostTemplateContext.scrollNodeCache?.containsKey(itemCacheKey) == true) {
+                gxTemplateContext.rootNode = gxHostTemplateContext.scrollNodeCache?.remove(itemCacheKey)
                 gxTemplateContext.isReuseRootNode = true
                 return gxTemplateContext
             }

GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/GXTemplateEngine.kt

@@ -112,13 +112,21 @@ class GXTemplateContext private constructor(
      * key is itemCacheKey ${itemPosition}-${itemData.hashCode()}.
      * value is item layout.
      */
-    var scrollItemLayoutCache: MutableMap<Any, Layout>? = null
+    val scrollItemLayoutCache: MutableMap<String, Layout>? by lazy {
+        mutableMapOf()
+    }
 
-    var sliderItemLayoutCache: Layout? = null
+    val sliderItemLayoutCache: MutableMap<String, Layout>? by lazy {
+        mutableMapOf()
+    }
 
-    var gridItemLayoutCache: Layout? = null
+    val gridItemLayoutCache: MutableMap<String, Layout>? by lazy {
+        mutableMapOf()
+    }
 
-    var scrollNodeCache: MutableMap<Any, GXNode>? = null
+    val scrollNodeCache: MutableMap<String, GXNode>? by lazy {
+        mutableMapOf()
+    }
 
     /**
      * Is dirty
@@ -149,8 +157,7 @@ class GXTemplateContext private constructor(
 
     fun release() {
         flags = 0
-        sliderItemLayoutCache = null
-        gridItemLayoutCache = null
+        sliderItemLayoutCache?.clear()
         scrollItemLayoutCache?.clear()
         containers?.clear()
         isDirty = false

GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/context/GXTemplateContext.kt

@@ -2,65 +2,19 @@ package com.alibaba.gaiax.context
 
 import app.visly.stretch.Layout
 import com.alibaba.gaiax.render.node.GXNode
-import com.alibaba.gaiax.utils.Log
-import com.alibaba.gaiax.utils.runE
-
-fun GXTemplateContext.initLayoutForScroll() {
-    if (scrollItemLayoutCache == null) {
-        scrollItemLayoutCache = mutableMapOf()
-    }
-}
 
 fun GXTemplateContext.clearLayout() {
-    sliderItemLayoutCache = null
-    gridItemLayoutCache = null
+    sliderItemLayoutCache?.clear()
+    gridItemLayoutCache?.clear()
     scrollItemLayoutCache?.clear()
 }
 
-fun GXTemplateContext.isExistForScroll(key: Any): Boolean {
-    return scrollItemLayoutCache?.containsKey(key) == true
-}
-
-fun GXTemplateContext.putLayoutForScroll(key: Any, value: Layout) {
-    Log.runE("GXTemplateContextExt") { "putLayoutForScroll key=$key value=$value" }
-    scrollItemLayoutCache?.put(key, value)
-}
-
-fun GXTemplateContext.getLayoutForScroll(key: Any): Layout? {
-    return scrollItemLayoutCache?.get(key)
-}
-
 fun GXTemplateContext.getMaxHeightLayoutForScroll(): Layout? {
-    return scrollItemLayoutCache?.maxWithOrNull { a, b ->
-        a.value.height.compareTo(b.value.height)
-    }?.value
+    return scrollItemLayoutCache?.maxWithOrNull { a, b -> a.value.height.compareTo(b.value.height) }?.value
 }
 
-
 fun GXTemplateContext.getMinHeightLayoutForScroll(): Layout? {
-    return scrollItemLayoutCache?.minWithOrNull { a, b ->
-        a.value.height.compareTo(b.value.height)
-    }?.value
-}
-
-
-fun GXTemplateContext.initNodeForScroll() {
-    if (scrollNodeCache == null) {
-        scrollNodeCache = mutableMapOf()
-    }
+    return scrollItemLayoutCache?.minWithOrNull { a, b -> a.value.height.compareTo(b.value.height) }?.value
 }
 
-fun GXTemplateContext.isExistNodeForScroll(key: Any): Boolean {
-    return scrollNodeCache?.containsKey(key) ?: false
-}
-
-fun GXTemplateContext.obtainNodeForScroll(key: Any): GXNode? {
-    val value = scrollNodeCache?.remove(key)
-    Log.runE("GXTemplateContextExt") { "obtainNodeForScroll key=$key value=$value" }
-    return value
-}
 
-fun GXTemplateContext.putNodeForScroll(key: Any, value: GXNode) {
-    scrollNodeCache?.put(key, value)
-    Log.runE("GXTemplateContextExt") { "putNodeForScroll key=$key value=$value" }
-}