From bdb3c48e90be7d390967c86cef031af5062bca7d Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 14 Jul 2020 16:13:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=8ELauncher?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=93=E5=BC=80=E5=88=86=E4=BA=AB=E6=A1=86?= =?UTF-8?q?=E7=9A=84=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/main/SchemeIntent.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index b477536dcf..d39eec80db 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -18,6 +18,9 @@ import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; +import java.util.HashMap; +import java.util.Map; + /** * @author congtaowang * @since 2020-04-20 @@ -82,6 +85,9 @@ public class SchemeIntent implements IMogoStatusChangedListener { break; case "/main/share": Logger.d(TAG,"收到打开分享框的scheme，准备打开分享框"); + Map< String, Object > properties = new HashMap<>(); + properties.put( "from", "1" ); + mApis.getAnalyticsApi().track("v2x_share_click", properties); mApis.getShareManager().showShareDialog(); break; default: From 133a6d50e3bf7002de5cbe29cca326c6b73d8ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 16 Jul 2020 11:22:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 886b2dda87..42e68d9837 100644 --- a/gradle.properties +++ b/gradle.properties @@ -72,7 +72,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.2.6 +MOGO_MODULE_V2X_VERSION=1.2.8 # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5.2 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.2 From 9cf8b755c02ce651b2981067031f392c5d7f5f8d Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 21 Jul 2020 15:26:22 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E5=8F=98=E7=BA=A2=E9=98=88=E5=80=BC=EF=BC=8C=E4=BB=8E40?= =?UTF-8?q?=E6=94=B9=E4=B8=BA90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/left/panel/fragment/SimpleSpeedFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt index d40529204e..be2d724a0e 100644 --- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt +++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt @@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.module_left_panel_simple_speed.* * * @author tongchenfei */ -private const val SPEED_THRESHOLD = 40 +private const val SPEED_THRESHOLD = 90 class SimpleSpeedFragment: MvpFragment() { override fun getLayoutId(): Int { return R.layout.module_left_panel_simple_speed From b8cc70951d295cb71297796915219f9df7e09c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 22 Jul 2020 20:02:36 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86window=E9=81=AE?= =?UTF-8?q?=E7=9B=96=E4=BA=8B=E4=BB=B6=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 42e68d9837..d4532298dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -72,7 +72,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.2.8 +MOGO_MODULE_V2X_VERSION=1.2.81 # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5.2 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.2 From 8ddaa75d9603f39bfe9b2c3fb4c21c7541954cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Jul 2020 11:21:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E5=8F=AF=E4=BB=A5=E6=94=AF=E6=8C=81=E7=9A=84cpu?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c1d72cebb5..b35f7638b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a' + abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" } } } From aed5c888bac9f1cbb9595f35943f99f646247f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Jul 2020 12:21:22 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=B0=86=E7=9B=B4=E6=92=AD=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E8=BF=9B=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 03961736bf..60fe3792ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.531 +MOGO_MODULE_V2X_VERSION=1.1.532 # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5.7 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 From bf1e603effd4b968a55617153d603338de949e14 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 23 Jul 2020 14:46:25 +0800 Subject: [PATCH 7/9] Keep v7a only. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b35f7638b5..29512bd868 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a" } } } From 4cc07ad763cc9a4eb3d08cd747a8948cacd40679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Jul 2020 16:45:39 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E8=AF=81=E5=8F=AF=E4=BB=A5=E6=92=AD=E5=87=BA=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 60fe3792ad..7ba83bc94d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.532 +MOGO_MODULE_V2X_VERSION=1.1.533 # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5.7 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 From 6e1fc460b6d222ef5a7e3ee627022c4df2448ec0 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 23 Jul 2020 19:42:27 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96acc=20off=E5=90=8E?= =?UTF-8?q?=E9=9F=B3=E4=B9=90=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/media/window/MediaWindow2.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index 0f76bd5d6d..bfc00ab218 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -11,6 +11,7 @@ import android.widget.TextView; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; +import com.mogo.module.media.MediaConstants; import com.mogo.module.media.R; import com.mogo.module.media.ServiceMediaHandler; import com.mogo.module.media.constants.MusicConstant; @@ -22,6 +23,8 @@ import com.mogo.module.media.view.IMusicView; import com.mogo.module.media.widget.AnimCircleImageView; import com.mogo.module.media.widget.NoScrollSeekBar; import com.mogo.module.media.widget.ScrollingTextView; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.WindowUtils; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; @@ -70,11 +73,20 @@ public class MediaWindow2 implements IMusicView { }); } + ServiceMediaHandler.getIMogoStatusManager().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS, (descriptor, isTrue) -> { + if (descriptor == StatusDescriptor.ACC_STATUS&&!isTrue) { + ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView); + mHasAddWindow = false; + } + }); + isFirstPlay = true; } private void addWindowView() { + Log.d(TAG, "addWindowView===" + mHasAddWindow); if (ServiceMediaHandler.getMogoWindowManager() == null) { + Log.d(TAG, "addWindowView return"); return; }