同步代码

Author: muyao1987

public/config/config.json

@@ -173,7 +173,7 @@
             "api": "Map.html#expImage",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css",
+              "/img/div-graphic/divGraphic.css",
               "/lib/dom2img/dom-to-image.js",
               "/lib/dom2img/html2canvas.js"
             ]
@@ -311,6 +311,23 @@
             "main": "thing/camera/cameraHistory-limit",
             "api": "CameraHistory.html",
             "hasPannel": true
+          },
+          {
+            "name": "执行时序任务",
+            "thumbnail": "thing-other-task.jpg",
+            "main": "thing/other/task",
+            "api": "Task.html",
+            "hasPannel": true,
+            "resources": [
+              "CameraList.js",
+              "CameraView.js",
+              "MapRotate.js",
+              "PointRotate.js",
+              "RouteLine.js",
+              "ZoomIn.js",
+              "ZoomOut.js",
+              "FlickerEntity.js"
+            ]
           }
         ]
       },
@@ -874,7 +891,7 @@
             "developerShow": false,
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -1014,7 +1031,12 @@
             "thumbnail": "layerg-wfs-geoserver.jpg",
             "main": "layer-graphic/wfs/geoserver",
             "api": "WfsLayer.html",
-            "hasPannel": true
+            "hasPannel": true,
+            "libs": [
+              "mars3d",
+              "localforage",
+              "cesium-networkPlug"
+            ]
           },
           {
             "name": "ArcGIS Server动态图层",
@@ -1037,14 +1059,6 @@
             "main": "layer-graphic/wfs/arcgis-feature-surface",
             "api": "ArcGisWfsLayer.html",
             "download": false
-          },
-          {
-            "name": "高德POI图层",
-            "thumbnail": "layerg-wfs-gaodePOI.jpg",
-            "main": "layer-graphic/wfs/gaodePOI",
-            "api": "GeodePoiLayer.html",
-            "hasPannel": true,
-            "download": false
           }
         ]
       },
@@ -1242,7 +1256,7 @@
             "developerShow": false,
             "hasPannel": true,
             "resources": [
-              "city.css"
+              "/img/div-graphic/divGraphic.css"
             ],
             "download": false
           }
@@ -1601,7 +1615,7 @@
             "api": "DivBillboardPrimitive.html",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css",
+              "/img/div-graphic/divGraphic.css",
               "/lib/dom2img/dom-to-image.js"
             ]
           },
@@ -1695,7 +1709,7 @@
             "main": "graphic/divGraphic/basis",
             "api": "DivGraphic.html",
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ],
             "hasPannel": true
           },
@@ -1718,7 +1732,7 @@
             "api": "DivPlane.html",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -1735,7 +1749,7 @@
             "api": "DivGraphic.html",
             "developerShow": false,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -1746,7 +1760,7 @@
             "hasPannel": true,
             "developerShow": false,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -1780,8 +1794,7 @@
             "developerShow": false,
             "hasPannel": true,
             "resources": [
-              "camera.css",
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -1795,8 +1808,7 @@
               "mars3d"
             ],
             "resources": [
-              "camera.css",
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ],
             "hidden": true,
             "download": false
@@ -2236,7 +2248,7 @@
             "developerShow": false,
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -2271,7 +2283,7 @@
             "developerShow": false,
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -2613,7 +2625,7 @@
             "hasPannel": true,
             "resources": [
               "camera.css",
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -3029,15 +3041,15 @@
             "thumbnail": "graphic-apply-district.jpg",
             "main": "graphic/apply/district",
             "resources": [
-              "district.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
             "name": "行政区突出展示2",
             "thumbnail": "graphic-apply-district2.jpg",
             "main": "graphic/apply/district2",
             "resources": [
-              "district2.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -3061,7 +3073,7 @@
             "main": "graphic/apply/digitalCity",
             "previewListIn": true,
             "resources": [
-              "city.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           }
         ]
@@ -3076,7 +3088,7 @@
             "main": "graphic/apply/steps",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -3148,7 +3160,7 @@
               "mars3d-heatmap"
             ],
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           }
         ]
@@ -3271,7 +3283,7 @@
             "api": "Popup.html",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -3281,7 +3293,7 @@
             "api": "Tooltip.html",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {
@@ -3418,7 +3430,7 @@
             "hasPannel": true
           },
           {
-            "name": "ClockAnimate 时钟控制栏 差值模式",
+            "name": "时钟控制栏 秒数值显示模式",
             "thumbnail": "control-basis-clockAnimate-duration.jpg",
             "main": "control/basis/clockAnimate-duration",
             "api": "ClockAnimate.html",
@@ -3484,6 +3496,13 @@
             "main": "control/basis/mapSplit",
             "api": "MapSplit.html",
             "hasPannel": true
+          },
+          {
+            "name": "字幕",
+            "thumbnail": "control-basis-subtitles.jpg",
+            "main": "control/basis/subtitles",
+            "api": "Subtitles.html",
+            "hasPannel": true
           }
         ]
       },
@@ -3629,7 +3648,7 @@
             "api": "Measure.html",
             "hasPannel": true,
             "resources": [
-              "/temp/css/divGraphic.css"
+              "/img/div-graphic/divGraphic.css"
             ]
           },
           {

public/config/example.json

@@ -1,6 +1,6 @@
 {
   "type": "image",
-  "url": "//data.mars3d.cn//file/img/radar/201906211112.PNG",
+  "url": "//data.mars3d.cn/img/map/radar/201906211112.PNG",
   "rectangle": { "xmin": 73.16895, "xmax": 134.86816, "ymin": 12.2023, "ymax": 54.11485 },
   "alpha": 0.7
 }

public/config/layer.json

@@ -24,7 +24,7 @@
   position: absolute;
   bottom: -39px;
   left: -22px;
-  background: url("../../img/icon/popupLbl.png") 0px 0px no-repeat;
+  background: url("./blackPanel-bg.png") 0px 0px no-repeat;
   background-position: 0px 0px;
 }
 
@@ -86,7 +86,7 @@
 
 /**************** 蓝色科技感文本面板 ****************/
 .mars-spot {
-  background-image: url("../../img/icon/lbl-circle.png");
+  background-image: url("./lbl-circle.png");
   position: absolute;
   background-repeat: no-repeat;
   user-select: none;
@@ -100,11 +100,11 @@
 }
 
 .mars-spot:hover {
-  background-image: url("../../img/icon/lbl-circle2.png");
+  background-image: url("./lbl-circle2.png");
 }
 
 .mars-spot:hover .mars-spot-board{
-  background-image: url("../../img/icon/lbl-extent2.png");
+  background-image: url("./lbl-extent2.png");
 }
 
 .mars-spot:hover .mars-spot-line{
@@ -120,7 +120,7 @@
 }
 
   .mars-spot-board {
-    background-image: url("../../img/icon/lbl-extent.png");
+    background-image: url("./lbl-extent.png");
     top: -165px;
     transform: translateX(-30%);
     width: 180px;
@@ -134,7 +134,7 @@
   }
 
   .mars-spot-board:hover {
-    background-image: url("../../img/icon/lbl-extent2.png");
+    background-image: url("./lbl-extent2.png");
 
   }
 
@@ -240,7 +240,7 @@
   background: rgba(42, 42, 42, 0.8);
   border-radius: 4px;
 
-  background: url("../../img/icon/div1.png");
+  background: url("./marsImgPanel1.png");
   background-size: 100%;
   -webkit-background-size: cover;
   -moz-background-size: cover;
@@ -275,7 +275,7 @@
   height: 157px;
   background: rgba(42, 42, 42, 0.8);
   border-radius: 4px;
-  background: url("../../img/icon/div2.png");
+  background: url("./marsImgPanel2.png");
   background-size: 100%;
   -webkit-background-size: cover;
   -moz-background-size: cover;
@@ -669,7 +669,7 @@
   position: absolute;
   bottom: -39px;
   left: -22px;
-  background: url("../../img/icon/popupLbl.png") 0px 0px no-repeat;
+  background: url("./blackPanel-bg.png") 0px 0px no-repeat;
   background-position: 0px 0px;
 }
 
@@ -684,3 +684,46 @@
   font-size: 12px;
   padding:3px
 }
+
+
+/**************** 视频上下抖动点+下竖线 ****************/ 
+.mars3d-divCameraPoint-content {
+  /* 防止下面的line一直随img动画 */
+  height: 30px;
+}
+.mars3d-divCameraPoint-img {
+  width: 30px;
+  height: 30px;
+  animation: cameraMove 1s linear infinite alternate;
+  -webkit-animation: cameraMove 1s linear infinite alternate;
+}
+@keyframes cameraMove {
+  from {
+    margin-top: 20px;
+  }
+  to {
+    margin-top: 0px;
+  }
+}
+@-webkit-keyframes cameraMove {
+  from {
+    margin-top: 20px;
+  }
+  to {
+    margin-top: 0px;
+  }
+}
+.mars3d-divCameraPoint-line {
+  height: 120px;
+  width: 5px;
+  margin-top: 20px;
+  border-left: 3px dashed #5b8fee;
+  margin-left: calc(50% - 1px);
+}
+.mars3d-divCameraPoint-point {
+  border-radius: 50%;
+  width: 8px;
+  height: 8px;
+  margin-left: calc(50% - 3px);
+  background-color: #5b8fee;
+}