ohos: Improve the skeleton code of ovCompose access to OHOS unified rendering (Render Service)

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt

@@ -95,6 +95,7 @@ internal class TextStringSimpleNode(
         PlatformTextNodeFactory.instance.createPlatformDelegateTextNode()
     private var localBitmap: ImageBitmap? = null
     private var localCanvas: Canvas? = null
+
     // endregion
     private var baselineCache: MutableMap<AlignmentLine, Int>? = null
     private var _layoutCache: ParagraphLayoutCache? = null
@@ -487,24 +488,24 @@ internal class TextStringSimpleNode(
 
         val localParagraph = requireNotNull(layoutCache.paragraph) { "no paragraph" }
         // region Tencent Code
-        if (ComposeTabService.textAsyncPaint && !drawInSkia) {
+        if (ComposeTabService.textAsyncPaint && !drawInSkia && platformTextDelegate != null) {
             asyncDrawIntoCanvas(localParagraph)
             return
         }
         // endregion
         drawIntoCanvas { canvas ->
             var currentParagraphHashCode = 0
             // region Tencent Code
-            if (drawInSkia || EnableIOSParagraph) {
+            if (drawInSkia || EnableIOSParagraph || platformTextDelegate == null) {
                 localCanvas = canvas
             } else {
                 currentParagraphHashCode = paragraphHashCode()
-                if (platformTextDelegate?.needRedrawText(
+                if (!platformTextDelegate.needRedrawText(
                         nativeCanvas = canvas,
                         paragraphHashKey = currentParagraphHashCode,
                         width = layoutCache.layoutSize.width,
                         height = layoutCache.layoutSize.height
-                    ) == false
+                    )
                 ) return
                 ensureTextBitmap()
             }
@@ -571,6 +572,7 @@ internal class TextStringSimpleNode(
             }
         }
     }
+
     private fun paragraphHashCode(): Int {
         var result = text.hashCode()
         result = 31 * result + style.hashCode()

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/PlatformContextImpl.kt

@@ -32,6 +32,7 @@ internal class PlatformContextImpl(
     override val textInputService: PlatformTextInputService,
     override val textToolbar: TextToolbar,
     override val semanticsOwnerListener: PlatformContext.SemanticsOwnerListener?,
+    override val drawInSkia: Boolean = false,
     densityProvider: () -> Density,
 ) : PlatformContext by PlatformContext.Empty {
 

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/nativefoundation/AdaptiveCanvas.ohos.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.graphics.Vertices
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import kotlinx.cinterop.COpaquePointer
+import platform.arkui.ArkUI_RenderNodeHandle
 import kotlin.experimental.ExperimentalObjCRefinement
 
 
@@ -55,6 +56,8 @@ private inline fun CornerRadius.greaterThen(rhs: CornerRadius): Boolean {
 @OptIn(ExperimentalObjCRefinement::class)
 @HiddenFromObjC
 internal class AdaptiveCanvas(factory: COpaquePointer) : OHOSNativeCanvas {
+    override val canvasType: CanvasType get() = CanvasType.Native
+
     // 持有原始Native指针
     private val rawCanvasProxyHandle: OHNativeCanvasProxy_Handle? =
         androidx_compose_ui_arkui_utils_createOHNativeCanvasProxy(factory)
@@ -67,7 +70,7 @@ internal class AdaptiveCanvas(factory: COpaquePointer) : OHOSNativeCanvas {
         LogPrintUtil.verbose("AdaptiveCanvas::beginDraw")
     }
 
-    override fun drawLayer() {
+    override fun drawLayer(layer: ArkUI_RenderNodeHandle) {
         nativeCanvasProxy.drawLayer()
         LogPrintUtil.verbose("AdaptiveCanvas::drawLayer")
     }
@@ -325,6 +328,4 @@ internal class AdaptiveCanvas(factory: COpaquePointer) : OHOSNativeCanvas {
         // TODO: destroy some resources
         LogPrintUtil.verbose("AdaptiveCanvas::destroy")
     }
-
-    override val canvasType: CanvasType get() = CanvasType.Native
 }

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/nativefoundation/Inject.kt

@@ -0,0 +1,56 @@
+package androidx.compose.ui.platform.nativefoundation
+
+import androidx.compose.ui.arkui.RenderingBackend
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.OHOSParagraph
+import androidx.compose.ui.text.OHOSParagraphIntrinsics
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.platform.PlatformParagraphFactory
+import androidx.compose.ui.text.platform.platformParagraphFactory
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+
+private var didInject = false
+
+internal fun injectForCompose(renderBackend: RenderingBackend) {
+
+    if (didInject) return
+    didInject = true
+
+    /*注入 OHOS 平台的 Paragraph */
+    platformParagraphFactory = object : PlatformParagraphFactory {
+        override fun createParagraph(
+            intrinsics: ParagraphIntrinsics,
+            maxLines: Int,
+            ellipsis: Boolean,
+            constraints: Constraints
+        ): Paragraph? = if (renderBackend == RenderingBackend.ArkUIRenderNode) OHOSParagraph(
+            intrinsics as OHOSParagraphIntrinsics,
+            maxLines,
+            ellipsis,
+            constraints
+        ) else null
+
+        override fun createParagraphIntrinsics(
+            text: String,
+            style: TextStyle,
+            spanStyles: List<AnnotatedString.Range<SpanStyle>>,
+            placeholders: List<AnnotatedString.Range<Placeholder>>,
+            density: Density,
+            fontFamilyResolver: FontFamily.Resolver
+        ): ParagraphIntrinsics? =
+            if (renderBackend == RenderingBackend.ArkUIRenderNode) OHOSParagraphIntrinsics(
+                text,
+                style,
+                spanStyles,
+                placeholders,
+                density,
+                fontFamilyResolver
+            ) else null
+    }
+}

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/nativefoundation/OHOSNativeCanvas.kt

@@ -4,6 +4,7 @@ import androidx.compose.ui.geometry.RoundRect
 import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.RenderEffect
+import platform.arkui.ArkUI_RenderNodeHandle
 
 /*
  * Tencent is pleased to support the open source community by making ovCompose available.
@@ -27,7 +28,7 @@ interface OHOSNativeCanvas : Canvas {
     fun onPreDraw()
 
 //    fun drawLayer(layer: CALayer)
-    fun drawLayer()
+    fun drawLayer(layer: ArkUI_RenderNodeHandle)
 
     fun drawLayerWithNativeCanvas(nativeCanvas: OHOSNativeCanvas)
 

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.ohos.kt

@@ -89,7 +89,8 @@ internal class ComposeSceneMediator(
             TextInputService(),
             PlatformTextToolbar(controller.messenger, PlatformClipboardProxy(controller.messenger)),
             semanticsOwnerListener,
-            densityProvider = { scene.density }
+            densityProvider = { scene.density },
+            drawInSkia = configuration.renderingBackend == RenderingBackend.XComponent
         )
     }
 

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/text/OHNativeParagraphProxy.kt

@@ -0,0 +1,113 @@
+package androidx.compose.ui.text
+
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.unit.Density
+import platform.arkui.ArkUI_RenderNodeHandle
+import org.jetbrains.skia.Point
+
+class OHNativeParagraphProxy {
+
+    fun getRenderNodeHandle(): ArkUI_RenderNodeHandle? {
+        return null
+    }
+
+    fun getFirstBaseline(): Float {
+        // TODO: Implement logic to get the first baseline
+        return 0F
+    }
+
+    fun getLineLeft(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line left
+        return 0F
+    }
+
+    fun getLineRight(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line right
+        return 0F
+    }
+
+    fun getLineTop(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line top
+        return 0F
+    }
+
+    fun getLineBottom(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line bottom
+        return 0F
+    }
+
+    fun getLineHeight(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line height
+        return 0F
+    }
+
+    fun getLineWidth(lineIndex: Int): Float {
+        // TODO: Implement logic to get the line width
+        return 0F
+    }
+
+    fun getLineStart(lineIndex: Int): Int {
+        // TODO: Implement logic to get the line start
+        return 0
+    }
+
+    fun getLineEnd(lineIndex: Int, visibleEnd: Boolean): Int {
+        // TODO: Implement logic to get the line end
+        return 0
+    }
+
+    fun isLineEllipsized(lineIndex: Int): Boolean {
+        // TODO: Implement logic to check if the line is ellipsized
+        return false
+    }
+
+    fun getLineForOffset(offset: Int): Int {
+        // TODO: Implement logic to get the line offset
+        return 0
+    }
+
+    fun lineCount(): Int {
+        // TODO: Implement logic to get the line count
+        return 0
+    }
+
+    fun getRectsForRange(start: Int, end: Int): List<Rect> {
+        // TODO: Implement logic to get the rects for the specified range
+        return emptyList()
+    }
+
+    fun getCursorRect(offset: Int): Rect {
+        // TODO: Implement logic to get the cursor rect at the specified offset
+        return Rect(0F, 0F, 0F, 0F)
+    }
+
+    // 获取坐标对应的字符所在的索引位置
+    fun getOffsetForPositionX(x: Float, y: Float): Int {
+        // TODO: Implement logic to get the offset for the specified position
+        return 0
+    }
+
+    fun getLastBaseline(): Float {
+        // TODO: Implement logic to get the last baseline
+        return 0F
+    }
+
+    // 根据字符所在的offset偏移找到该字符单词的范围
+    fun getWordBoundary(offset: Int): TextRange {
+        // TODO: Implement logic to get the word boundary for the specified offset
+        return TextRange(0, 0)
+    }
+
+    fun paintWithColor(colorValue: ULong) {
+    }
+
+    fun measureAndLayout(text: String, maxWidth: Float, maxHeight: Float, density: Density): Point {
+        // TODO: Implement text measurement and layout logic
+        return Point(0F, 0F)
+    }
+
+    fun relayoutWithMaxWidth(maxWidth: Float, maxHeight: Float, maxLines: Int, ellipsis: Boolean) {
+        // TODO: Implement text measurement and layout logic
+    }
+
+}