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/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; 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 : MvpFragment 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/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 71c86df54a..066ed9fba2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -87,7 +87,7 @@ public class V2XShareEventsFragment extends MvpFragment 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + } else { + } + } + } private Map getPoiTypeMap(List list) { Map mPoiTypeMarkers = new HashMap<>(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java index ff72b5b222..9c054b1159 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java @@ -24,6 +24,7 @@ import androidx.core.content.FileProvider; import androidx.fragment.app.FragmentActivity; import com.mogo.utils.ThreadPoolService; +import com.mogo.utils.storage.SharedPrefsMgr; import java.io.BufferedReader; import java.io.File; @@ -31,11 +32,15 @@ import java.io.FileReader; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.sql.Time; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; @@ -315,6 +320,21 @@ public class V2XUtils { } } + /* + * 当天第一次 + * */ + public static boolean isFirstTodayWithKey(String key) { + SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.US); + String formatString = format.format(new Date()); + String value = SharedPrefsMgr.getInstance(V2XUtils.getApp()).getString(key); + if (value.equals(formatString)) { + return true; + } else { + SharedPrefsMgr.getInstance(V2XUtils.getApp()).putString(key, formatString); + return false; + } + } + /////////////////////////////////////////////////////////////////////////// // TransActivity /////////////////////////////////////////////////////////////////////////// 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 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_choose_light.png new file mode 100644 index 0000000000..2c7b60f98d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_choose_light.png differ