From 8df09f29a30150dce7fdd47b381e7cc1753d566a Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 4 Feb 2024 10:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/images/loc1_green.png   | Bin 0 -> 578 bytes
 .../src/main/resources/static/images/loc_blue.png | Bin 0 -> 232 bytes
 .../main/resources/static/images/loc_green.png    | Bin 0 -> 938 bytes
 .../src/main/resources/static/images/loc_red.png  | Bin 0 -> 231 bytes
 .../resources/templates/page/device_overview.html |   8 +++++++-
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 sec-beidou/src/main/resources/static/images/loc1_green.png
 create mode 100644 sec-beidou/src/main/resources/static/images/loc_blue.png
 create mode 100644 sec-beidou/src/main/resources/static/images/loc_green.png
 create mode 100644 sec-beidou/src/main/resources/static/images/loc_red.png

diff --git a/sec-beidou/src/main/resources/static/images/loc1_green.png b/sec-beidou/src/main/resources/static/images/loc1_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cf722c5b5a3fcf9a761d2cb7f7bcadbe3673a7
GIT binary patch
literal 578
zcmV-I0=@l-P)<h;3K|Lk000e1NJLTq000^Q001Hg1^@s6L1W1d00009a7bBm000*e
z000*e0m>%xKL7v$^hrcPR7i=fm+eskF%X8|y#}-cu>!CHu>(2~EAXr!mkNXm#160n
z=>RGaI?xK%S==!3xNLI3JHsCm@?^gQF*9-^PuBoO0LIbQHGnNUUS|)GGb|8!ngXZ+
z42?5(0G0q|?0DM?M4sg43jjAIw~gf4aZ>~$Pcs0|Jpr*c;$n9Eodl65vEuOzNYD|i
ziXiocAkdgD<1h9Wk*9%X(ba`OK`-oBLUFLD$v}Q2&;ah(F#)&*@C0C$0X140AT$tb
zzKqRs*rXlYAa(g`&ML8JVr<%25RtmZ8)rx@?p-%FHq{m+f;C#WT^a_^C}j;h{>(ul
z%~A`}04k&U`#_*sn^a}2WnI=smEl_}c3m3eEJ}6U`%nXgni|{IRVEglowzOS_V<Zp
zNviLv-IH2+)|q5MMwv7AhJ;?X&J4E?t*L{X)vdLDtoC&)zY8F_^_z8b)h5cul&fN`
z*zp+gJR(oq6DDd-525JeIw}f$53S<PasaX8g}UZas^fFoouR%EWZr&;{R63~^D`m4
zt}t}<y5>w5cFwOOkZzjl`0gv8dbuWFsy%8e=z|?6r*(2nXcoQ~LN=MEYQMelXW3__
z3;gI~@#Mi5G|41K7E%P#<QONC<Eiv-ONm7(m_Q_sMJfU*Ol}@vy&wSa3&o1$E|^M?
QRR91007*qoM6N<$f{R1<w*UYD

literal 0
HcmV?d00001

diff --git a/sec-beidou/src/main/resources/static/images/loc_blue.png b/sec-beidou/src/main/resources/static/images/loc_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..791c8bf376adabab83153a2c81552921375eda5c
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^AhrMp8<5nmf9C+CI14-?iy0WWg+Q3`(%rg0K*3p_
zE{-7@6W2}*<UMS_<1&9WqehE^#1se37DtH|C$5$rN69-+)Yksl=sI`HWF6~$!Ed}L
zY+=`E*7}jizy9+{_KEvk`VLtMTwCV&+2P8%Ni%kIcqTE&F;_mWGb(;sxyITm@z`SD
zte*!;jsJ_!ns}ySR^Zu)N9*=JkNLFKyL`u&_)jv~&rk8rINV|#;8c6S)N6t0mfDJ(
d_iGn?VcV^<f#0aluO8@122WQ%mvv4FO#lhvTJZn?

literal 0
HcmV?d00001

diff --git a/sec-beidou/src/main/resources/static/images/loc_green.png b/sec-beidou/src/main/resources/static/images/loc_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..b61acf20feadd704f9b8c50148429285bb20d05c
GIT binary patch
literal 938
zcmV;b16BNqP)<h;3K|Lk000e1NJLTq001ih002V>1^@s61^WE=00009a7bBm001r{
z001r{0eGc9b^rhaTuDShRA_<in*EX5Fc8I8H~bGBKnJ0N<0=SO0Zs)m6&P0#QbD*5
zxC-Ly04fM{02L^+%u^zaWJxx%;f6QkIpz@dPpi*;vXD|z6Ny}mh-gAYV_dopM6|(G
z$V?s@J*zIP$VEa#DG_}M_}Lo~tz;&PTF(rH6}gxa(UORUbsh+P5K$sCxeI!>FRaML
zfTKc0U+XhoXf89k^eyZK3(z94$$j-EGnx35ed-vLH50j5`4p^#Z2?q?ffuequE;K0
z09DFFE+$n4tg!gu_gG{WRd$D}$U2)Pf`*vC{b5BecqMx70G6tPWQ(lVR1!%;1j`$C
z+9532f^`9ljY*TG^cwPx?5G78myF}Z1Z%9-Eyx5rxF^_~l?k@dZa$_=u$y~=4cfg&
z(uWr;QjLAbu*TN44X|}w7N?B6FB`1a&OMU$GL!z1MPXyVX+goeF6wAM%TcwqsudPS
z#LsA0W>s!YeR8mEWI(0d<<vNRgO)N}FYmy)H-MQoi5TJQnH+Qu{N5PtTytMg`n1N}
z#Sibn^1QggxtYur=xbkZv2=H9CL3>-i=vc2@pN>x#pUiZg`3p_HkKZ+vGjnAr3Y**
zJz!($0UJx78<w+OWW2RyJ34Zy=K(jyQIpCB`uM+hR;t}=gtVT|x(IG%p)OZWW`xB}
zQ$w1fi%+tbHWSUFq?Bm#=NT@3?iQxt%9H|~!2)vC;ZZ0jpFh|M;y`c~twaCov&dHe
z1c1H=MwO5}9zDu&Yi68i>izpk1O4T=!5*pfoQPgzCWDVmQ8{kC7fvQ&npDAaHz^cw
z4^3|a-NVpWhZ+(Uzz1zmorHHA5)9<>80mvy(zDo%T-&tDE48RRD7-2N)1$zYxG=nw
z@yyY+O<m)fkxUSU5vHP`$|CBi$i)r=P1nE%%cC(3bx=^g(Yp%hpT>I#TAU{P--hpw
zh|=m>{nY_EMW3CSSY###C;Ld`V(oYnZd+Pu8XuV=f@7?Vrh%pFRc3OnU<a53edpLC
z%(k62h<26%HP%kr)#s2!=bP&LXT}^}1WO&YY)gB1xc{fPvWti)r-pUBEp4&PUd$ww
zmM11_wd0C;0K!f<cf-oXC-jw6H6YYy{_9%_)z4Ynv<$WJ-d_;WU#(<a8f2g<5&!@I
M07*qoM6N<$f|WwBIRF3v

literal 0
HcmV?d00001

diff --git a/sec-beidou/src/main/resources/static/images/loc_red.png b/sec-beidou/src/main/resources/static/images/loc_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..750c6b4c1e57a857b3b28235c41183cfd8e17979
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^AhrMp8<5nmf9C+CI14-?iy0WWg+Q3`(%rg0K*5=w
zE{-7@6W2}*<UMS_<1&9WBS(va#1tpZ7AJ`oC$5$rN69-+)Mo$L=(^U#J51;P<hkAx
zt_Y<$imphvt%~iRQ1?XUpcO+lvm);TJ8z#kJ)D{B^O*N!UOzLZLeBbyL|S(I)??pT
zjsLTsHA>?@qm_2r{p0R!^RjQ=o%XKa<^Ct>Yhty{6<T@A7qtA6J*l2{Q0>Nkn{D6C
b9P1b@R&U_XYfzd7bR>hPtDnm{r-UW|TFz79

literal 0
HcmV?d00001

diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html
index a0683be6..e737ad16 100644
--- a/sec-beidou/src/main/resources/templates/page/device_overview.html
+++ b/sec-beidou/src/main/resources/templates/page/device_overview.html
@@ -82,6 +82,7 @@
         var point = new BMapGL.Point(116.404, 39.915);
         map.centerAndZoom(point, 7);
         map.enableScrollWheelZoom(true);
+        //map.setMapType(BMAP_SATELLITE_MAP);
         var centerLat = 0;
         var centerLon = 0;
         var deviceList=
@@ -92,6 +93,8 @@
                         longitude:[[${device.longitude}]]},
                     [/]
             ];
+        var loc_green = new BMapGL.Icon("../images/loc1_green.png", new BMapGL.Size(18, 24));
+
         //console.log(deviceList);
         for(var i=0; i<deviceList.length; i++) {
             centerLat += deviceList[i].latitude;
@@ -103,11 +106,14 @@
             map.setCenter(new BMapGL.Point(centerLon,centerLat));
         }
 
+
         translateCallback = function (data){
             if(data.status === 0) {
                 var i=0;
                 for(; i<data.points.length; i++) {
-                    map.addOverlay(new BMapGL.Marker(data.points[i]));
+                    map.addOverlay(new BMapGL.Marker(data.points[i],{
+                        icon:loc_green
+                    }));
                 }
             }
         }