fix bug

6 files changed, 83 insertions, 5 deletions

diff --git a/app/ArrivedDesDialog.qml b/app/ArrivedDesDialog.qml
index e1ea5c4..d352b04 100644
--- a/app/ArrivedDesDialog.qml
+++ b/app/ArrivedDesDialog.qml
@@ -62,7 +62,7 @@ Rectangle {
             spacing: 10
             Image {
                 id: dsp_mark
-                source: dsp_icon
+//                source: dsp_icon
                 Layout.maximumHeight: 120
                 Layout.maximumWidth:  120
             }
diff --git a/app/images/images.qrc b/app/images/images.qrc
index e710ac2..3cd9b1b 100644
--- a/app/images/images.qrc
+++ b/app/images/images.qrc
@@ -25,5 +25,6 @@
         <file>MUTCD_RS-113.svg</file>

         <file>posimark_r.png</file>

         <file>position02.svg</file>

+        <file>DividingLine.svg</file>

     </qresource>

 </RCC>

diff --git a/app/main.cpp b/app/main.cpp
index 1e71ada..ea3c7a4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
 	QLibHomeScreen* qhsHandler = new QLibHomeScreen();
     qhsHandler->init(port, secret.toStdString().c_str());
 	qhsHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [qwmHandler, myname](json_object *object){
-        qDebug("Surface %s got tapShortcut\n", myname);
+        qDebug("Surface %s got tapShortcut\n", qPrintable(myname));
         qwmHandler->activateWindow(myname);
 	});
 	// Load qml
diff --git a/app/navigation.qml b/app/navigation.qml
index 6b276b3..fe253cf 100755
--- a/app/navigation.qml
+++ b/app/navigation.qml
@@ -574,7 +574,7 @@ ApplicationWindow {
             map.currentpostion = QtPositioning.coordinate(car_position_lat, car_position_lon)
             car_accumulated_distance = 0
             do_setdemorouteinfo(car_position_lat, car_position_lon,car_direction,car_accumulated_distance)
-            do_setdemorouteinfo(car_direction,car_accumulated_distance)
+//            do_setdemorouteinfo(car_direction,car_accumulated_distance)
 
 
             routeQuery.clearWaypoints();
diff --git a/naviconfig.ini b/naviconfig.ini
index 9ccd705..349cc6d 100644
--- a/naviconfig.ini
+++ b/naviconfig.ini
@@ -2,7 +2,7 @@
 	"mapAccessToken": "pk.eyJ1Ijoid2FuZ2x1ZG9uZyIsImEiOiJjam4ycjFoMmYycnR6M3huMXI0Z3VtYzdhIn0.42wsmghdLYp_p73S9VnJxw",
 	"speed": 60,
 	"interval": 100,
-	"latitude": 36.1363,
-	"longitute": -115.151,
+	"latitude": 35.66730,
+	"longitute": 139.7498775,
 	"mapStyleUrls": "mapbox://styles/mapbox/streets-v10"
 }
diff --git a/package/icon.svg b/package/icon.svg
index e69de29..6f6f1e0 100755..100644
--- a/package/icon.svg
+++ b/package/icon.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Navigation" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 195 216.8"
+	 style="enable-background:new 0 0 195 216.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{font-family:'Roboto-Regular';}
+	.st2{font-size:11px;}
+	.st3{letter-spacing:2;}
+	.st4{fill:url(#SVGID_1_);}
+	.st5{fill:url(#SVGID_2_);}
+	.st6{fill:url(#SVGID_3_);}
+	.st7{fill:url(#SVGID_4_);}
+	.st8{fill:url(#SVGID_5_);}
+	.st9{fill:url(#SVGID_6_);}
+</style>
+<switch>
+	<g i:extraneous="self">
+		<g>
+			<g>
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="113.767" y1="186.3057" x2="79.8095" y2="21.0462">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st4" d="M103.9,107.1c0-3.5-2.8-6.4-6.4-6.4c-3.5,0-6.4,2.8-6.4,6.4s2.8,6.4,6.4,6.4
+					C101,113.5,103.9,110.7,103.9,107.1z M97.5,111.4c-2.3,0-4.2-1.9-4.2-4.2s1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2
+					S99.8,111.4,97.5,111.4z"/>
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="126.332" y1="183.7239" x2="92.3746" y2="18.4644">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st5" d="M110.2,105c-1.2,0-2.1,0.9-2.1,2.1c0,4.5-2.8,8.5-7.1,10c-0.8,0.3-1.4,1.1-1.4,2v15.3
+					c0,0.6,0.3,1.2,0.7,1.6c0.5,0.4,1.1,0.6,1.7,0.5c14.5-2.3,25.1-14.7,25.1-29.3c0-1.2-0.9-2.1-2.1-2.1H110.2z M101.7,134.3v-15.2
+					c4.9-1.8,8.5-6.4,8.5-12H125C125,120.9,114.9,132.3,101.7,134.3z"/>
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="115.4429" y1="185.9613" x2="81.4855" y2="20.7018">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st6" d="M97.5,77.5c-12.9,0-24.3,8.3-28.2,20.5c-0.2,0.6-0.1,1.3,0.4,1.9c0.4,0.6,1,0.8,1.7,0.8H88
+					c0.6,0,1.1-0.2,1.6-0.7c2-2.3,4.9-3.5,7.9-3.5c3,0,5.9,1.3,7.9,3.5c0.4,0.5,1,0.7,1.6,0.7h16.7c0.7,0,1.3-0.3,1.7-0.8
+					c0.4-0.6,0.6-1.3,0.4-1.9C121.8,85.8,110.3,77.5,97.5,77.5z M107,98.7c-2.3-2.6-5.7-4.2-9.5-4.2c-3.7,0-7.1,1.6-9.5,4.2H71.3
+					c3.5-11.1,13.9-19.1,26.2-19.1s22.7,8,26.2,19.1H107z"/>
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="113.495" y1="186.3616" x2="79.5375" y2="21.1021">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st7" d="M129.3,107.1c0,17.6-14.2,31.8-31.8,31.8s-31.8-14.2-31.8-31.8c0-0.3,0-0.5,0-0.8h-2.1c0,0.3,0,0.5,0,0.8
+					c0,18.7,15.2,33.9,33.9,33.9c18.7,0,33.9-15.2,33.9-33.9c0-0.3,0-0.5,0-0.8h-2.1C129.3,106.6,129.3,106.9,129.3,107.1z"/>
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="97.0455" y1="189.7416" x2="63.0881" y2="24.4821">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st8" d="M94,117.1c-4.2-1.5-7.1-5.4-7.1-10c0-1.2-0.9-2.1-2.1-2.1H70c-1.2,0-2.1,0.9-2.1,2.1
+					c0,14.6,10.7,27,25.1,29.3c0.6,0.1,1.2-0.1,1.7-0.5c0.5-0.4,0.7-1,0.7-1.6v-15.2C95.4,118.2,94.8,117.4,94,117.1z M93.3,134.3
+					c-13.2-2-23.3-13.4-23.3-27.2h14.8c0,5.5,3.5,10.2,8.5,12V134.3z"/>
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="115.5222" y1="185.9451" x2="81.5647" y2="20.6856">
+					<stop  offset="0" style="stop-color:#00ADDC"/>
+					<stop  offset="1" style="stop-color:#6BFBFF"/>
+				</linearGradient>
+				<path class="st9" d="M97.5,75.4c14.5,0,26.7,9.6,30.5,22.9h2.2c-3.9-14.4-17.1-25-32.7-25c-15.6,0-28.8,10.6-32.7,25H67
+					C70.8,85,83,75.4,97.5,75.4z"/>
+			</g>
+		</g>
+	</g>
+</switch>
+</svg>