功能完善

src/main/java/cn/minbb/iot/task/AutoConfig.java

@@ -1,7 +1,11 @@
 package cn.minbb.iot.task;
 
+import cn.minbb.iot.config.Const;
+import cn.minbb.iot.model.DeviceData;
 import cn.minbb.iot.service.MqttGateway;
 import cn.minbb.iot.service.MqttService;
+import cn.minbb.iot.util.Application;
+import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -30,10 +34,10 @@ public class AutoConfig {
     public void scheduled() {
         int random1 = 1 + ((int) (new Random().nextFloat() * (10 - 1)));
 //        mqttGateway.sendToMqtt(Application.getCurrentStringTime(), Const.MQTT_TOPIC_TIME, 2);
-//        int random2 = 1 + ((int) (new Random().nextFloat() * (10 - 1)));
-//        mqttGateway.sendToMqtt(JSONObject.toJSONString(
-//                new DeviceData("3447.92" + random1 + "00 N", "11338.93" + random2 + "33 E",
-//                        Application.getCurrentStringTime())), Const.MQTT_TOPIC_CAR_DATA, 2);
+        int random2 = 1 + ((int) (new Random().nextFloat() * (10 - 1)));
+        mqttGateway.sendToMqtt(JSONObject.toJSONString(
+                new DeviceData("3447.81" + random1 + "00 N", "11338.95" + random2 + "33 E",
+                        Application.getCurrentStringTime())), Const.MQTT_TOPIC_CAR_DATA, 2);
 //        mqttService.publishSync(new Topic(Const.MQTT_TOPIC_TIME, QoS.AT_LEAST_ONCE), Application.getCurrentStringTime());
     }
 }

src/main/resources/templates/index.html

@@ -36,14 +36,14 @@
         <div class="collapse navbar-collapse justify-content-end" id="navigation">
             <ul class="navbar-nav">
                 <li class="nav-item">
-                    <a class="nav-link" rel="tooltip" title="Follow us on Twitter" data-placement="bottom" href="https://twitter.com/CreativeTim"
+                    <a class="nav-link" rel="tooltip" title="Follow us on Twitter" data-placement="bottom" href="#"
                        target="_blank">
                         <i class="fa fa-twitter"></i>
                         <p class="d-lg-none">Twitter</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" rel="tooltip" title="Like us on Facebook" data-placement="bottom" href="https://www.facebook.com/CreativeTim"
+                    <a class="nav-link" rel="tooltip" title="Like us on Facebook" data-placement="bottom" href="#"
                        target="_blank">
                         <i class="fa fa-facebook-square"></i>
                         <p class="d-lg-none">Facebook</p>
@@ -51,21 +51,20 @@
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" rel="tooltip" title="Follow us on Instagram" data-placement="bottom"
-                       href="https://www.instagram.com/CreativeTimOfficial" target="_blank">
+                       href="#" target="_blank">
                         <i class="fa fa-instagram"></i>
                         <p class="d-lg-none">Instagram</p>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" rel="tooltip" title="Star on GitHub" data-placement="bottom"
-                       href="https://www.github.com/CreativeTimOfficial/paper-kit" target="_blank">
+                       href="https://gogs.minbb.cn/" target="_blank">
                         <i class="fa fa-github"></i>
                         <p class="d-lg-none">GitHub</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="https://demos.creative-tim.com/paper-kit-2/docs/1.0/getting-started/introduction.html" target="_blank"
-                       class="nav-link"><i class="nc-icon nc-book-bookmark"></i> 文档</a>
+                    <a href="/map" target="_blank" class="nav-link"><i class="nc-icon nc-book-bookmark"></i> 定位地图</a>
                 </li>
                 <li class="nav-item"><a class="btn btn-danger btn-round" href="/">用户登录</a></li>
             </ul>
@@ -112,23 +111,23 @@
                             <div class="carousel-inner" role="listbox">
                                 <div class="carousel-item active">
                                     <img class="d-block img-fluid"
-                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/banner/banner_1.jpg" alt=""/>
+                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/Car.jpg" alt=""/>
                                     <div class="carousel-caption d-none d-md-block">
-                                        <p>Somewhere</p>
+                                        <p>体感交互汽车</p>
                                     </div>
                                 </div>
                                 <div class="carousel-item">
                                     <img class="d-block img-fluid"
-                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/banner/banner_1.jpg" alt=""/>
+                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/KinectCar_windows.jpg" alt=""/>
                                     <div class="carousel-caption d-none d-md-block">
-                                        <p>Somewhere else</p>
+                                        <p>Windows 客户端应用程序</p>
                                     </div>
                                 </div>
                                 <div class="carousel-item">
                                     <img class="d-block img-fluid"
-                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/banner/banner_1.jpg" alt=""/>
+                                         src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/IoT_android.png" alt=""/>
                                     <div class="carousel-caption d-none d-md-block">
-                                        <p>Here it is</p>
+                                        <p>Android 客户端应用程序</p>
                                     </div>
                                 </div>
                             </div>
@@ -150,15 +149,14 @@
         <div class="container">
             <div class="row">
                 <div class="col-lg-6 col-md-12">
-                    <h2 class="title">Nucleo Icons</h2>
+                    <h2 class="title">Kinect & IoT</h2>
                     <br/>
                     <p class="description">
-                        Paper Kit comes with 100 custom icons made by our friends from NucleoApp. The official package contains over 2.100 thin icons
-                        which are looking great in combination with Paper Kit Make sure you check all of them and use those that you like the most.
+                        继鼠标和多点触摸技术之后，Kinect体感交互技术或将成为“第三次人机交互革命的原点”，不仅仅是因为它全新的操作方式，更是因为其背后所蕴含的创新精神。得益于这种新的人机交互技术，人对机器的使用门槛在进一步降低，因为计算机已经越来越能读懂人在自然状态所传递的命令。 当前，体感交互技术从众多的自然人机交互技术中脱颖而出，成为最为前沿的研究领域之一。 体感交互技术是一种不需要借助任何复杂的控制器，可直接通过肢体动作与周边数字设备装置和环境实现身临其境的互动、随心所欲地操控的智能技术，通常需要运动追踪、手势识别、运动捕捉、面部表情识别等一系列技术支撑。与其它人机交互手段相比，当前的体感交互技术无论是在硬件方面还是软件方面都有了较大提升。在交互过程中不需要发生直接接触，大大降低了对用户的约束，提高了人机交互的沉浸感，使得交互过程更加自然，使用起来更加简便。
                     </p>
                     <br/>
-                    <a href="nucleo-icons.html" class="btn btn-danger btn-round" target="_blank">View Demo Icons</a>
-                    <a href="https://nucleoapp.com/?ref=1712" class="btn btn-outline-danger btn-round" target="_blank">View All Icons</a>
+                    <a href="https://files-1252373323.cos.ap-beijing.myqcloud.com/app/KinectCar.zip" class="btn btn-danger btn-round" target="_blank">下载 Windows 客户端</a>
+                    <a href="https://files-1252373323.cos.ap-beijing.myqcloud.com/app/IoT.apk" class="btn btn-outline-danger btn-round" target="_blank">下载 Android APP</a>
                 </div>
                 <div class="col-lg-6 col-md-12">
                     <div class="icons-container">
@@ -186,10 +184,10 @@
         <div class="container">
             <div class="row">
                 <div class="col-md-8 ml-auto mr-auto text-center">
-                    <h2 class="title">Completed with examples</h2>
-                    <p class="description">The kit comes with three pre-built pages to help you get started faster. You can change the text and images
-                        and you're good to go. More importantly, looking at them will give you a picture of what you can built with this powerful
-                        kit.</p>
+                    <h2 class="title">人机交互新起点</h2>
+                    <p class="description">
+                        基于体感交互技术的汽车控制系统。黑科技超乎你的想象！
+                    </p>
                 </div>
             </div>
         </div>
@@ -198,17 +196,17 @@
         <div class="container">
             <div class="row example-page">
                 <div class="col-md-6 text-center">
-                    <a href="examples/landing.html" target="_blank">
-                        <img class="img-rounded img-responsive" src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/banner/banner_1.jpg"
+                    <a href="#" target="_blank">
+                        <img class="img-rounded img-responsive" src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/Kinect.ico"
                              alt="" style="width: 100%">
-                        <a href="./examples/landing-page.html" class="btn btn-outline-neutral btn-round" target="_blank">Landing Page</a>
+                        <a href="#" class="btn btn-outline-neutral btn-round" target="_blank">Kinect</a>
                     </a>
                 </div>
                 <div class="col-md-6 text-center">
-                    <a href="examples/profile.html" target="_blank">
-                        <img class="img-rounded img-responsive" src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/banner/banner_1.jpg"
+                    <a href="#" target="_blank">
+                        <img class="img-rounded img-responsive" src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/IoT_red.png"
                              alt="" style="width: 100%">
-                        <a href="./examples/profile-page.html" class="btn btn-outline-neutral btn-round" target="_blank">Profile Page</a>
+                        <a href="#" class="btn btn-outline-neutral btn-round" target="_blank">IoT</a>
                     </a>
                 </div>
             </div>
@@ -222,7 +220,7 @@
                     <p class="description">当然，如果你尝试一下，你一定会发现一个全新的世界！</p>
                 </div>
                 <div class="col-md-5 ml-auto mr-auto download-area">
-                    <a href="http://www.creative-tim.com/product/paper-kit-2" class="btn btn-danger btn-round">下载体感识别软件</a>
+                    <a href="https://files-1252373323.cos.ap-beijing.myqcloud.com/app/KinectCar.zip" class="btn btn-danger btn-round">下载体感识别软件</a>
                 </div>
             </div>
             <div class="row text-center upgrade-pro">
@@ -245,13 +243,13 @@
                     <h3>非常感谢您对我们的支持!</h3>
                 </div>
                 <div class="text-center col-md-12 col-lg-8">
-                    <a href="#pablo" class="btn btn-twitter-bg twitter-sharrre btn-round" rel="tooltip" title="Tweet!">
+                    <a href="#" class="btn btn-twitter-bg twitter-sharrre btn-round" rel="tooltip" title="Tweet!">
                         <i class="fa fa-twitter"></i> Twitter
                     </a>
-                    <a href="#pablo" class="btn btn-google-bg linkedin-sharrre btn-round" rel="tooltip" title="Share!">
+                    <a href="#" class="btn btn-google-bg linkedin-sharrre btn-round" rel="tooltip" title="Share!">
                         <i class="fa fa-google-plus"></i> Google
                     </a>
-                    <a href="#pablo" class="btn btn-facebook-bg facebook-sharrre btn-round" rel="tooltip" title="Share!">
+                    <a href="#" class="btn btn-facebook-bg facebook-sharrre btn-round" rel="tooltip" title="Share!">
                         <i class="fa fa-facebook-square"></i> Facebook
                     </a>
                     <a href="https://github.com/creativetimofficial/paper-kit" class="btn btn-github-bg btn-github sharrre btn-round" rel="tooltip"

src/main/resources/templates/map.html

@@ -7,8 +7,8 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/>
     <title>设备位置信息</title>
 
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Z2045g3IUDzxUdIWhvjRi2IqMQTYXWrX"></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=Z2045g3IUDzxUdIWhvjRi2IqMQTYXWrX"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script>
     <script type="text/javascript" src="../static/js/map.js" th:src="@{/js/map.js}"></script>
     <style type="text/css">
         body, html {
@@ -106,7 +106,7 @@
 
     let websocket = null;
     if ('WebSocket' in window) {
-        websocket = new WebSocket("ws://127.0.0.1/ws/map");
+        websocket = new WebSocket("wss://iot.minbb.cn/ws/map");
     } else {
         alert('抱歉，浏览器不支持，请更换浏览器！')
     }