egovamap 0.35.6 → 0.35.7

package/egovamap/egovagis.js

@@ -1308,12 +1308,12 @@ var EGovaGISMap = function (
             });
         }
         /*if (context.sysConfig['PATROL_POS_WRITE_TO_FILE']) {
-			if (queryCondition) {
-				queryCondition = $.extend({}, queryCondition, { 'resourcetype': 2 });
-			} else {
-				queryCondition = { 'resourcetype': 2 };
-			}
-		}*/
+            if (queryCondition) {
+                queryCondition = $.extend({}, queryCondition, { 'resourcetype': 2 });
+            } else {
+                queryCondition = { 'resourcetype': 2 };
+            }
+        }*/
         scene.fire(
             msgPrefix + ":showObjectTrace",
             {
@@ -2173,7 +2173,8 @@ var EGovaGISMap = function (
         usePage,
         currentPage,
         numPerPage,
-        params
+        params,
+        cacheKey
     ) {
         var queryParam = {
             tableName: tableName,
@@ -2194,6 +2195,7 @@ var EGovaGISMap = function (
                     usePage,
                     currentPage,
                     numPerPage,
+                    cacheKey,
                 ],
             },
             parentScene,

package/egovamap/egovagisviewer.js

@@ -2306,7 +2306,8 @@ var EGovaGISMap = function (
         usePage,
         currentPage,
         numPerPage,
-        params
+        params,
+        cacheKey
     ) {
         var queryParam = {
             tableName: tableName,
@@ -2328,7 +2329,8 @@ var EGovaGISMap = function (
             usePage,
             currentPage,
             numPerPage,
-            cb
+            cb,
+            cacheKey
         );
     };
 

package/egovamap/egovamap.js

@@ -1422,23 +1422,23 @@ var EGovaMap = function (
         return RGBA;
     }
     /**
-	 * colorParse
-	 * @desc 颜色字符串格式化
-	 * "rgba(), rgb()格式的字符串输入，返回对象"
-	 *
-	 * @param {String} colorString 描述颜色的字符串，支持rgb和rgba格式
-	 * @return {Object} result 如果输入格式正确，返回对象，否则返回false
-	 * @example
-	 {
-	   red: 0.39215686274509803,
-	   green: 0.49019607843137253,
-	   blue: 0.8313725490196079,
-	   alpha: 0.9
-	 }
-	 *
-	 * @author: hth
-	 * @date: 2021/2/24
-	 * */
+     * colorParse
+     * @desc 颜色字符串格式化
+     * "rgba(), rgb()格式的字符串输入，返回对象"
+     *
+     * @param {String} colorString 描述颜色的字符串，支持rgb和rgba格式
+     * @return {Object} result 如果输入格式正确，返回对象，否则返回false
+     * @example
+     {
+       red: 0.39215686274509803,
+       green: 0.49019607843137253,
+       blue: 0.8313725490196079,
+       alpha: 0.9
+     }
+     *
+     * @author: hth
+     * @date: 2021/2/24
+     * */
     function colorParse(colorString) {
         var result = {};
         // Remove all whitespaces from the color string
@@ -1647,7 +1647,7 @@ var EGovaMap = function (
                                         // By hth 2021/5/11: 如果颜色大于50，考虑到性能和可能卡死的问题，则直接采用随机颜色赋值且不考虑随机到重复色的情况
                                         var extraColor = getRandomColorArray(
                                             keyValueArray.length -
-                                                tempValue.length,
+                                            tempValue.length,
                                             tempValue[0]
                                         );
                                         tempValue =
@@ -1684,10 +1684,10 @@ var EGovaMap = function (
                                     obj[key] =
                                         obj[key] ||
                                         tempValue[
-                                            Math.round(
-                                                Math.random() *
-                                                    (colorLength - 1)
-                                            )
+                                        Math.round(
+                                            Math.random() *
+                                            (colorLength - 1)
+                                        )
                                         ];
                                 } else {
                                     obj[key] = obj[key] || tempValue[index];
@@ -2540,7 +2540,7 @@ var EGovaMap = function (
     };
 
     /* 二维轨迹设置轨迹参数 */
-    that.setTraceLayerOptions = function(options){
+    that.setTraceLayerOptions = function (options) {
         if (scene == null) return;
         if (gisMap != null) {
             gisMap.setTraceLayerOptions(options);
@@ -2548,7 +2548,7 @@ var EGovaMap = function (
     }
 
     /* 二维轨迹获取轨迹播放状态 */
-    that.getTracePlayStatus = function(){
+    that.getTracePlayStatus = function () {
         if (scene == null) return;
         if (gisMap != null) {
             return gisMap.getTracePlayStatus();
@@ -3011,7 +3011,8 @@ var EGovaMap = function (
         usePage,
         currentPage,
         numPerPage,
-        params
+        params,
+        cacheKey
     ) {
         if (!scene) return;
         if (gisMap) gisMap.queryObjectInfo.apply(this, arguments);

package/egovamap/egovamapMEx.js

@@ -108,7 +108,10 @@ var egovamapMEx = function (gisMobileMap) {
         'setTraceHisGradientStatus',
         'countLength',
         'xkRealTimeTrace',
-        'closexkRealTimeTrace'
+        'closexkRealTimeTrace',
+        "initxkTrace",
+        "xkMoveTraceByTime",
+        "xkSetTraceStatus"
     ];
     methodEx = methodEx.concat(methodBusEx);
     for (let index = 0; index < methodEx.length; index++) {

package/egovamap/egovamobile.js

@@ -412,6 +412,9 @@ var EGovaMobileMap = function (
     "countLength",
     "xkRealTimeTrace",
     "closexkRealTimeTrace",
+    "initxkTrace",
+    "xkMoveTraceByTime",
+    "xkSetTraceStatus"
   ];
   methodEx = methodEx.concat(methodBusEx);
   for (let index = 0; index < methodEx.length; index++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egovamap",
-  "version": "0.35.6",
+  "version": "0.35.7",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {