react-native-fxview 1.0.2 → 1.0.3-beta2

package/FXCategoryController.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FXCategoryController = void 0;
 const PriorityQueue_1 = require("./queue/PriorityQueue");
+const FXLogger_1 = __importDefault(require("./logger/FXLogger"));
 class FXCategoryController {
     constructor(fxViewId, categoryId, triggerUpdate) {
         // 存储组件的 Map 和优先队列
@@ -19,11 +23,11 @@ class FXCategoryController {
      * @returns 组件控制器
      */
     add(component, componentId) {
-        console.log(`FXViewCategoryController.add`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.add`, `[${this.categoryId}]`, componentId);
         const finalComponentId = componentId || this.autoComponentId();
         // 如果组件已存在，先移除旧的
         if (this.componentMap.has(finalComponentId)) {
-            console.warn(`Component ${finalComponentId} already exists, removing old one`);
+            FXLogger_1.default.warn(`Component ${finalComponentId} already exists, removing old one`);
             this.remove(finalComponentId);
         }
         const componentItem = {
@@ -43,11 +47,11 @@ class FXCategoryController {
      * @returns 组件控制器
      */
     build(component, componentId) {
-        console.log(`FXViewCategoryController.build`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.build`, `[${this.categoryId}]`, componentId);
         const finalComponentId = componentId || this.autoComponentId();
         // 如果组件已存在，先移除旧的
         if (this.componentMap.has(finalComponentId)) {
-            console.warn(`Component ${finalComponentId} already exists, removing old one`);
+            FXLogger_1.default.warn(`Component ${finalComponentId} already exists, removing old one`);
             this.remove(finalComponentId);
         }
         const componentItem = {
@@ -66,15 +70,15 @@ class FXCategoryController {
      * @param componentId 组件 ID
      */
     show(componentId) {
-        console.log(`FXViewCategoryController.show`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.show`, `[${this.categoryId}]`, componentId);
         const componentItem = this.componentMap.get(componentId);
         if (!componentItem) {
-            console.warn(`Component ${componentId} not found in category ${this.categoryId}`);
+            FXLogger_1.default.warn(`Component ${componentId} not found in category ${this.categoryId}`);
             return;
         }
         // 如果已经可见，不需要重复操作
         if (componentItem.visible) {
-            console.log(`Component ${componentId} is already visible`);
+            FXLogger_1.default.info(`Component ${componentId} is already visible`);
             return;
         }
         componentItem.visible = true;
@@ -85,15 +89,15 @@ class FXCategoryController {
      * @param componentId 组件 ID
      */
     hide(componentId) {
-        console.log(`FXViewCategoryController.hide`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.hide`, `[${this.categoryId}]`, componentId);
         const componentItem = this.componentMap.get(componentId);
         if (!componentItem) {
-            console.warn(`Component ${componentId} not found in category ${this.categoryId}`);
+            FXLogger_1.default.warn(`Component ${componentId} not found in category ${this.categoryId}`);
             return;
         }
         // 如果已经隐藏，不需要重复操作
         if (!componentItem.visible) {
-            console.log(`Component ${componentId} is already hidden`);
+            FXLogger_1.default.info(`Component ${componentId} is already hidden`);
             return;
         }
         componentItem.visible = false;
@@ -105,10 +109,10 @@ class FXCategoryController {
      * @param component 新的组件内容
      */
     update(componentId, component) {
-        console.log(`FXViewCategoryController.update`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.update`, `[${this.categoryId}]`, componentId);
         const componentItem = this.componentMap.get(componentId);
         if (!componentItem) {
-            console.warn(`Component ${componentId} not found in category ${this.categoryId}`);
+            FXLogger_1.default.warn(`Component ${componentId} not found in category ${this.categoryId}`);
             return;
         }
         // 更新组件内容
@@ -118,7 +122,7 @@ class FXCategoryController {
             this.triggerUpdate();
         }
         else {
-            console.log(`Component ${componentId} is hidden, update without re-render`);
+            FXLogger_1.default.info(`Component ${componentId} is hidden, update without re-render`);
         }
     }
     /**
@@ -126,10 +130,10 @@ class FXCategoryController {
      * @param componentId 组件 ID（必需）
      */
     remove(componentId) {
-        console.log(`FXViewCategoryController.remove`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.remove`, `[${this.categoryId}]`, componentId);
         const componentItem = this.componentMap.get(componentId);
         if (!componentItem) {
-            console.warn(`Component ${componentId} not found in category ${this.categoryId}`);
+            FXLogger_1.default.warn(`Component ${componentId} not found in category ${this.categoryId}`);
             return;
         }
         // 从 Map 中删除
@@ -142,10 +146,10 @@ class FXCategoryController {
      * 移除最后一个组件（可选：用于向后兼容）
      */
     removeLast() {
-        console.log(`FXViewCategoryController.removeLast`, `[${this.categoryId}]`);
+        FXLogger_1.default.info(`FXViewCategoryController.removeLast`, `[${this.categoryId}]`);
         const lastComponent = this.componentQueue.peek();
         if (!lastComponent) {
-            console.warn(`No component to remove in category ${this.categoryId}`);
+            FXLogger_1.default.warn(`No component to remove in category ${this.categoryId}`);
             return;
         }
         this.remove(lastComponent.componentId);
@@ -154,7 +158,7 @@ class FXCategoryController {
      * 清空所有组件
      */
     clearAll() {
-        console.log(`FXViewCategoryController.clearAll`, `[${this.categoryId}]`);
+        FXLogger_1.default.info(`FXViewCategoryController.clearAll`, `[${this.categoryId}]`);
         const hadVisibleComponents = Array.from(this.componentMap.values()).some((item) => item.visible);
         this.componentMap.clear();
         this.componentQueue.clear();
@@ -215,7 +219,7 @@ class FXCategoryController {
      * 触发更新
      */
     triggerUpdate() {
-        console.log(`FXViewCategoryController.triggerUpdate`, `[${this.categoryId}]`);
+        FXLogger_1.default.info(`FXViewCategoryController.triggerUpdate`, `[${this.categoryId}]`);
         if (this.updateCallback) {
             this.updateCallback();
         }
@@ -226,7 +230,7 @@ class FXCategoryController {
      * @returns 组件控制器
      */
     createController(componentId) {
-        console.log(`FXViewCategoryController.createController`, `[${this.categoryId}]`, componentId);
+        FXLogger_1.default.info(`FXViewCategoryController.createController`, `[${this.categoryId}]`, componentId);
         // ✅ 修复：不在闭包中捕获 componentItem，每次都从 Map 获取最新引用
         return {
             show: () => {

package/FXCategoryController.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import { FXComponentItem, FXComponentController } from "./types";
 import { HeapType, PriorityOrder, PriorityQueue } from "./queue/PriorityQueue";
+import logger from "./logger/FXLogger";
 
 export class FXCategoryController {
   public fxViewId: string;
@@ -33,7 +34,7 @@ export class FXCategoryController {
    * @returns 组件控制器
    */
   add(component: React.ReactNode, componentId?: string): FXComponentController {
-    console.log(
+    logger.info(
       `FXViewCategoryController.add`,
       `[${this.categoryId}]`,
       componentId,
@@ -43,7 +44,7 @@ export class FXCategoryController {
 
     // 如果组件已存在，先移除旧的
     if (this.componentMap.has(finalComponentId)) {
-      console.warn(
+      logger.warn(
         `Component ${finalComponentId} already exists, removing old one`,
       );
       this.remove(finalComponentId);
@@ -72,7 +73,7 @@ export class FXCategoryController {
     component: React.ReactNode,
     componentId?: string,
   ): FXComponentController {
-    console.log(
+    logger.info(
       `FXViewCategoryController.build`,
       `[${this.categoryId}]`,
       componentId,
@@ -82,7 +83,7 @@ export class FXCategoryController {
 
     // 如果组件已存在，先移除旧的
     if (this.componentMap.has(finalComponentId)) {
-      console.warn(
+      logger.warn(
         `Component ${finalComponentId} already exists, removing old one`,
       );
       this.remove(finalComponentId);
@@ -108,7 +109,7 @@ export class FXCategoryController {
    * @param componentId 组件 ID
    */
   show(componentId: string): void {
-    console.log(
+    logger.info(
       `FXViewCategoryController.show`,
       `[${this.categoryId}]`,
       componentId,
@@ -117,7 +118,7 @@ export class FXCategoryController {
     const componentItem = this.componentMap.get(componentId);
 
     if (!componentItem) {
-      console.warn(
+      logger.warn(
         `Component ${componentId} not found in category ${this.categoryId}`,
       );
       return;
@@ -125,7 +126,7 @@ export class FXCategoryController {
 
     // 如果已经可见，不需要重复操作
     if (componentItem.visible) {
-      console.log(`Component ${componentId} is already visible`);
+      logger.info(`Component ${componentId} is already visible`);
       return;
     }
 
@@ -138,7 +139,7 @@ export class FXCategoryController {
    * @param componentId 组件 ID
    */
   hide(componentId: string): void {
-    console.log(
+    logger.info(
       `FXViewCategoryController.hide`,
       `[${this.categoryId}]`,
       componentId,
@@ -147,7 +148,7 @@ export class FXCategoryController {
     const componentItem = this.componentMap.get(componentId);
 
     if (!componentItem) {
-      console.warn(
+      logger.warn(
         `Component ${componentId} not found in category ${this.categoryId}`,
       );
       return;
@@ -155,7 +156,7 @@ export class FXCategoryController {
 
     // 如果已经隐藏，不需要重复操作
     if (!componentItem.visible) {
-      console.log(`Component ${componentId} is already hidden`);
+      logger.info(`Component ${componentId} is already hidden`);
       return;
     }
 
@@ -169,7 +170,7 @@ export class FXCategoryController {
    * @param component 新的组件内容
    */
   update(componentId: string, component: React.ReactNode): void {
-    console.log(
+    logger.info(
       `FXViewCategoryController.update`,
       `[${this.categoryId}]`,
       componentId,
@@ -178,7 +179,7 @@ export class FXCategoryController {
     const componentItem = this.componentMap.get(componentId);
 
     if (!componentItem) {
-      console.warn(
+      logger.warn(
         `Component ${componentId} not found in category ${this.categoryId}`,
       );
       return;
@@ -191,7 +192,7 @@ export class FXCategoryController {
     if (componentItem.visible) {
       this.triggerUpdate();
     } else {
-      console.log(
+      logger.info(
         `Component ${componentId} is hidden, update without re-render`,
       );
     }
@@ -202,7 +203,7 @@ export class FXCategoryController {
    * @param componentId 组件 ID（必需）
    */
   remove(componentId: string): void {
-    console.log(
+    logger.info(
       `FXViewCategoryController.remove`,
       `[${this.categoryId}]`,
       componentId,
@@ -211,7 +212,7 @@ export class FXCategoryController {
     const componentItem = this.componentMap.get(componentId);
 
     if (!componentItem) {
-      console.warn(
+      logger.warn(
         `Component ${componentId} not found in category ${this.categoryId}`,
       );
       return;
@@ -230,12 +231,12 @@ export class FXCategoryController {
    * 移除最后一个组件（可选：用于向后兼容）
    */
   removeLast(): void {
-    console.log(`FXViewCategoryController.removeLast`, `[${this.categoryId}]`);
+    logger.info(`FXViewCategoryController.removeLast`, `[${this.categoryId}]`);
 
     const lastComponent = this.componentQueue.peek();
 
     if (!lastComponent) {
-      console.warn(`No component to remove in category ${this.categoryId}`);
+      logger.warn(`No component to remove in category ${this.categoryId}`);
       return;
     }
 
@@ -246,7 +247,7 @@ export class FXCategoryController {
    * 清空所有组件
    */
   clearAll(): void {
-    console.log(`FXViewCategoryController.clearAll`, `[${this.categoryId}]`);
+    logger.info(`FXViewCategoryController.clearAll`, `[${this.categoryId}]`);
 
     const hadVisibleComponents = Array.from(this.componentMap.values()).some(
       (item) => item.visible,
@@ -319,7 +320,7 @@ export class FXCategoryController {
    * 触发更新
    */
   private triggerUpdate(): void {
-    console.log(
+    logger.info(
       `FXViewCategoryController.triggerUpdate`,
       `[${this.categoryId}]`,
     );
@@ -335,7 +336,7 @@ export class FXCategoryController {
    * @returns 组件控制器
    */
   private createController(componentId: string): FXComponentController {
-    console.log(
+    logger.info(
       `FXViewCategoryController.createController`,
       `[${this.categoryId}]`,
       componentId,

package/FXView.js

@@ -43,10 +43,14 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const FXViewManager_1 = require("./FXViewManager");
+const FXLogger_1 = __importDefault(require("./logger/FXLogger"));
 class FXView extends react_1.Component {
     constructor(props) {
         super(props);
@@ -63,18 +67,18 @@ class FXView extends react_1.Component {
                 `auto_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
     }
     componentDidMount() {
-        console.log("FXView mounted with viewId:", this.viewId);
+        FXLogger_1.default.log("FXView", `mounted with viewId: ${this.viewId}`);
         // 注册到视图管理器
         FXViewManager_1.FXViewManager.getInstance().registerView(this.viewId, this.updateComponents);
         // 初始更新
         this.updateComponents();
     }
     componentDidUpdate(_prevProps) {
-        console.log("FXView updated", this.viewId);
+        FXLogger_1.default.log("FXView", `updated: ${this.viewId}`);
         const newViewId = this.props.fxViewId || this.viewId;
         if (newViewId !== this.viewId) {
             // ID 变化时重新注册
-            console.log("FXView updated changed", this.viewId);
+            FXLogger_1.default.log("FXView", `updated changed: ${this.viewId}`);
             FXViewManager_1.FXViewManager.getInstance().unregisterView(this.viewId);
             this.viewId = newViewId;
             FXViewManager_1.FXViewManager.getInstance().registerView(this.viewId, this.updateComponents);
@@ -82,7 +86,7 @@ class FXView extends react_1.Component {
         }
     }
     componentWillUnmount() {
-        console.log("FXView unmounted", this.viewId);
+        FXLogger_1.default.log("FXView", `unmounted: ${this.viewId}`);
         // 注销视图（会自动清理所有组件和回调）
         FXViewManager_1.FXViewManager.getInstance().unregisterView(this.viewId);
     }
@@ -91,7 +95,7 @@ class FXView extends react_1.Component {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const _a = this.props, { fxViewId } = _a, restProps = __rest(_a, ["fxViewId"]);
         const { components } = this.state;
-        console.log("rendering fxView components", components.length);
+        FXLogger_1.default.log("FXView", `rendering components: ${components.length}`);
         return (<react_native_1.View {...restProps}>
         {children}
         {components.map((item) => item.visible ? (<react_1.default.Fragment key={item.componentId}>

package/FXView.tsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { View, ViewProps } from "react-native";
 import { FXComponentItem } from "./types";
 import { FXViewManager } from "./FXViewManager";
+import logger from "./logger/FXLogger";
 
 interface FXViewProps extends ViewProps {
   fxViewId?: string; // 动态标识属性，可选
@@ -27,7 +28,7 @@ export default class FXView extends Component<FXViewProps, FXViewState> {
   }
 
   componentDidMount() {
-    console.log("FXView mounted with viewId:", this.viewId);
+    logger.log("FXView", `mounted with viewId: ${this.viewId}`);
     // 注册到视图管理器
     FXViewManager.getInstance().registerView(
       this.viewId,
@@ -38,12 +39,12 @@ export default class FXView extends Component<FXViewProps, FXViewState> {
   }
 
   componentDidUpdate(_prevProps: FXViewProps) {
-    console.log("FXView updated", this.viewId);
+    logger.log("FXView", `updated: ${this.viewId}`);
     const newViewId = this.props.fxViewId || this.viewId;
 
     if (newViewId !== this.viewId) {
       // ID 变化时重新注册
-      console.log("FXView updated changed", this.viewId);
+      logger.log("FXView", `updated changed: ${this.viewId}`);
       FXViewManager.getInstance().unregisterView(this.viewId);
       this.viewId = newViewId;
 
@@ -56,7 +57,7 @@ export default class FXView extends Component<FXViewProps, FXViewState> {
   }
 
   componentWillUnmount() {
-    console.log("FXView unmounted", this.viewId);
+    logger.log("FXView", `unmounted: ${this.viewId}`);
     // 注销视图（会自动清理所有组件和回调）
     FXViewManager.getInstance().unregisterView(this.viewId);
   }
@@ -71,7 +72,7 @@ export default class FXView extends Component<FXViewProps, FXViewState> {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { fxViewId, ...restProps } = this.props;
     const { components } = this.state;
-    console.log("rendering fxView components", components.length);
+    logger.log("FXView", `rendering components: ${components.length}`);
     return (
       <View {...restProps}>
         {children}

package/FXViewController.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FXViewController = void 0;
 const FXCategoryController_1 = require("./FXCategoryController");
+const FXLogger_1 = __importDefault(require("./logger/FXLogger"));
 class FXViewController {
     constructor(fxViewId) {
         // 存储各分类的控制器
@@ -17,7 +21,7 @@ class FXViewController {
      * @returns 组件控制器
      */
     add(component, categoryId, componentId) {
-        console.log("FXViewController.add", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.add", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
@@ -32,7 +36,7 @@ class FXViewController {
      * @returns 组件控制器
      */
     build(component, categoryId, componentId) {
-        console.log("FXViewController.build", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.build", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
@@ -45,13 +49,13 @@ class FXViewController {
      * @param categoryId 分类 ID（可选，默认 "default"）
      */
     show(componentId, categoryId) {
-        console.log("FXViewController.show", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.show", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.show(componentId);
@@ -62,13 +66,13 @@ class FXViewController {
      * @param categoryId 分类 ID（可选，默认 "default"）
      */
     hide(componentId, categoryId) {
-        console.log("FXViewController.hide", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.hide", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.hide(componentId);
@@ -80,13 +84,13 @@ class FXViewController {
      * @param categoryId 分类 ID（可选，默认 "default"）
      */
     update(componentId, component, categoryId) {
-        console.log("FXViewController.update", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.update", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.update(componentId, component);
@@ -97,13 +101,13 @@ class FXViewController {
      * @param categoryId 分类 ID（可选，默认 "default"）
      */
     remove(componentId, categoryId) {
-        console.log("FXViewController.remove", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.remove", `[${this.fxViewId}]`, {
             categoryId,
             componentId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.remove(componentId);
@@ -117,12 +121,12 @@ class FXViewController {
      * @param categoryId 分类 ID（可选，默认 "default"）
      */
     removeLast(categoryId) {
-        console.log("FXViewController.removeLast", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.removeLast", `[${this.fxViewId}]`, {
             categoryId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${categoryId || "default"} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.removeLast();
@@ -135,12 +139,12 @@ class FXViewController {
      * 清空所有分类的所有组件
      */
     clearAll() {
-        console.log("FXViewController.clearAll", `[${this.fxViewId}]`);
+        FXLogger_1.default.info("FXViewController.clearAll", `[${this.fxViewId}]`);
         this.categoryControllerMap.forEach((controller) => {
             controller.clearAll();
         });
         this.categoryControllerMap.clear();
-        console.log("FXViewController.clearAll done", this.categoryControllerMap.size);
+        FXLogger_1.default.info("FXViewController.clearAll done", this.categoryControllerMap.size);
     }
     /**
      * 清空指定分类的所有组件
@@ -148,12 +152,12 @@ class FXViewController {
      */
     clearCategory(categoryId) {
         const finalCategoryId = categoryId || "default";
-        console.log("FXViewController.clearCategory", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.clearCategory", `[${this.fxViewId}]`, {
             categoryId: finalCategoryId,
         });
         const categoryController = this.getCategoryController(categoryId);
         if (!categoryController) {
-            console.warn(`CategoryController ${finalCategoryId} not found in view ${this.fxViewId}`);
+            FXLogger_1.default.warn(`CategoryController ${finalCategoryId} not found in view ${this.fxViewId}`);
             return;
         }
         categoryController.clearAll();
@@ -280,7 +284,7 @@ class FXViewController {
      */
     removeCategory(categoryId) {
         const finalCategoryId = categoryId || "default";
-        console.log("FXViewController.removeCategory", `[${this.fxViewId}]`, {
+        FXLogger_1.default.info("FXViewController.removeCategory", `[${this.fxViewId}]`, {
             categoryId: finalCategoryId,
         });
         this.categoryControllerMap.delete(finalCategoryId);