diff --git a/gradle.properties b/gradle.properties index 970ca5e84e..03719ac144 100644 --- a/gradle.properties +++ b/gradle.properties @@ -77,7 +77,7 @@ MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.2.1.6 +TANLULIB_VERSION=1.2.1.7 ## 产品库必备配置 diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 4ced0877b8..ae9b257292 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -43,6 +43,8 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.tanluupload + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomapapi 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 bc8988abcc..6cf876ad86 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 @@ -6,6 +6,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -56,6 +57,7 @@ import com.mogo.utils.LaunchUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; +import com.zhidao.roadcondition.service.DelayService; import java.util.ArrayList; import java.util.HashMap; @@ -525,6 +527,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent if ( mUploadRoadCondition == null ) { return; } + if ( descriptor == StatusDescriptor.UPLOADING ) { if ( isTrue ) { mUploading.setVisibility( View.VISIBLE ); @@ -561,6 +564,11 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mCameraMode.setVisibility( View.VISIBLE ); } } + } else if (descriptor == StatusDescriptor.ACC_STATUS) { + Log.d(TAG, " onStatusChanged isTrue = " + isTrue); + if ( isTrue ) { + DelayService.Companion.launchService(getContext()); + } } } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java index 75e49e751a..058866c6fb 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java @@ -109,11 +109,11 @@ public class KwPresenter extends BaseMediaPresenter { @Override public void play(MediaInfoData mediaInfoData) { -// if (kwapi.isKuwoRunning()) { + if (kwapi.isKuwoRunning()) { kwapi.setPlayState(PlayState.STATE_PLAY); -// } else { -// kwapi.randomPlayMusic(); -// } + } else { + kwapi.startAPP(true); + } } @Override @@ -139,6 +139,8 @@ public class KwPresenter extends BaseMediaPresenter { public void next() { if (kwapi.isKuwoRunning()) { kwapi.setPlayState(PlayState.STATE_NEXT); + }else{ + kwapi.startAPP(true); } } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 0fe8031300..fabec3de0d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -124,7 +124,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo mShareDialog.show(); } - private StepAfterAuth stepAfterAuth = new StepAfterAuth(-1, ""); + private StepAfterAuth stepAfterAuth = new StepAfterAuth(-1, "",false); @Override public void init(Context context) { @@ -141,7 +141,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo realShowDialog(); break; case STEP_AFTER_AUTH_TYPE_UPLOAD: - UploadHelper.INSTANCE.upload(mContext, stepAfterAuth.getUploadType()); + UploadHelper.INSTANCE.upload(mContext, stepAfterAuth.getUploadType(),stepAfterAuth.getForcePlayVoice()); dismissShareDialog(); break; case STEP_AFTER_AUTH_TYPE_SEEK_HELP: @@ -209,47 +209,47 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo break; case UNWAKE_UPLOAD_ROAD_BLOCK: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_BLOCK); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_BLOCK,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK); + UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK,false); } trackVoiceWithType(TYPE_BLOCK); break; case UNWAKE_UPLOAD_TRAFFIC_CHECK: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_TRAFFIC_CHECK); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_TRAFFIC_CHECK,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK); + UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK,false); } trackVoiceWithType(TYPE_TRAFFIC_CHECK); break; case UNWAKE_UPLOAD_ROAD_CLOSURE: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_CLOSURE); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_CLOSURE,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE); + UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE,false); } trackVoiceWithType(TYPE_CLOSURE); break; case UNWAKE_UPLOAD_ACCIDENT: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ACCIDENT); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ACCIDENT,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT); + UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT,false); } trackVoiceWithType(TYPE_ACCIDENT); break; case UNWAKE_UPLOAD_REAL_TIME_TRAFFIC: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_REAL_TIME_TRAFFIC); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_REAL_TIME_TRAFFIC,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC); + UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC,false); } trackVoiceWithType(TYPE_REAL_TIME_TRAFFIC); break; case UNWAKE_UPLOAD_SEEK_HELP: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_SEEK_HELP, TYPE_BLOCK); + goAuth(STEP_AFTER_AUTH_TYPE_SEEK_HELP, TYPE_BLOCK,false); } else { seekHelp(); } @@ -257,33 +257,33 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo break; case UNWAKE_UPLOAD_STAGNANT_WATER: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_STAGNANT_WATER); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_STAGNANT_WATER,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER); + UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER,false); } trackVoiceWithType(TYPE_STAGNANT_WATER); break; case UNWAKE_UPLOAD_ROAD_ICY: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_ICY); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_ICY,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY); + UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY,false); } trackVoiceWithType(TYPE_ROAD_ICY); break; case UNWAKE_UPLOAD_DENSE_FOG: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_DENSE_FOG); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_DENSE_FOG,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG); + UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG,false); } trackVoiceWithType(TYPE_DENSE_FOG); break; case UNWAKE_UPLOAD_ROAD_CONSTRUCTION: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_CONSTRUCTION); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_CONSTRUCTION,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION); + UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION,false); } trackVoiceWithType(TYPE_ROAD_CONSTRUCTION); break; @@ -307,7 +307,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo switch (intentStr) { case VOICE_CMD_PUB_TROUBLE_HELP: if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_SEEK_HELP, TYPE_DENSE_FOG); + goAuth(STEP_AFTER_AUTH_TYPE_SEEK_HELP, TYPE_DENSE_FOG,false); } else { // 开启服务，准备上报求助 seekHelp(); @@ -321,63 +321,63 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo switch (ob) { case "积水": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_STAGNANT_WATER); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_STAGNANT_WATER,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER); + UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER,false); dismissShareDialog(); } trackVoiceWithType(TYPE_STAGNANT_WATER); break; case "积冰": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_ICY); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_ICY,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY); + UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY,false); dismissShareDialog(); } trackVoiceWithType(TYPE_ROAD_ICY); break; case "雾": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_DENSE_FOG); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_DENSE_FOG,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG); + UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG,false); dismissShareDialog(); } trackVoiceWithType(TYPE_DENSE_FOG); break; case "交通事故": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ACCIDENT); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ACCIDENT,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT); + UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT,false); dismissShareDialog(); } trackVoiceWithType(TYPE_ACCIDENT); break; case "施工": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_CONSTRUCTION); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_ROAD_CONSTRUCTION,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION); + UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION,false); dismissShareDialog(); } trackVoiceWithType(TYPE_ROAD_CONSTRUCTION); break; case "封路": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_CLOSURE); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_CLOSURE,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE); + UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE,false); dismissShareDialog(); } trackVoiceWithType(TYPE_CLOSURE); break; case "交通检查": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_TRAFFIC_CHECK); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_TRAFFIC_CHECK,false); } else { - UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK); + UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK,false); dismissShareDialog(); } trackVoiceWithType(TYPE_TRAFFIC_CHECK); @@ -392,20 +392,20 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo switch (obCondition) { case "路况": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_REAL_TIME_TRAFFIC); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_REAL_TIME_TRAFFIC,false); } else { Logger.d(TAG, "分享框准备触发上报实时路况"); - UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC); + UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC,false); dismissShareDialog(); } trackVoiceWithType(TYPE_REAL_TIME_TRAFFIC); break; case "拥堵": if (needAuth()) { - goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_BLOCK); + goAuth(STEP_AFTER_AUTH_TYPE_UPLOAD, TYPE_BLOCK,false); } else { Logger.d(TAG, "分享框准备触发上报拥堵"); - UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK); + UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK,false); dismissShareDialog(); } trackVoiceWithType(TYPE_BLOCK); @@ -421,7 +421,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo break; case UNWAKE_UPLOAD_ROAD_CONDITION: Logger.d(TAG, "免唤醒准备触发上报拥堵"); - UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK); + UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK,false); dismissShareDialog(); break; default: @@ -443,9 +443,10 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo return authorizeModuleManager.needAuthorize(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE); } - private void goAuth(int type, String uploadType) { + private void goAuth(int type, String uploadType,boolean forcePlayVoice) { stepAfterAuth.setType(type); stepAfterAuth.setUploadType(uploadType); + stepAfterAuth.setForcePlayVoice(forcePlayVoice); authorizeModuleManager.invokeAuthorization(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE); } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/StepAfterAuth.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/StepAfterAuth.kt index d35dbaab2e..68e16ee164 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/StepAfterAuth.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/StepAfterAuth.kt @@ -3,7 +3,7 @@ package com.mogo.module.share.bean /** * 授权完成后，下一步要做的事情 */ -class StepAfterAuth(var type:Int,var uploadType:String) +class StepAfterAuth(var type:Int,var uploadType:String,var forcePlayVoice:Boolean = false) const val STEP_AFTER_AUTH_TYPE_SHOW_DIALOG = 1 const val STEP_AFTER_AUTH_TYPE_UPLOAD = 2 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 c00caf03df..30154abf9e 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 @@ -204,7 +204,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL * 发送广播 1拥堵，2交通检查，3封路 */ private void sendShareReceiver(String type) { - UploadHelper.INSTANCE.upload(mContext, type); + UploadHelper.INSTANCE.upload(mContext, type,true); } /** 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 61fcc30ad9..2e451ccd95 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 @@ -13,13 +13,13 @@ import com.mogo.utils.logger.Logger * 上报工具类 */ object UploadHelper { - fun upload(context:Context, type: String) { + fun upload(context:Context, type: String,forcePlayVoice:Boolean = false) { if(ServiceApisManager.serviceApis.statusManagerApi.isUploading){ Logger.d("UploadHelper", "正在上报===") TipToast.tip("正在上报，请稍后重试") }else { ServiceApisManager.serviceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true) - if(DebugConfig.getAIType() == DebugConfig.AI_TYPE_TXZ) { + if(DebugConfig.getAIType() == DebugConfig.AI_TYPE_TXZ||forcePlayVoice) { AIAssist.getInstance(context).speakTTSVoice("感谢分享，正在上传") } Logger.d("UploadHelper", "upload ----> $type")