From 90d8d50cdbd34d4243ca7f2f6ca04dd3568902e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Feb 2020 17:58:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=B0=94=E6=B3=A1=E4=B8=8E=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E7=9A=84=E8=81=94=E5=8A=A8=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/service/marker/MapMarkerManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index e2950a5043..a4f2b866da 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -221,7 +221,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag if (alpha == 1) { try { // 使用TranslateAnimation,填写一个需要移动的目标点 - ScaleAnimation animationScale = new ScaleAnimation(0.5f, 1.2f, 0.5f, 1.2f); + ScaleAnimation animationScale = new ScaleAnimation(0.1f, 1.2f, 0.1f, 1.2f); animationScale.setDuration(500); animationScale.setFillMode(Animation.FILL_MODE_FORWARDS); @@ -233,10 +233,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag } catch (Exception e) { Logger.e(TAG, e, "error."); } - }else{ + } else { try { // 使用TranslateAnimation,填写一个需要移动的目标点 - ScaleAnimation animationScale = new ScaleAnimation(1.2f, 1f, 1.2f, 1f); + ScaleAnimation animationScale = new ScaleAnimation(1.2f, 0.9f, 1.2f, 0.9f); animationScale.setDuration(500); animationScale.setFillMode(Animation.FILL_MODE_FORWARDS); From f42ec6c65f1db01b76c9e4a1406990aac725a9e6 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 17 Feb 2020 19:03:46 +0800 Subject: [PATCH 2/4] opt ui --- .../src/main/res/layout/tanlu_item_video_cover.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml index 15c0e8e2c8..e56381d53e 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml @@ -70,8 +70,8 @@ Date: Mon, 17 Feb 2020 20:12:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/map/VoiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java index d68f8b471a..05a2a6dd1c 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java @@ -38,7 +38,7 @@ public class VoiceConstants { /** * 导航历史记录 */ - public static final String CMD_MAP_HISTORY = "com.ileja.navi.map.history"; + public static final String CMD_MAP_HISTORY = "com.zhidao.navi.history.query"; public static final String CMD_MAP_HISTORY_UN_WAKEUP = "CMD_MAP_HISTORY_UN_WAKEUP"; public static final String[] CMD_MAP_HISTORY_TRIGGER_WORDS = {"查询导航历史记录"}; From f0f0dd2fbc6cba8195d4c81c378f4bfde09c4934 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Mon, 17 Feb 2020 20:36:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java | 2 +- .../java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java index 377ae40f1c..3e46637f0f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java @@ -25,7 +25,7 @@ public class MapStyleUtils { route_overlay_line_very_traffic( Color.parseColor( "#E16262" ) ), route_overlay_line_traffic( Color.parseColor( "#E88181" ) ), transparent( Color.parseColor( "#00000000" ) ), - light_gray( Color.parseColor( "#CDD8FF" ) ); + light_gray( Color.parseColor( "#334BD089" ) ); private int color; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index d8ef97cacd..a6379b1fb4 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -191,7 +191,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB private fun startNavi() { SearchServiceHolder.getNavi() - .startNavi(!BuildConfig.DEBUG) + .startNavi(true) SearchServiceHolder.getMapUIController() .recoverLockMode() isStartedNavi = true