From 1d99654c8d0bed5c46365f53b878fc2fa262d74e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 9 Jun 2020 18:13:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=20fix=20UI-785=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=AF=AD=E9=9F=B3=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/share/manager/UploadHelper.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 27133e2c38..a8b09e459d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -2,6 +2,7 @@ package com.mogo.module.share.manager import android.content.Context import android.content.Intent +import com.mogo.commons.voice.AIAssist import com.mogo.module.share.ShareControl import com.mogo.module.share.dialog.LaucherShareDialog import com.mogo.utils.logger.Logger @@ -12,6 +13,7 @@ import com.mogo.utils.logger.Logger object UploadHelper { fun upload(context:Context, type: String) { ServiceApisManager.serviceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true) + AIAssist.getInstance(context).speakTTSVoice("感谢分享，正在上传") Logger.d("UploadHelper", "upload ----> $type") val intent = Intent() intent.action = "com.zhidao.share.roadcondition.action" From b96ac7e6cfb133ebdfc5cfacb416db072e557e83 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 9 Jun 2020 18:14:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug=20fix=20UI-777=20=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E7=A7=AF=E5=86=B0=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E7=BB=93=E5=86=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/launcher_dialog_share_2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index 290602f73e..e3a6a7987d 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -147,7 +147,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableTop="@drawable/share_road_icy" - android:text="道路积冰" + android:text="道路结冰" android:textSize="@dimen/dp_32" android:textColor="#fff" app:layout_constraintTop_toBottomOf="@+id/tvAccident" From 79ada8020c8d167f02274bf4bf00c66386d4f64d Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 11 Jun 2020 14:56:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[m]=E5=9F=8B=E7=82=B9-=E5=88=86=E4=BA=AB/?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB,V2X=20=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/extensions/ExtensionsModuleConst.java | 4 ++-- .../com/mogo/module/extensions/entrance/EntranceFragment.java | 2 +- .../java/com/mogo/module/share/constant/ShareConstants.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index aab4fbee5b..4c5a0fe623 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -65,9 +65,9 @@ public class ExtensionsModuleConst { //埋点 //分享分类 1：路况，2：油价，3：交通检查，4：封路 - public static final String LAUNCHER_SHARE_TYPE = "Launcher_Share_type"; + public static final String LAUNCHER_SHARE_TYPE = "v2x_share_type"; //分享/上报按钮点击 from=1 手动点击 from=2 语音打开 - public static final String LAUNCHER_SHARE_CLICK = "Launcher_Share_Click"; + public static final String LAUNCHER_SHARE_CLICK = "v2x_share_click"; public static final String CARNET_USER_UPLOAD = "CarNet_user_upload"; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index eb4f1747a3..9648fe49a8 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -466,7 +466,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent private void traceData( String from ) { Map< String, Object > properties = new HashMap<>(); properties.put( "from", from ); - mAnalytics.track( "Launcher_Share_Click", properties ); + mAnalytics.track( "v2x_share_click", properties ); } @Override diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java index 2e49900c62..58b2102045 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java @@ -11,7 +11,7 @@ public class ShareConstants { /** * 分享分类 */ - public static final String LAUNCHER_SHARE_TYPE = "Launcher_Share_type"; + public static final String LAUNCHER_SHARE_TYPE = "v2x_share_type"; /** * 分享/上报按钮点击 */ From 7f0d9ba9c20d55044fb88d5104353e39c2f9bb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 11 Jun 2020 15:22:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 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 e47b270df9..e12c0d794b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -70,7 +70,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.2 +MOGO_MODULE_V2X_VERSION=1.1.3 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From 082a5be9098011c80888d40f21420f808df52a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 11 Jun 2020 15:29:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=B2=BE=E8=87=B4=E8=BD=A6=E8=BE=86=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E9=97=AE=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 e12c0d794b..1c95496670 100644 --- a/gradle.properties +++ b/gradle.properties @@ -70,7 +70,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.3 +MOGO_MODULE_V2X_VERSION=1.1.4 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From 708b33a79c9b8bc5992de1cb6bdb33b383b8c985 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 11 Jun 2020 15:34:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=20fix=20UI-751=20=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E5=A6=82=E6=9E=9C=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=9D=A1=E6=9C=AA=E4=B8=8A=E6=8A=A5=E5=AE=8C=E6=88=90=E5=B0=B1?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=8A=E6=8A=A5=EF=BC=8C=E4=BC=9Atoast?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=B8=8A=E6=8A=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../share/dialog/LaucherShareDialog.java | 4 ---- .../mogo/module/share/manager/UploadHelper.kt | 24 ++++++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 519f098dea..5c685d1836 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -1,15 +1,12 @@ package com.mogo.module.share.dialog; import android.content.Context; -import android.content.Intent; import android.graphics.PixelFormat; -import android.net.Uri; import android.os.Build; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; -import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -17,7 +14,6 @@ import androidx.annotation.NonNull; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.common.utils.CarSeries; import com.mogo.module.share.R; -import com.mogo.module.share.ShareControl; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.manager.ISeekHelpListener; import com.mogo.module.share.manager.SeekHelpManager; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index a8b09e459d..545ab05cce 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -5,6 +5,7 @@ import android.content.Intent import com.mogo.commons.voice.AIAssist import com.mogo.module.share.ShareControl import com.mogo.module.share.dialog.LaucherShareDialog +import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger /** @@ -12,14 +13,19 @@ import com.mogo.utils.logger.Logger */ object UploadHelper { fun upload(context:Context, type: String) { - ServiceApisManager.serviceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true) - AIAssist.getInstance(context).speakTTSVoice("感谢分享，正在上传") - Logger.d("UploadHelper", "upload ----> $type") - val intent = Intent() - intent.action = "com.zhidao.share.roadcondition.action" - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) - intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) - intent.putExtra("type", type) - context.sendBroadcast(intent) + if(ServiceApisManager.serviceApis.statusManagerApi.isUploading){ + Logger.d("UploadHelper", "正在上报===") + TipToast.tip("正在上报，请稍后重试") + }else { + ServiceApisManager.serviceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true) + AIAssist.getInstance(context).speakTTSVoice("感谢分享，正在上传") + Logger.d("UploadHelper", "upload ----> $type") + val intent = Intent() + intent.action = "com.zhidao.share.roadcondition.action" + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) + intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) + intent.putExtra("type", type) + context.sendBroadcast(intent) + } } } \ No newline at end of file