From af9d6515e5d0069dd434cb85c609405d132d4069 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 15:01:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[add]=20TTS=E6=92=AD=E6=8A=A5=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=88=86=E4=BA=AB-=E6=AF=8F=E5=A4=A9=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 3 ++- .../v2x/fragment/V2XShareEventsFragment.java | 20 +++++++++++++----- .../com/mogo/module/v2x/utils/V2XUtils.java | 20 ++++++++++++++++++ .../icon_heart_choose_light.png | Bin 0 -> 1722 bytes 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_choose_light.png 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 ccbc15bc1b..eefdd2252c 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 @@ -24,8 +24,8 @@ 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.service.eventpanel.IEventPanelProvider import com.mogo.utils.logger.Logger +import com.mogo.utils.storage.SharedPrefsMgr /** @@ -52,6 +52,7 @@ class V2XEventPanelFragment : MvpFragmentPx*bV)=(R9FeUS8Iq>RTSR)%pIMvG(-%w3`DYG?(Ol*M(57VojWhVKQfp~gh60J zBm@~oP-BH4`NOCm6(mT6)>!zXFlUmkGvi}~K*;jdgM8HZh$NlooqKlQx7OL`-m4-? z(4IMGuf6tK-}?4i>zp%V48}-nW|;Gzne)eEa zA&n!0BUpV;Nk98&I@k-94?b&aJS~K5!-G%1*&hw3RXSlYbZB35x89QI(5U&Hj z=}%F*rY=EZ1wa+#L`t?0k*0AlttS`o1bG}+y>Zm&_@Qy12i96Qvp%SVPBsddi4Z#b zS*riYiukG_`u7V3YLhP_&6moJ}m;jh6l z@2u2$EHctw_CQ=i-i^#J!>RNUqu__@>PgxW4`EII2~lS+|`}iSZerBHala;B(qnP0`+luH4t0TDI^mdmZoMD%*$sIfzRPEjSGa9K&X_x0h zbpZDOGDl!gruq+0Mobg%Hsjm7B^Q zic&D+PvuCUn9Df;1zBE4kI=XjV zXu`Yc$3k$RjkFhaJq(P^4>YvAZ96+zH_dCIz3B~n(M01Lm$Q-QQ9W5GN^(WAHNh1V z*rfyl`LFTixu)*ex96jVvU zh;~sPrv_MT^DH^b1rIMX-Ap?{K@fK&JK}c9gIcR%#eis00U;kDYX?`(MIKRW@qZ)z$$r>OzqCC zLcmw`%S3~SF)*0AVs@xU7zCD2K@>>*V5k1{@&3$I(O>nXNq_8EyMZLIB-i3__$%r1 z-xt4dVYt-So`E@dr$}H~W4iw2Vgs#~MD5hS*kkm!Hux%-J-4H#t7}}qa4RF?m2S7JQzt%RyDK%Rde!wG3C6uC5pHlGLlu8q z9^8&JKCJ;6NFQ5zUVn0uAS9bxXJ~|k{WLje?rPiB#s4dAI&MkCd+_!Dd#>jrobEa4 z5!paM&??W466Lm(#M+OO&FyRaYuw}AY`!fb-Vs6VuMKtYAww@v#|-!$Qc_S5(c1TG zdJnC;ldt3*5kZJ}oT#sT2gF{MlKDQcW=pDXV0~=#e+oaPYu`ME>%YeQ7b-3GlV){N Qw*UYD07*qoM6N<$f~vVf&Hw-a literal 0 HcmV?d00001 From 1089c9274c46eb3fb1e5189bf126478c431c43ae Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 15:33:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?4.4=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96-TTS?= =?UTF-8?q?=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/V2XScenarioHistoryFragment.java | 20 +++++++++++++++++++ .../v2x/fragment/V2XSurroundingFragment.java | 16 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 47dee0a670..525c4de03a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.R; import com.mogo.module.v2x.SpacesItemDecoration; @@ -21,6 +22,7 @@ import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.ThreadUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.view.V2XListEmptyView; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -126,10 +128,28 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + ttsForHistoryFirstToday(); } }); } + /* + * 出行动态 TTS播报 + * */ + private void ttsForHistoryFirstToday() { + boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_HISTORY_SELECTED"); + if (hasBroadTts == false) { + if (mV2XHistoryScenarioData.size() > 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("小智为您记录了今天的出行事件", null); + } else { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("小智在这里为您记录今天的出行事件", null); + } + + } + } + @Override public void onResume() { super.onResume(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index ede7aaa93c..bf2f60b020 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -25,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.voice.AIAssist; import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; @@ -38,6 +39,7 @@ import com.mogo.module.v2x.adapter.V2XSurroundingAdapter; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; import com.mogo.module.v2x.presenter.SurroundingEventPresenter; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.module.common.view.NetworkLoadingView; import com.mogo.module.v2x.view.SurroundingMarginDecoration; @@ -189,8 +191,22 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + } else { + } + } + } private Map getPoiTypeMap(List list) { Map mPoiTypeMarkers = new HashMap<>(); From ff76a97cb0503f5d3f01ede426c3d01c3ade83b2 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 16:29:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[add]=20=E5=9B=9E=E8=87=AA=E8=BD=A6-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81selecter,?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=88=87=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/module_ext_drawable_shadow_bg.xml | 6 ++++++ .../src/main/res/layout/module_ext_layout_entrance.xml | 2 +- .../drawable/module_ext_drawable_shadow_bg_light.xml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml new file mode 100644 index 0000000000..1536ded683 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 9ae44711a1..179e5063a0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -20,7 +20,7 @@ android:id="@+id/module_entrance_id_move2_current_location" android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_move2_height" - android:background="@drawable/module_ext_shadow_bkg" + android:background="@drawable/module_ext_drawable_shadow_bg" android:scaleType="centerInside" android:src="@drawable/module_map_ic_move2_current_location" app:layout_constraintBottom_toBottomOf="parent" diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml new file mode 100644 index 0000000000..70e133acad --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From ebef67d3d13c7ba0b52f9c25a142d2a23ba0c441 Mon Sep 17 00:00:00 2001 From: zhuangyan Date: Sun, 15 Nov 2020 16:51:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/MogoServices.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 e0e8324f3b..cf8436d75e 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 @@ -34,6 +34,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.entity.MarkerResponse; @@ -53,6 +54,7 @@ import com.mogo.module.service.refresh.AutoRefreshStrategy; import com.mogo.module.service.refresh.CustomRefreshStrategy; import com.mogo.module.service.refresh.RefreshObject; import com.mogo.module.service.strategy.CarIconDisplayStrategy; +import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.connection.IMogoOnMessageListener; @@ -74,6 +76,7 @@ import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; +import com.zhidao.smartv2x.common.utils.LoggerUtils; import org.json.JSONObject; @@ -331,6 +334,7 @@ public class MogoServices implements IMogoMapListener, } else { unregisterInternalUnWakeupWords(); stopAutoRefreshStrategy(); + closeAllPanel(); } } @@ -373,6 +377,16 @@ public class MogoServices implements IMogoMapListener, } }; + /** + * 关闭所有模块的控制面板 + */ + private void closeAllPanel() { + LoggerUtils.log("zy=======stop"); + MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); + MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS(); + } + public void init( Context context ) { mContext = context;