crh-jssdk 1.0.28 → 1.0.29

package/dist/business/profession/crh-app-sdk-cxzq.js

@@ -64,7 +64,6 @@ var actionMap = {
             window.MyWebView.onJsOverrideUrlLoading(str);
         }
         else if (window.HarmonyOS && window.HarmonyOS.onJsOverrideUrlLoading) {
-            console.log("HarmonyOS.onJsOverrideUrlLoading: ".concat(str));
             window.HarmonyOS.onJsOverrideUrlLoading(str);
         }
         else {
@@ -283,6 +282,12 @@ exports.default = {
      */
     setCollect: function (params) {
         var _this = this;
+        if ((0, utils_1.checkIsHarmonyOS)()) {
+            return {
+                error_no: "-1",
+                error_info: "暂不支持该功能",
+            };
+        }
         var sdkParams = {
             productNo: params.productNo,
             productCode: params.productCode,
@@ -351,6 +356,12 @@ exports.default = {
     queryCollect: function (params) {
         var _this = this;
         console.log('queryCollect', params);
+        if ((0, utils_1.checkIsHarmonyOS)()) {
+            return {
+                error_no: "-1",
+                error_info: "暂不支持该功能",
+            };
+        }
         var sdkParams = {
             productNo: params.productNo,
             productCode: params.productCode,

package/dist/business/utils/bridge.js

@@ -126,19 +126,29 @@ var JYBridge = /** @class */ (function () {
     /**
      * 初始化Bridge连接
      * 使用ClientTHS初始化方式
+     * 注意：从第三方页面返回时 WebView 可能被重建，Bridge 尚未注入，需配合 iframe 触发重新注入
      */
     JYBridge.prototype.init = function () {
         var _this = this;
         return new Promise(function (resolve) {
             // 使用ClientTHS初始化（与ClientTemplate.js一致）
             JYClientTHS.init();
+            var checkCount = 0;
+            // 最多等待30秒（300次 * 100ms），超时后不再等待
+            var maxChecks = 300;
             // 等待WebViewJavascriptBridgeReady事件
             var checkBridge = function () {
+                checkCount++;
                 if (window.WebViewJavascriptBridge) {
                     _this.bridge = window.WebViewJavascriptBridge;
                     console.log('JYBridge 初始化完成');
                     resolve();
                 }
+                else if (checkCount >= maxChecks) {
+                    // 超时，不再等待
+                    console.warn('JYBridge 初始化超时（30秒），停止等待');
+                    resolve();
+                }
                 else {
                     setTimeout(checkBridge, 100);
                 }
@@ -153,24 +163,58 @@ var JYBridge = /** @class */ (function () {
      * @param params 参数
      */
     JYBridge.prototype.bridgeCallHandler = function (type, name, params) {
+        var _this = this;
         if (type === void 0) { type = ''; }
         if (name === void 0) { name = ''; }
         if (params === void 0) { params = {}; }
         if (type === 'Promise') {
             return new Promise(function (resolve, reject) {
+                // 构造超时 reject 函数，避免重复定义
+                var timeoutReject = function () {
+                    reject(new Error("\u8C03\u7528".concat(name, "\u65B9\u6CD5\u8D85\u65F6\uFF0810\u79D2\uFF09\uFF0CBridge\u53EF\u80FD\u4E0D\u53EF\u7528")));
+                };
+                // 设置10秒超时
+                var timeoutId = setTimeout(timeoutReject, 10000);
                 try {
-                    JYClientTHS.bridgeCallHandler(name, params, function (response) {
-                        // 只要有响应就 resolve，即使是空对象或只有 login_status
-                        // getUserInfoByRsa 未登录时返回 { login_status: "0" }
-                        if (response !== undefined && response !== null) {
-                            resolve(response);
-                        }
-                        else {
-                            reject(new Error("\u8C03\u7528".concat(name, "\u65B9\u6CD5\u5931\u8D25\u4E86!")));
-                        }
+                    // 等待Bridge初始化完成后再执行
+                    _this.waitForReady(300)
+                        .then(function () {
+                        // Bridge已就绪，执行调用
+                        JYClientTHS.bridgeCallHandler(name, params, function (response) {
+                            clearTimeout(timeoutId);
+                            // 只要有响应就 resolve，即使是空对象或只有 login_status
+                            // getUserInfoByRsa 未登录时返回 { login_status: "0" }
+                            if (response !== undefined && response !== null) {
+                                resolve(response);
+                            }
+                            else {
+                                reject(new Error("\u8C03\u7528".concat(name, "\u65B9\u6CD5\u5931\u8D25\u4E86!")));
+                            }
+                        });
+                    })
+                        .catch(function () {
+                        // waitForReady 超时，尝试直接连接
+                        JYClientTHS.connectWebViewJavascriptBridge(function (bridge) {
+                            if (bridge && typeof bridge.callHandler === 'function') {
+                                bridge.callHandler(name, params, function (response) {
+                                    clearTimeout(timeoutId);
+                                    if (response !== undefined && response !== null) {
+                                        resolve(response);
+                                    }
+                                    else {
+                                        reject(new Error("\u8C03\u7528".concat(name, "\u65B9\u6CD5\u5931\u8D25\u4E86!")));
+                                    }
+                                });
+                            }
+                            else {
+                                clearTimeout(timeoutId);
+                                reject(new Error('Bridge不可用，请从App重新进入页面'));
+                            }
+                        });
                     });
                 }
                 catch (e) {
+                    clearTimeout(timeoutId);
                     reject(e);
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crh-jssdk",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "crh-jssdk",
   "main": "dist/index.js",
   "scripts": {