diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index 22af9c03c7..ae433565f4 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -178,7 +178,7 @@ class CosStatusController : CosStatusCallback {
latitude: Double,
speed: Float
) {
- Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId")
+ Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}")
//开始上传
entity?.isCustom?.let {
mainServiceHttpModel.sendInformationMessage(
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
index 3969175d15..d0019f7adc 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
@@ -1,5 +1,6 @@
package com.zhidao.roadcondition.util
+import android.util.Log
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.mogo.commons.AbsMogoApplication
@@ -51,6 +52,7 @@ fun getInformationBody(
INFO_TYPE_IMG
}
var infoType = if (isCustom) 1 else 0
+ Log.d("MainServiceController", "isCustom = $isCustom ---- infoType = $infoType")
return InformationBody(
jsonArray.toString(),
locationInfo.address,
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index 2281aa213c..7db7abf2a5 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1060,6 +1060,6 @@
281px
90px
32px
- 28px
+ 26px
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 f34de46914..bda89f02ad 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
@@ -219,9 +219,11 @@ public class SchemeIntent implements IMogoStatusChangedListener {
mApis.getOnlineCarPanelApi().showPanel();
}
+ /*
+ * 语音打开事件面板
+ * */
private void handleShowSharePanel(int item) {
- Logger.d(TAG, "handleShowSharePanel");
- // todo 跳转到热心指数
+ Logger.d(TAG, "语音打开事件面板");
mApis.getEventPanelManager().showPanelWithSelectedItem(item);
}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 3b5a7e55d5..4a3099736a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -48,7 +48,6 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher;
import com.mogo.module.service.marker.MapMarkerManager;
import com.mogo.module.service.network.RefreshCallback;
import com.mogo.module.service.network.RefreshModel;
-import com.mogo.module.service.network.bean.TtsConfigEntity;
import com.mogo.module.service.ttsConfig.TtsConfigModleData;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse;
@@ -333,8 +332,9 @@ public class MogoServices implements IMogoMapListener,
}
mIsMainPageFirstResume = false;
LauncherCardRefresher.getInstance(mContext).stop();
-
- playAppTts();
+
+ mTtsModle.playTts();
+// playAppTts();
} else {
@@ -390,7 +390,7 @@ public class MogoServices implements IMogoMapListener,
if (DebugConfig.isLauncher()) {
return;
}
- mTtsModle.playTts();
+
}
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
index 89f6d2cdbd..f8c20811d4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
@@ -4,6 +4,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.service.network.RefreshModel;
@@ -41,9 +42,9 @@ public class TtsConfigModleData {
*/
public void playTts() {
- Log.d("zytest", "playTts获取语音配置的网络请求");
-
-
+ if (DebugConfig.isLauncher()) {
+ return;
+ }
mTtsConfigApiService.inquireForTts()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -59,8 +60,8 @@ public class TtsConfigModleData {
public void onSuccess(TtsConfigEntity o) {
super.onSuccess(o);
Log.e("zytest", "播放语音了====" + o.getResult().getWord());
- if (!TextUtils.isEmpty( o.getResult().getWord())) {
- AIAssist.getInstance(getApp().getApplicationContext()).speakTTSVoice( o.getResult().getWord());
+ if (!TextUtils.isEmpty(o.getResult().getWord())) {
+ AIAssist.getInstance(getApp().getApplicationContext()).speakTTSVoice(o.getResult().getWord());
}
}
});
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
index 7780eca978..9e546142c0 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
@@ -29,6 +29,7 @@ public class TtsConfigProvider implements IProvider {
if (mTtsModleData == null) {
mTtsModleData = new TtsConfigModleData();
}
+
mTtsModleData.playTts();
}
}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
index f392b4bbce..b16b7957e7 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
@@ -72,6 +72,16 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog
case UNWAKE_UPLOAD_ROAD_CONDITION:
MogoApisHandler.getInstance().getApis().getShareManager().onGlobalUnwake(intentStr, intent);
break;
+ case VOICE_QUERY_HISTORY_INDEX:
+ Intent startForHis = new Intent( Intent.ACTION_VIEW );
+ startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
+ startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) );
+ context.startActivity( startForHis );
+ case VOICE_QUERY_SURROUNDING_INDEX:
+ Intent startForSurrounding = new Intent( Intent.ACTION_VIEW );
+ startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
+ startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) );
+ context.startActivity( startForSurrounding );
case VOICE_QUERY_HEART_INDEX:
Intent start = new Intent( Intent.ACTION_VIEW );
start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
index cc1e9bdbdc..9f7b9cc036 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
@@ -112,7 +112,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
/**
* 距离策略上报
*
- * 1. 过去3分钟,行驶距离<1km
+ * 1. 过去3分钟,行驶距离<1km,大于30m
* 2. 前车距离<5m,获取不到前车距离时,默认此项满足
* 3. 当前车速<40km/h
*
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index b2119ea018..2d06d27c82 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -12,20 +12,17 @@ import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.tabs.TabLayoutMediator
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.mvp.MvpFragment
-import com.mogo.commons.voice.AIAssist
import com.mogo.module.v2x.R
import com.mogo.module.v2x.V2XConst.MODULE_NAME
import com.mogo.module.v2x.V2XServiceManager
import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
import com.mogo.module.v2x.presenter.EventPanelPresenter
import com.mogo.module.v2x.utils.TrackUtils
-import com.mogo.module.v2x.utils.V2XUtils
import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
import com.mogo.module.v2x.voice.V2XVoiceConstants
import com.mogo.module.v2x.voice.V2XVoiceManager
import com.mogo.utils.logger.Logger
-import com.mogo.utils.storage.SharedPrefsMgr
/**
@@ -123,6 +120,12 @@ class V2XEventPanelFragment : MvpFragment
@@ -27,7 +27,7 @@
+ android:paddingTop="14px">
@@ -83,7 +83,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
- android:paddingBottom="22px"
+ android:paddingBottom="@dimen/des_text_margin_bottom"
android:text="车友认同次数"
android:textColor="#FFFFFF"
android:textSize="@dimen/share_index_des_size" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 6bf0a69a87..f656dd22e9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -9,43 +9,28 @@
android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
-
-
+ android:textSize="@dimen/share_item_text_size" />
+ android:paddingRight="5px"
+ android:src="@drawable/v2x_share_item_unlike" />
+ android:textSize="@dimen/share_item_text_size" />
+ android:paddingRight="5px"
+ android:src="@drawable/v2x_share_item_like" />
+ android:textSize="@dimen/share_item_address"
+ android:textStyle="bold" />
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 8c05ab84b4..d097e0e44c 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -61,6 +61,7 @@
17px
14px
36px
+ 22px
16px
20px
34px
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 03bc2597eb..eafb0c59f3 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -62,6 +62,7 @@
17px
14px
36px
+ 22px
16px
20px
34px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index cfe362711a..5b9f3c3410 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -58,11 +58,12 @@
100px
28px
26px
- 67.5px
- 30px
+ 64px
+ 48px
+ 28px
40px
60px
- 31px
+ 22px
54px
-10px
114px
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index cfd4c1b19f..4b859dcf2e 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -56,6 +56,7 @@
17px
14px
36px
+ 22px
16px
20px
34px