Merge branch 'master' into dev-rmd

uavps-framework/src/main/java/com/uavps/framework/udp/TaskInfo.java

@@ -6,6 +6,10 @@ import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+/**
+ * @author allen
+ */
+
 public enum TaskInfo {
     // 枚举实例，包含初始化坐标和转化比率
     INSTANCE(0.0f, 0.0f, true, 1.0f);

uavps-framework/src/main/java/com/uavps/framework/websocket/WebSocketServer.java

@@ -132,7 +132,7 @@ public class WebSocketServer {
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("RUN json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -150,16 +150,15 @@ public class WebSocketServer {
                 } else if (message.startsWith("TRANSFORMATION:")) {
 //                    closeUdpServer();
 
-                    String param = message.substring(15);
-                    String[] paramAry = param.split(",");
+                    String bizId = message.substring(15);
                     UavpsTask uavpsTask = new UavpsTask();
-                    uavpsTask.setBizId(Long.parseLong(paramAry[0]));
+                    uavpsTask.setBizId(Long.parseLong(bizId));
                     uavpsTask.setBizType(UavpsTask.CHANGE);
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("TRANSFORMATION json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -172,16 +171,14 @@ public class WebSocketServer {
                     UavpsTask uavpsTask = new UavpsTask();
                     uavpsTask.setBizId(Long.parseLong(paramAry[0]));
                     uavpsTask.setBizType(UavpsTask.DISAPPEAR);
-                    for (int i = 0; i <= paramAry.length; i++) {
-                        if (i != 0) {
-                            uavpsTask.getNumbers().add(Integer.parseInt(paramAry[i]));
-                        }
+                    for (String s : paramAry) {
+                        uavpsTask.getNumbers().add(Integer.parseInt(s));
                     }
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("DISAPPEAR json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -193,16 +190,14 @@ public class WebSocketServer {
                     UavpsTask uavpsTask = new UavpsTask();
                     uavpsTask.setBizId(Long.parseLong(paramAry[0]));
                     uavpsTask.setBizType(UavpsTask.SHOW);
-                    for (int i = 0; i <= paramAry.length; i++) {
-                        if (i != 0) {
-                            uavpsTask.getNumbers().add(Integer.parseInt(paramAry[i]));
-                        }
+                    for (String s : paramAry) {
+                        uavpsTask.getNumbers().add(Integer.parseInt(s));
                     }
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("SHOW json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -217,7 +212,7 @@ public class WebSocketServer {
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("END json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }

uavps-web/src/router/index.js

@@ -74,6 +74,19 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '',
+    component: Layout,
+    redirect: 'Demo',
+    children: [
+      {
+        path: 'demo',
+        component: () => import('@/views/demo/index'),
+        name: 'Demo',
+        meta: { title: 'DEMO', icon: 'dashboard', affix: true }
+      }
+    ]
+  },
   {
     path: '/user',
     component: Layout,

uavps-web/src/views/demo/index.vue

@@ -0,0 +1,77 @@
+<template>
+  <div id="app">
+    <!-- <div id="pixi" style="z-index:-1;">  </div> -->
+    <div ref="pixiContainer" class="pixi-container" style="z-index:-1;"></div>
+  </div>
+</template>
+
+<script>
+import air from '@/views/textures/air.png'
+import * as PIXI from 'pixi.js'
+export default {
+  data(){
+    return{
+      pixiContainer: null,
+      pixiApp: null,
+
+    };
+  },
+  components: {
+  },
+  methods: {
+    initPixi() {
+      this.pixiContainer = this.$refs.pixiContainer;
+      // 创建Pixi应用
+      this.pixiApp = new PIXI.Application({
+        width: this.pixiContainer.clientWidth,
+        height: this.pixiContainer.clientHeight,
+        antialias: true,
+        transparent: false,
+        resolution: 1,
+        backgroundAlpha: 0,
+      });
+      this.pixiApp.renderer.backgroundColor = 0x66ccff;
+      this.pixiContainer.appendChild(this.pixiApp.view);
+
+      // let app = new PIXI.Application({ width:800,height:600,backgroundColor: 0xEF6644 });
+      // document.getElementById("pixi").appendChild(app.view);
+
+      let container = new PIXI.Container();
+      container.x = this.pixiApp.screen.width / 2;
+      container.y = this.pixiApp.screen.height / 2;
+      this.pixiApp.stage.addChild(container)//容器加入舞台
+
+      for(let i=0;i<25;i++){
+          let bunny = PIXI.Sprite.from(air);
+          bunny.width=40;
+          bunny.height=40;
+          bunny.anchor.set(0.5);
+          bunny.x=(i%5)*40;
+          bunny.y=Math.floor(i/5)*40;
+          container.addChild(bunny)
+      }
+
+      container.pivot.x = container.width / 2;
+      container.pivot.y = container.height / 2;
+      this.pixiApp.ticker.add(function(delta) {
+      });
+    }
+  },
+  mounted: function() {
+     this.initPixi();
+  },
+}
+</script>
+<style scoped>
+.pixi-container {
+  width: 100%;
+  /* height: 750px; */
+  height: calc(100vh - 140px);
+  position: relative;
+}
+
+.pixi-container canvas {
+  width: 100%;
+  height: 100%;
+}
+</style>