From 2acd1f24c20f73785fe1b54a3d82cd747ab23209 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 23 Jun 2020 11:07:43 +0800 Subject: [PATCH 1/3] upgrade tanlu version --- .idea/misc.xml | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9661d65a5b..9ca7aeeb83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.5 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.2.1.2 +MOGO_MODULE_TANLU_VERSION=1.2.1.5 # 车聊聊 CARCHATTING_VERSION=1.1.9 # 车聊聊接口 @@ -77,7 +77,7 @@ MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.2.1.2 +TANLULIB_VERSION=1.2.1.5 ## 产品库必备配置 applicationId=com.mogo.launcer From d2766c87ceb6f530355917ea768739189c6a4822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 11:39:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statusmanager/IMogoStatusChangedListener.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java index 47a501fb53..908af22c34 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java @@ -13,14 +13,4 @@ public interface IMogoStatusChangedListener { * @param isTrue true - accOn、adas ui show、voice ui show、push ui show、v2x ui show */ void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ); - - /** - * 是否需要黏性状态： 先改变状态，后注册监听 - * - * @param descriptor 状态 - * @return 默认不需要 - */ - default boolean requestStickyStatus( StatusDescriptor descriptor ) { - return false; - } } From e9c3f13b742f674967b008987c33ad009a594b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 11:53:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 54 +++++++++---------- .../impl/statusmanager/MogoStatusManager.java | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9ca7aeeb83..33ed372823 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,34 +27,34 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.1.5 -MOGO_UTILS_VERSION=1.2.1.5 -MAP_AMAP_VERSION=1.2.1.5 -MAP_AUTONAVI_VERSION=1.2.1.5 -MOGO_MAP_VERSION=1.2.1.5 -MOGO_MAP_API_VERSION=1.2.1.5 -MOGO_SERVICE_VERSION=1.2.1.5 -MOGO_SERVICE_API_VERSION=1.2.1.5 -MOGO_CONNECTION_VERSION=1.2.1.5 -MOGO_MODULE_APPS_VERSION=1.2.1.5 -MOGO_MODULE_NAVI_VERSION=1.2.1.5 -MOGO_MODULE_SHARE_VERSION=1.2.1.5 -MOGO_MODULE_COMMON_VERSION=1.2.1.5 -MOGO_MODULE_MAIN_VERSION=1.2.1.5 -MOGO_MODULE_MAP_VERSION=1.2.1.5 -MOGO_MODULE_SERVICE_VERSION=1.2.1.5 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.5 -MOGO_MODULE_SEARCH_VERSION=1.2.1.5 -MOGO_MODULE_BACK_VERSION=1.2.1.5 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.5 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.5 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.5 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.5 -MOGO_MODULE_GUIDE_VERSION=1.2.1.5 -MOGO_MODULE_MEDIA_VERSION=1.2.1.5 +MOGO_COMMONS_VERSION=1.2.1.8 +MOGO_UTILS_VERSION=1.2.1.8 +MAP_AMAP_VERSION=1.2.1.8 +MAP_AUTONAVI_VERSION=1.2.1.8 +MOGO_MAP_VERSION=1.2.1.8 +MOGO_MAP_API_VERSION=1.2.1.8 +MOGO_SERVICE_VERSION=1.2.1.8 +MOGO_SERVICE_API_VERSION=1.2.1.8 +MOGO_CONNECTION_VERSION=1.2.1.8 +MOGO_MODULE_APPS_VERSION=1.2.1.8 +MOGO_MODULE_NAVI_VERSION=1.2.1.8 +MOGO_MODULE_SHARE_VERSION=1.2.1.8 +MOGO_MODULE_COMMON_VERSION=1.2.1.8 +MOGO_MODULE_MAIN_VERSION=1.2.1.8 +MOGO_MODULE_MAP_VERSION=1.2.1.8 +MOGO_MODULE_SERVICE_VERSION=1.2.1.8 +MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.8 +MOGO_MODULE_SEARCH_VERSION=1.2.1.8 +MOGO_MODULE_BACK_VERSION=1.2.1.8 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.8 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.8 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.8 +MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.8 +MOGO_MODULE_GUIDE_VERSION=1.2.1.8 +MOGO_MODULE_MEDIA_VERSION=1.2.1.8 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.5 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.5 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.8 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.8 ## 工程外部模块 diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index a16ca51607..43eb1b4769 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -237,7 +237,7 @@ public class MogoStatusManager implements IMogoStatusManager { } mListeners.get( descriptor ).add( listener ); - if ( listener instanceof IMogoStickyStatusChangedListener && listener.requestStickyStatus( descriptor ) ) { + if ( listener instanceof IMogoStickyStatusChangedListener && ((IMogoStickyStatusChangedListener)listener).requestStickyStatus( descriptor ) ) { Boolean val = mStatus.get( descriptor ); if ( val != null ) { listener.onStatusChanged( descriptor, get_bool_val( descriptor ) );