From 659a4807da0fca400dc6823fbd3d26f70b842dbd Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 24 Apr 2023 21:06:11 +0800 Subject: [PATCH 01/14] =?UTF-8?q?[=E5=A4=A7=E7=90=86]release=20v3.1.2(HdMa?= =?UTF-8?q?p=20sdk=202.12.1.1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index afacfe1894..57f11567b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.6.6 MOGO_TELEMATIC_VERSION=1.4.6.6 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.12.0.11 +MAP_SDK_VERSION=2.12.1.1 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=3010000 -versionName=3.1.0 +versionCode=3010200 +versionName=3.1.2 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From b246984f995dafc377f11e7aecaca735b6fd838c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 25 Apr 2023 17:21:10 +0800 Subject: [PATCH 02/14] =?UTF-8?q?[=E7=A6=8F=E5=B7=9E3.1.4]=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=8D=87=E7=BA=A7=E4=B8=BA3.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 57f11567b4..6109a687e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=3010200 -versionName=3.1.2 +versionCode=3010400 +versionName=3.1.4 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From e02f900d35ef2e40a08dbadc13127a4360c722ea Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 25 Apr 2023 17:23:05 +0800 Subject: [PATCH 03/14] =?UTF-8?q?[=E7=A6=8F=E5=B7=9E2.1.4]=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=8D=87=E7=BA=A7=E4=B8=BA2.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index afacfe1894..dad16eaa3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=3010000 -versionName=3.1.0 +versionCode=2010400 +versionName=2.1.4 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From 9aa257ef57c9aaff3290aa0d72b8099ceaa45c07 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 26 Apr 2023 11:59:34 +0800 Subject: [PATCH 04/14] =?UTF-8?q?[=E7=A6=8F=E5=B7=9E3.1.4]=20=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E5=8F=B8=E6=9C=BA=E7=AB=AF=E7=BB=91=E5=AE=9A=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/urlConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index 5bba240f8e..0ef106a83e 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -124,7 +124,7 @@ "socket_tech_url": "https://mogogo-driver.zhidaozhixing.com/arch/", "eagle_mis_url": "https://mogogo.zhidaozhixing.com/", "eagle_dns_url": "https://mogogo.zhidaozhixing.com/", - "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s", + "bind_driver_qr_url": "https://och-mini-mogogo.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s", "chart_socket_url":"" }, "demo": { From b9a721faee8cb09e3595fb783fa1388fb20886c9 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 26 Apr 2023 19:33:25 +0800 Subject: [PATCH 05/14] =?UTF-8?q?[3.1.4]=20=E6=9B=B4=E6=96=B0=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E7=89=88=E6=9C=AC=E5=8F=B7=203.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11dee921e0..6109a687e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=2010400 -versionName=2.1.4 +versionCode=3010400 +versionName=3.1.4 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From d924f2f7464df8e315b817491c1072d74cca38cc Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 8 May 2023 16:31:56 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=AF=8F?= =?UTF-8?q?=E6=AC=A1=E9=A6=96=E9=A1=B5=E5=90=AF=E5=8A=A8=E6=97=B6=E7=9A=84?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E4=B8=BB=E5=B1=8F=E5=B9=95=20=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=A3=80=E6=9F=A5=EF=BC=9B=20refactor:=20?= =?UTF-8?q?=E5=BC=80=E6=9C=BA=E5=B9=BF=E6=92=AD=20manifest=20xml=E4=B8=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/AndroidManifest.xml | 12 ++++++++-- .../hmi/receiver/BootCompleteReceiver.kt | 22 +++++++++++++++++++ .../function/main/MainLauncherActivity.java | 22 +++++++++++++++++-- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/BootCompleteReceiver.kt diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index 05975cc293..2642df0efb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -32,6 +32,7 @@ + @@ -69,8 +70,6 @@ - - + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/BootCompleteReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/BootCompleteReceiver.kt new file mode 100644 index 0000000000..700064685e --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/BootCompleteReceiver.kt @@ -0,0 +1,22 @@ +package com.mogo.eagle.core.function.hmi.receiver + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.util.Log +import com.mogo.eagle.core.utilcode.util.AppUtils + +/** + * 开机启动广播 + */ +class BootCompleteReceiver : BroadcastReceiver() { + val TAG = "BootCompleteReceiver" + + override fun onReceive(context: Context, intent: Intent) { + if (Intent.ACTION_BOOT_COMPLETED == intent.action) { + Log.d(TAG, "ACTION_BOOT_COMPLETED") + val packageName = AppUtils.getAppPackageName() + AppUtils.launchApp(packageName) + } + } +} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 3d8721a439..584304db06 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -27,8 +27,8 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.ActivityUtils; -import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils; import com.rousetime.android_startup.model.CostTimesModel; import com.zhjt.service.chain.ChainLog; import com.zhjt.service.chain.TracingConstants; @@ -49,6 +49,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis private final static Handler handlerV2XEvent = new Handler(); private static Runnable runnableV2XEvent; + private static long lastKeyDownTimeMillis; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -59,7 +61,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void onResume() { super.onResume(); - ActivityUtils.setDefaultL(this); + //ActivityUtils.setDefaultL(this); } @Override @@ -185,9 +187,25 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override public boolean onKeyDown(int keyCode, KeyEvent event) { + long currentTimeMillis = System.currentTimeMillis(); + if (keyCode == KeyEvent.KEYCODE_BACK) { + if (currentTimeMillis - lastKeyDownTimeMillis < 2000) { + finish(); + System.exit(0); + } else { + ToastUtils.showLong(R.string.hint_exit_app_again); + lastKeyDownTimeMillis = System.currentTimeMillis(); + } + return true; + } return super.onKeyDown(keyCode, event); } + @Override + public void onBackPressed() { + super.onBackPressed(); + } + /** * 魔方按键分发 * From f975cfb9bcd1ba26bcd3f1db87e7d95fbded1130 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 May 2023 21:40:17 +0800 Subject: [PATCH 07/14] =?UTF-8?q?[tianjin]=20[=E6=AD=A3=E5=BC=8F=E5=8C=85?= =?UTF-8?q?=E7=9A=84url]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/urlConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index 0ef106a83e..d4e336ca24 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -117,7 +117,7 @@ "chart_socket_url":"" }, "online": { - "och_url": "https://tech.zhidaohulian.com", + "och_url": "https://mogogo-driver.zhidaozhixing.com", "shuttle_url": "https://mogogo-driver.zhidaozhixing.com", "passport_url": "https://mogogo-driver.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://mogogo-driver.zhidaozhixing.com/arch/push/", From d12b55c6d36af232018f078166f47dfe55943de3 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 May 2023 21:45:38 +0800 Subject: [PATCH 08/14] =?UTF-8?q?[tianjin]=20[2.1.6]=20[=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6109a687e5..4637906cb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=3010400 -versionName=3.1.4 +versionCode=2010600 +versionName=2.1.6 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From 562bb8dbb96bb543cf2c3889dbe8750a1d6b2332 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 May 2023 21:46:30 +0800 Subject: [PATCH 09/14] =?UTF-8?q?[tianjin]=20[3.1.6]=20[=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6109a687e5..023d28d485 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=3010400 -versionName=3.1.4 +versionCode=3010600 +versionName=3.1.6 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From 7a3e9a4abc5a8ad3ad72656aba0ab289fb27fd8e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 May 2023 22:29:13 +0800 Subject: [PATCH 10/14] [tianjin] [3.1.6] [string] --- .../mogo-core-function-hmi/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index bcfc49ef69..4405bcf976 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -78,4 +78,5 @@ 请检查定位是否正常 确定 重试 + 再按一次退出应用 From 05f07320b219fa2236088fdd7143e090cbebd450 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 8 May 2023 22:29:13 +0800 Subject: [PATCH 11/14] [tianjin] [3.1.6] [string] --- .../mogo-core-function-hmi/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index bcfc49ef69..4405bcf976 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -78,4 +78,5 @@ 请检查定位是否正常 确定 重试 + 再按一次退出应用 From 04169052c8fa424f77c562fbafb55016d162f3db Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 9 May 2023 19:38:35 +0800 Subject: [PATCH 12/14] =?UTF-8?q?[MogoGo]=E5=A4=A9=E6=B4=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=9A=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84qa?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/urlConfig.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index d4e336ca24..18b1da50f8 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -106,14 +106,14 @@ }, "fuzhou": { "qa": { - "och_url": "https://och-a.zhidaozhixing.com", - "shuttle_url": "https://och-a.zhidaozhixing.com", - "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", - "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", - "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", - "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", - "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/", - "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s", + "och_url": "https://mogogo-driver-qa.zhidaozhixing.com", + "shuttle_url": "https://mogogo-driver-qa.zhidaozhixing.com", + "passport_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/passport/", + "socket_base_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/push/", + "socket_tech_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/", + "eagle_mis_url": "https://mogogo-qa.zhidaozhixing.com/", + "eagle_dns_url": "https://mogogo-qa.zhidaozhixing.com/", + "bind_driver_qr_url": "https://och-mini-mogogo-qa.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s", "chart_socket_url":"" }, "online": { From 3b21672300bf28da1f16c8eddf4ac9988735fcdc Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 9 May 2023 20:15:12 +0800 Subject: [PATCH 13/14] =?UTF-8?q?[MogoGo]=E5=A4=A9=E6=B4=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=9A=E5=8F=B8=E6=9C=BA=E6=8F=90=E4=BE=9B=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E7=9A=84=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E4=B8=8D=E5=8C=BA=E5=88=86=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/urlConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index 18b1da50f8..e65827e851 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -113,7 +113,7 @@ "socket_tech_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/", "eagle_mis_url": "https://mogogo-qa.zhidaozhixing.com/", "eagle_dns_url": "https://mogogo-qa.zhidaozhixing.com/", - "bind_driver_qr_url": "https://och-mini-mogogo-qa.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s", + "bind_driver_qr_url": "https://och-mini-mogogo.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s", "chart_socket_url":"" }, "online": { From a802d8cd46b7486da8b0d5ae5f57d5f3fccc74e4 Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 15 May 2023 19:48:27 +0800 Subject: [PATCH 14/14] =?UTF-8?q?[MogoGo]=E5=A4=A9=E6=B4=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=9A=E4=B9=98=E5=AE=A2app=20release=20v2.1.6=20?= =?UTF-8?q?=EF=BC=88=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=9F=BA=E4=BA=8EHdMap=20s?= =?UTF-8?q?dk=202.12.1.1=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=A7=A3=E5=86=B3=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-map/src/main/java/com/mogo/map/AMapWrapper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 6924f0926f..33d344f106 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -141,8 +141,8 @@ public class AMapWrapper implements IMogoMap { batchMarkerOptions.delayStrategy = false; batchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f; batchMarkerOptions.controlIcon = 1; - batchMarkerOptions.duration = (int) time; - batchMarkerOptions.deleteRule = 1; + batchMarkerOptions.satelliteTime = time; + batchMarkerOptions.deleteRule = 0; MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions); } @@ -173,8 +173,8 @@ public class AMapWrapper implements IMogoMap { aiBatchMarkerOptions.delayStrategy = false; aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f; aiBatchMarkerOptions.controlIcon = 1; - aiBatchMarkerOptions.duration = (int) time; - aiBatchMarkerOptions.deleteRule = 1; + aiBatchMarkerOptions.satelliteTime = time; + aiBatchMarkerOptions.deleteRule = 0; MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions); }