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/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"; /** * 分享/上报按钮点击 */ 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 27133e2c38..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 @@ -2,8 +2,10 @@ 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.TipToast import com.mogo.utils.logger.Logger /** @@ -11,13 +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) - 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 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"