@jolibox/implement 1.1.11-beta.1 → 1.1.11-beta.3

package/src/native/api/navigate.ts

@@ -1,14 +1,21 @@
 import { createCommands, UserCustomError } from '@jolibox/common';
 import { invokeNative } from '../bootstrap/bridge';
 import { createSyncAPI, t, registerCanIUse } from './base';
+import { context } from '@/common/context';
 
 const commands = createCommands();
 
 const openSchemaSync = createSyncAPI('openSchemaSync', {
   paramsSchema: t.tuple(t.string()),
   implement: (schema) => {
+    // Add compatibility logic for incomplete URLs
+    let finalSchema = schema;
+    if (!schema.match(/^https?:\/\//)) {
+      finalSchema = `https://${context.mpId}.app.jolibox.com${schema.startsWith('/') ? '' : '/'}${schema}`;
+    }
+
     const res = invokeNative('openSchemaSync', {
-      schema
+      schema: finalSchema
     });
     if (res.errNo !== 0) {
       throw new UserCustomError(res.errMsg, res.errNo);
@@ -16,8 +23,39 @@ const openSchemaSync = createSyncAPI('openSchemaSync', {
   }
 });
 
-commands.registerCommand('API.openSchemaSync', openSchemaSync);
+const openPageSync = createSyncAPI('openPageSync', {
+  paramsSchema: t.tuple(t.string()),
+  implement: (page) => {
+    const { errNo, errMsg, data } = invokeNative('openPageSync', { url: page });
+    if (errNo !== 0 || !data) {
+      throw new UserCustomError(errMsg, errNo);
+    }
+    return { webviewId: data.webviewId };
+  }
+});
+
+const closePageSync = createSyncAPI('closePageSync', {
+  paramsSchema: t.tuple(t.number()),
+  implement: (webviewId) => {
+    const { errNo, errMsg } = invokeNative('closePageSync', { webviewId });
+    if (errNo !== 0) {
+      throw new UserCustomError(errMsg, errNo);
+    }
+  }
+});
+
+commands.registerCommand('RouterSDK.openSchema', openSchemaSync);
+commands.registerCommand('RouterSDK.openPage', openPageSync);
+commands.registerCommand('RouterSDK.closePage', closePageSync);
+
+registerCanIUse('router.openSchema', {
+  version: '1.1.10'
+});
+
+registerCanIUse('router.openPage', {
+  version: '1.1.10'
+});
 
-registerCanIUse('openSchemaSync', {
-  version: '1.1.9'
+registerCanIUse('router.closePage', {
+  version: '1.1.10'
 });

package/src/native/bootstrap/index.ts

@@ -42,11 +42,11 @@ RuntimeLoader.doExit(async () => {
     return context.shouldInterupt;
   }
 
-  // const stay = await openRetentionSchema();
-  // if (stay) {
-  //   // 挽留成功，打断退出
-  //   return true;
-  // }
+  const stay = await openRetentionSchema();
+  if (stay) {
+    // 挽留成功，打断退出
+    return true;
+  }
 
   // 退出，对应上报
   //埋点上报

package/src/native/bootstrap/retention.ts

@@ -1,7 +1,6 @@
 import { context } from '@/common/context';
 import { invokeNative, subscribe } from './bridge';
 import { Deferred } from '@jolibox/common';
-
 export async function openRetentionSchema() {
   const { data } = invokeNative('envSync');
   const { orientation, webviewId } = data;
@@ -11,7 +10,8 @@ export async function openRetentionSchema() {
     // set entryPath
     __orientation: orientation ?? 'VERTICAL', // 默认竖屏
     __showStatusBar: false,
-    __shouldInterupt: false
+    __shouldInterupt: false,
+    __showCapsuleButton: false
   };
   if (webviewId) {
     joliPayload = {
@@ -22,8 +22,10 @@ export async function openRetentionSchema() {
 
   const joliSource = context.encodeJoliSourceQuery(joliPayload);
 
-  const host = context.testMode ? 'stg-game.jolibox.com' : 'game.jolibox.com';
-  const retentionSchema = `https://${host}/game/G32115508989327465281365749294/?appId=G32115508989327465281365749294&joliSource=${joliSource}`;
+  const host = context.testMode
+    ? `https://G32115508989327465281365749294.app.jolibox.com`
+    : `https://G32115508989327465281365749294.app.jolibox.com`;
+  const retentionSchema = `${host}/recommended-guide/${context.mpId}?appId=${context.mpId}&joliSource=${joliSource}&navigationStyle=present`;
 
   const quitResultDeffer = new Deferred<boolean>();
 
@@ -38,3 +40,5 @@ export async function openRetentionSchema() {
   }, 0);
   return quitResultDeffer.promise;
 }
+
+// 添加锁变量，防止多次执行

package/src/native/types/native-method-map.d.ts

@@ -262,6 +262,23 @@ declare global {
         /** 错误码 */
         errNo?: number;
       };
+
+      openPageSync: (params: { url: string }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+        data?: {
+          webviewId: number;
+        };
+      };
+
+      closePageSync: (params: { webviewId: number }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+      };
     }
 
     interface NativeEventMap {