diff --git a/gradle.properties b/gradle.properties index f8c67a7baa..76581ac0f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,7 +73,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.46-shunyi +MOGO_MODULE_V2X_VERSION=1.1.50-shunyi # 推送 MOGO_MODULE_PUSH_VERSION=1.1.5 # 广告资源位 diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java index 1d0437d956..0043bcab25 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java @@ -6,6 +6,7 @@ import android.content.pm.PackageInfo; import com.mogo.module.apps.model.AppEnum; import com.mogo.module.apps.model.AppEnumHelper; +import com.mogo.module.common.utils.CarSeries; import java.util.Arrays; import java.util.HashMap; @@ -29,6 +30,9 @@ public class AppFilterImpl implements AppFilter { final String[] values = context.getResources().getStringArray( R.array.module_apps_array_filter_packages ); if ( values != null ) { mFilterPackages = Arrays.asList( values ); + if ( CarSeries.getSeries() != CarSeries.CAR_SERIES_F80X ) { + mFilterPackages.add( "com.android.settings" ); + } } } diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index bf172403d9..822303fed7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -13,7 +13,6 @@ com.android.browser com.android.providers.downloads.ui com.zhidao.guide.lock - com.android.settings com.android.calculator2 com.nwd.guidebookskin com.iflytek.inputmethod.pad 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 3e5b77643a..02586d686b 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 @@ -315,7 +315,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo private void trackVoiceWithType(String type){ Map properties = new HashMap<>(); properties.put("type",type); - properties.put("from","2"); + properties.put("from","1"); AnalyticsUtils.track("v2x_share_type",properties); } 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 30154abf9e..0a2e936abb 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 @@ -144,6 +144,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 事故 Logger.d(TAG,"点击事故"); sendShareReceiver(ShareConstants.TYPE_ACCIDENT); + trackWithType(ShareConstants.TYPE_ACCIDENT); dismiss(); } else if (id == R.id.tvConstruction) { // 道路施工 @@ -155,6 +156,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 实时路况 Logger.d(TAG,"点击实时路况"); sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC); + trackWithType(ShareConstants.TYPE_REAL_TIME_TRAFFIC); dismiss(); } else if (id == R.id.tvStagnantWater) { // 道路积水