update...

panzh
1 parent b00aef0a
Showing 7 changed files with 25 additions and 12 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/data/geo/loader/util/GeoCalculator.java
src/main/java/com/bsth/util/geo/GeoUtils.java
src/main/resources/static/assets/css/main.css
src/main/resources/static/index.html
src/main/resources/static/pages/home.html
src/main/resources/static/pages/interface_test/iTest.html
@@ -61,7 +61,7 @@ public class StartCommand implements CommandLineRunner {
             sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 60 * 2, TimeUnit.SECONDS);
             //gps socket client
-            clientApp.init();
+            //clientApp.init();
             //gps 数据处理
             dataMainProcessor.start();
@@ -37,7 +37,7 @@ public class GeoCalculator {
         if (isLoop(stations) && stations.get(0).getUpDown() == 1)
             return null;//单环线下行
-        /*if(stations.get(0).getLineCode().equals("10507") && stations.get(0).getUpDown()==1)
+        /*if(stations.get(0).getLineCode().equals("10904") && stations.get(0).getUpDown()==0)
             System.out.println("aaa");*/
         //sort
@@ -75,7 +75,7 @@ public class GeoCalculator {
             if (pi > ci)
                 continue;
-            if (ci - pi < 2)
+            if (ci - pi < 1)
                 s.setPaths(null);
             else
                 s.setPaths(new CopyOnWriteArrayList(subList(seCds, pi, ci + 1)));
@@ -131,7 +131,7 @@ public class GeoUtils {
         if (d1 < 2 || d2 < 2)
             return true;
         else
-            return Math.abs(d1 + d2 - getDistance(s, e)) < 5;
+            return Math.abs(d1 + d2 - getDistance(s, e)) < 0.5;
     }
     static Logger logger = LoggerFactory.getLogger(GeoUtils.class);
@@ -363,4 +363,10 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
         stroke: #c94f21;
         fill: #c94f21;
     }
-}
 \ No newline at end of file
+}
+
+li.nav-item.disabled > a.nav-link,
+li.nav-item.disabled i.material-icons {
+    color: #cacaca;
+    cursor: no-drop;
+}
@@ -50,7 +50,7 @@
                 <li class="nav-item ">
                     <a class="nav-link" title="实时信息发布预览" href="/pages/real/main.html">
                         <i class="material-icons">voicemail</i>
-                        <p>实时发布</p>
+                        <p>实时预览</p>
                     </a>
                 </li>
                 <li class="nav-item ">
@@ -58,13 +58,20 @@
                         <i class="material-icons">info</i>
                         <p>信息发布接口测试</p>
                     </a>
-                </li><!--
-                <li class="nav-item ">
-                    <a class="nav-link" href="../examples/maps.html">
+                </li>
+
+                <li class="nav-item disabled">
+                    <a class="nav-link" >
+                        <i class="material-icons">history</i>
+                        <p>历史发布查询</p>
+                    </a>
+                </li>
+                <li class="nav-item disabled">
+                    <a class="nav-link" >
                         <i class="material-icons">bar_chart</i>
                         <p>统计分析</p>
                     </a>
-                </li>-->
+                </li>
             </ul>
         </div>
     </div>
@@ -2,7 +2,7 @@
     <div class="card">
         <div class="card-header ">
             <h3 class="card-title">Home</h3>
-            <p class="card-category">风吹草低见惆怅 抬头至少还有光</p>
+            <p class="card-category">风吹草低见牛羊</p>
         </div>
         <div class="card-body" >
@@ -60,7 +60,7 @@
                         <div class="col-md-2 field" style="margin-top: 5px;">
                             <div class="form-group">
                                 <label class="bmd-label-floating">时间（t）</label>
-                                <input type="text" name="t" class="form-control" value="">
+                                <input type="text" name="t" class="form-control" value="" placeholder="暂时没校验时间">
                             </div>
                         </div>
                         <div class="col-md-1">