Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop

src/Global/efflect/Sunshine/index.js

@@ -98,6 +98,7 @@ export default class Sunshine {
     }
 
     if (state) {
+      let _this = this
       this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
         title: '光照属性', left: '180px', top: '100px',
         confirmCallBack: (options) => {
@@ -106,6 +107,7 @@ export default class Sunshine {
           this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
           syncData(this.sdk, this.options.id)
           syncSplitData(this.sdk, this.options.id)
+          this.remove()
         },
         resetCallBack: () => {
           this.reset()
@@ -116,6 +118,7 @@ export default class Sunshine {
         // },
         closeCallBack: () => {
           this.reset()
+          _this.remove()
           // this.entity.style = new Cesium.Cesium3DTileStyle({
           //   color: "color('rgba(255,255,255," + this.newData.transparency + ")')",
           //   show: true,

src/Obj/Base/FlowLine/index.js

@@ -40,6 +40,7 @@ class FlowLine extends Base {
     this.options.duration = options.duration || 10.0
     this.options.color = options.color || "rgba(255,255,255,1)"
     this.options.lineBackAlpha = options.lineBackAlpha || 0.05
+    this.options.positions = options.positions || []
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.Dialog = _Dialog
     this._EventBinding = new EventBinding()
@@ -47,7 +48,8 @@ class FlowLine extends Base {
     this.positionArea = []
     this.positions = []
     this.sdk.addIncetance(this.options.id, this)
-    FlowLine.create(this)
+    // FlowLine.create(this)
+    FlowLine.drawLine(this)
   }
 
   // 创建水面
@@ -68,6 +70,13 @@ class FlowLine extends Base {
       that.edit(true)
     })
   }
+  static drawLine(that) {
+    that.positionArea = that.options.positions
+    let posis = that.getRandomPointsInCesiumPolygon(that.options.positions, that.options.pointNumber)
+    that.positions = posis
+    that.getLine(that, posis)
+    // that.edit(true)
+  }
   getRandomPointsInCesiumPolygon(positions, count) {
     let lons = [], lats = [], posi = []
     positions.forEach(item => {

src/Obj/Base/PolylineObject/index.js

@@ -58,8 +58,8 @@ class PolylineObject extends Base {
     this.options.smooth = options.smooth || false
     this.options.extend = options.extend || false
     this.options.rotate = options.rotate || true
-    this.options.space = options.space || 0.1
-    this.options.speed = options.speed || 1
+    this.options.space = options.space || 1
+    this.options.speed = options.speed || 10
     this.options.dashSize = options.dashSize || 0.03
     this.options['length-unit'] = options['length-unit'] || '米'
     this.options['fit-length-unit'] = options['fit-length-unit'] || '米'

src/Tools/index.js

@@ -645,6 +645,7 @@ class Tools {
           space: newParam.space,
           speed: newParam.speed
         }
+        let arr = [7, 8, 9, 10, 11]
         param.speed = newParam.rotate ? param.speed : 0 - param.speed
         this.getFlowTexture(this, param, entity)