diff options
| author |   zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-06-27 17:14:25 +0900 |
|---|---|---|
| committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-06-27 17:14:25 +0900 |
| commit | 68a2b858f18dcf5d28ba2170b24a0399b4e9486f (patch) | |
| tree | 9b49b7bd97229242bff494899fa9c8a4aead4e59 | |
| parent | ed2c6515f302187f990bb2db287dc17d00369c44 (diff) | |
fix bug
| -rw-r--r-- | app/BtnGuidance.qml | 2 | ||||
| -rw-r--r-- | app/ProgressNextCross.qml | 4 | ||||
| -rw-r--r-- | app/main.cpp | 2 | ||||
| -rwxr-xr-x | app/navigation.qml | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml index 0e66a12..7c05bc9 100644 --- a/app/BtnGuidance.qml +++ b/app/BtnGuidance.qml @@ -12,7 +12,7 @@ Item { property int sts_guide: 0 onSts_guideChanged: { - console.log("onSts_guideChanged") + //console.log("onSts_guideChanged") switch(btn_guidance.sts_guide){ case 0: if (root.st_demo_state === true){ diff --git a/app/ProgressNextCross.qml b/app/ProgressNextCross.qml index 31e552c..5505c55 100644 --- a/app/ProgressNextCross.qml +++ b/app/ProgressNextCross.qml @@ -11,12 +11,10 @@ Item { // distance to next cross. (unit = meter) // when over the ProgressBar.maximumValue/m, progress bar indicates max (same as ProgressBar.maximumValue/m) function setProgress(val) { - if ( (0 < val) && (val < bar.maximumValue ) ) { + if ( (0 <= val) && (val < bar.maximumValue ) ) { bar.value = val }else if ( bar.maximumValue < val ){ bar.value = bar.maximumValue - }else{ - bar.value = 0 } } diff --git a/app/main.cpp b/app/main.cpp index f45df99..ee9baca 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -138,7 +138,6 @@ int main(int argc, char *argv[]) QObject *root = engine.rootObjects().first(); QQuickWindow *window = qobject_cast<QQuickWindow *>(root); qhsHandler->setQuickWindow(window); - /*Homescreen notify navigation start*/ qhsHandler->set_event_handler(QLibHomeScreen::Event_StartNavigation, [root](json_object *object){ // QMetaObject::invokeMethod(root,"vui_startguidance"); @@ -153,7 +152,6 @@ int main(int argc, char *argv[]) }); /*Homescreen notify navigation end*/ - #else // for only libwindowmanager QGuiApplication app(argc, argv); app.setApplicationName("navigation"); diff --git a/app/navigation.qml b/app/navigation.qml index fc5ef3a..65f3219 100755 --- a/app/navigation.qml +++ b/app/navigation.qml @@ -936,7 +936,7 @@ ApplicationWindow { console.log("navi:car_accumulated_distance======" + car_accumulated_distance) car_accumulated_distance += car_driving_distance - do_setdemorouteinfo(map.currentpostion.latitude,map.currentpostion.longitude,next_direction,next_cross_distance) + do_setdemorouteinfo(map.currentpostion.latitude,map.currentpostion.longitude,root.car_direction,next_cross_distance) if(btn_present_position.state === "Flowing") { |