@kimap/indoor-positioning-sdk-vue2 4.0.1 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimap/indoor-positioning-sdk-vue2",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Vue2自包含室内定位SDK - 完全兼容Webpack3+Babel6 | Vue2 Self-Contained Indoor Positioning SDK",
   "main": "index.js",
   "files": [

package/src/KMDOMMarker.js

@@ -106,14 +106,30 @@ KMDOMMarker.prototype.setPosition = function(position) {
 /**
  * 平滑移动到目标位置
  * @param {Object} targetPosition - { x, y, z }
- * @param {number} duration - 动画时长（毫秒），默认 1000
+ * @param {number|Object} durationOrConfig - 动画时长（毫秒）或配置对象
+ *   如果是数字：动画时长，默认 1000
+ *   如果是对象：{ duration: 1000, avoidObstacles: false }
+ *     - duration: 动画时长（毫秒），默认 1000
+ *     - avoidObstacles: 是否绕过障碍物，默认 false
  * @returns {Promise} 动画完成后 resolve
  */
-KMDOMMarker.prototype.animateTo = function(targetPosition, duration) {
+KMDOMMarker.prototype.animateTo = function(targetPosition, durationOrConfig) {
   var self = this;
-  duration = duration || 1000;
   
-  return new Promise(function(resolve) {
+  // 解析参数
+  var config = {};
+  if (typeof durationOrConfig === 'number') {
+    config.duration = durationOrConfig;
+    config.avoidObstacles = false;
+  } else if (typeof durationOrConfig === 'object' && durationOrConfig !== null) {
+    config.duration = durationOrConfig.duration || 1000;
+    config.avoidObstacles = durationOrConfig.avoidObstacles || false;
+  } else {
+    config.duration = 1000;
+    config.avoidObstacles = false;
+  }
+  
+  return new Promise(function(resolve, reject) {
     // 取消之前的动画
     if (self._animationId) {
       cancelAnimationFrame(self._animationId);
@@ -132,6 +148,28 @@ KMDOMMarker.prototype.animateTo = function(targetPosition, duration) {
       z: targetPosition.z !== undefined ? targetPosition.z : startPosition.z
     };
     
+    // 如果需要绕过障碍物，使用路径规划
+    if (config.avoidObstacles) {
+      self._animateAlongPath(startPosition, targetPos, config.duration)
+        .then(resolve)
+        .catch(reject);
+    } else {
+      // 直线移动
+      self._animateStraight(startPosition, targetPos, config.duration)
+        .then(resolve)
+        .catch(reject);
+    }
+  });
+};
+
+/**
+ * 直线移动动画（内部方法）
+ * @private
+ */
+KMDOMMarker.prototype._animateStraight = function(startPosition, targetPos, duration) {
+  var self = this;
+  
+  return new Promise(function(resolve) {
     var startTime = null;
     
     function animate(currentTime) {
@@ -167,6 +205,106 @@ KMDOMMarker.prototype.animateTo = function(targetPosition, duration) {
   });
 };
 
+/**
+ * 沿路径移动动画（内部方法）
+ * @private
+ */
+KMDOMMarker.prototype._animateAlongPath = function(startPosition, targetPos, duration) {
+  var self = this;
+  
+  return new Promise(function(resolve, reject) {
+    // 获取KMUtil和kidata
+    if (!self.sdk) {
+      console.warn('KMDOMMarker: SDK未初始化，使用直线移动');
+      return self._animateStraight(startPosition, targetPos, duration).then(resolve);
+    }
+    
+    var KMUtil = (typeof window !== 'undefined' && window.KimapSDK) ? window.KimapSDK.KMUtil : null;
+    if (!KMUtil) {
+      console.warn('KMDOMMarker: KMUtil未加载，使用直线移动');
+      return self._animateStraight(startPosition, targetPos, duration).then(resolve);
+    }
+    
+    var kidata = self.sdk.kidataContent || null;
+    
+    // 计算路径（使用x, z坐标）
+    var start = { x: startPosition.x, z: startPosition.z };
+    var end = { x: targetPos.x, z: targetPos.z };
+    
+    var path = KMUtil.findPath(start, end, kidata, { avoidObstacles: true });
+    
+    if (!path || path.length < 2) {
+      console.warn('KMDOMMarker: 路径规划失败，使用直线移动');
+      return self._animateStraight(startPosition, targetPos, duration).then(resolve);
+    }
+    
+    console.log('KMDOMMarker: 使用路径规划，共' + path.length + '个路径点');
+    
+    // 沿路径移动
+    var startTime = null;
+    var pathLength = KMUtil.calculatePathLength(path);
+    
+    function animate(currentTime) {
+      if (!startTime) startTime = currentTime;
+      
+      var elapsed = currentTime - startTime;
+      var progress = Math.min(elapsed / duration, 1);
+      
+      // 使用 easeInOutQuad 缓动函数
+      var eased = progress < 0.5
+        ? 2 * progress * progress
+        : 1 - Math.pow(-2 * progress + 2, 2) / 2;
+      
+      // 根据进度计算当前应该在路径的哪个位置
+      var targetDistance = pathLength * eased;
+      var currentDistance = 0;
+      var currentPos = null;
+      
+      // 遍历路径点，找到当前位置
+      for (var i = 1; i < path.length; i++) {
+        var segmentLength = Math.sqrt(
+          Math.pow(path[i].x - path[i - 1].x, 2) +
+          Math.pow(path[i].z - path[i - 1].z, 2)
+        );
+        
+        if (currentDistance + segmentLength >= targetDistance) {
+          // 在这个线段上
+          var segmentProgress = (targetDistance - currentDistance) / segmentLength;
+          currentPos = {
+            x: path[i - 1].x + (path[i].x - path[i - 1].x) * segmentProgress,
+            y: startPosition.y + (targetPos.y - startPosition.y) * eased, // Y轴独立插值
+            z: path[i - 1].z + (path[i].z - path[i - 1].z) * segmentProgress
+          };
+          break;
+        }
+        
+        currentDistance += segmentLength;
+      }
+      
+      // 如果没找到（理论上不应该发生），使用终点
+      if (!currentPos) {
+        currentPos = {
+          x: path[path.length - 1].x,
+          y: targetPos.y,
+          z: path[path.length - 1].z
+        };
+      }
+      
+      // 更新位置
+      self.setPosition(currentPos);
+      
+      if (progress < 1) {
+        self._animationId = requestAnimationFrame(animate);
+      } else {
+        self._animationId = null;
+        resolve();
+      }
+    }
+    
+    self._animationId = requestAnimationFrame(animate);
+  });
+};
+
 /**
  * 设置偏移量
  * @param {Object} offset - { x, y }