diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png new file mode 100755 index 0000000000..8acf113151 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png new file mode 100644 index 0000000000..04580a8f0d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png new file mode 100644 index 0000000000..9eca61e199 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png new file mode 100644 index 0000000000..89a6eaa5dc Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png new file mode 100644 index 0000000000..927296d690 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_icon_not_in_autopilot.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png new file mode 100644 index 0000000000..ed7b293b90 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_base_slide_block.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png new file mode 100644 index 0000000000..170f254cd1 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_disable_autopilot_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png new file mode 100644 index 0000000000..8a065b66dd Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arrived_station.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png new file mode 100644 index 0000000000..4ed57a0e30 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_icon_arriving_station.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png new file mode 100644 index 0000000000..f21a1081f1 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_loading_autopilot_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png new file mode 100644 index 0000000000..a720a532ea Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_och_dot_line.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png new file mode 100644 index 0000000000..cc2b18083d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_right_autopilot_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png new file mode 100644 index 0000000000..ba41bf3a53 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_setting_btn_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_angle.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_switch_map_angle.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png new file mode 100644 index 0000000000..0c8988acb3 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_wrong_autopilot_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png new file mode 100644 index 0000000000..89a6eaa5dc Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png index 21dc719ec9..927296d690 100644 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png index 8ffd0abe52..ed7b293b90 100644 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png index a676a789c3..8a065b66dd 100644 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png index e1fd463963..4ed57a0e30 100644 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_och_dot_line.png new file mode 100644 index 0000000000..a720a532ea Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_och_dot_line.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_selected_btn.png new file mode 100644 index 0000000000..3f05565483 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_selected_btn.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png new file mode 100644 index 0000000000..ba41bf3a53 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_line_close.png new file mode 100644 index 0000000000..370b61de38 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_line_close.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_unselect_btn.png new file mode 100644 index 0000000000..0114bb4f2b Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_unselect_btn.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/end_maker_icon.png new file mode 100755 index 0000000000..8acf113151 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/end_maker_icon.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_station_start_end.png new file mode 100644 index 0000000000..04580a8f0d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_station_start_end.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_maker_icon.png new file mode 100644 index 0000000000..9eca61e199 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_maker_icon.png differ diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt index 3d5facede1..3b894d7e2b 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt @@ -26,7 +26,7 @@ class OCHTaxiConst { const val PATH = "/och/api" // 到达起始点围栏 - const val ARRIVE_AT_START_STATION_DISTANCE = 10 //围栏由20m改为50m 再次改为10m + const val ARRIVE_AT_START_STATION_DISTANCE = 15 //围栏由20m改为50m 再次改为15m // 上报心跳轮询ms const val LOOP_PERIOD_60S = 60 * 1000L diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 9a2f2aecbb..f45be582ec 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -316,7 +316,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment() private var dockerRebootDialog: DockerRebootDialog? = null //docker重启对话框 private var adUpgradeDialog : AdUpgradeDialog? = null //工控机升级对话框 @@ -819,6 +818,40 @@ class DebugSettingView @JvmOverloads constructor( + //ADAS日志标签 + cbAdasLog.setOnCheckedChangeListener { _, isChecked -> + val adasModule = SceneModule(isChecked,SceneConstant.M_ADAS_IMPL) + sceneMap[SceneConstant.M_ADAS_IMPL] = adasModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } + //OBU日志标签 + cbObuLog.setOnCheckedChangeListener { _, isChecked -> + val obuModule = SceneModule(isChecked,SceneConstant.M_OBU) + sceneMap[SceneConstant.M_OBU] = obuModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } + //HMI日志标签 + cbHmiLog.setOnCheckedChangeListener { _, isChecked -> + val hmiModule = SceneModule(isChecked,SceneConstant.M_HMI) + sceneMap[SceneConstant.M_HMI] = hmiModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } + //V2X日志标签 + cbV2xLog.setOnCheckedChangeListener { _, isChecked -> + val v2xModule = SceneModule(isChecked,SceneConstant.M_V2X) + sceneMap[SceneConstant.M_V2X] = v2xModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } + //地图日志标签 + cbMapLog.setOnCheckedChangeListener { _, isChecked -> + val mapModule = SceneModule(isChecked,SceneConstant.M_MAP) + sceneMap[SceneConstant.M_MAP] = mapModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } + + + + //开始停止抓取全量日志 tbLogCatch.isChecked = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 087e5fdbda..a304de25f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1313,16 +1313,6 @@ android:orientation="vertical" android:visibility="gone"> - - + + + + + + + + + + + + + + + + + + - - + android:textColor="#1A1A1A" + android:textSize="14sp" + android:background="@drawable/debug_setting_edit_bg" + android:layout_marginStart="@dimen/dp_30" + android:layout_marginEnd="@dimen/dp_30" + android:layout_marginTop="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" + /> diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 9db1ecd5a1..b37554d062 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -21,11 +21,11 @@ import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.chat.biz.ChatConsts; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.notice.PushUIConstants; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.MapApiPath; @@ -92,6 +92,11 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { */ protected abstract void initCrashConfig(); + /** + * 初始化异常采集配置 + */ + protected abstract void initAnalyticsConfig(); + /** * 初始化日志 */ @@ -117,6 +122,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { @Override protected void asyncInitImpl() { super.asyncInitImpl(); + initAnalyticsConfig(); } @Override @@ -214,7 +220,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { Double.parseDouble(latitude), Double.parseDouble(longitude)); } catch (NumberFormatException e) { - // e.printStackTrace(); + // e.printStackTrace(); httpDnsSimpleLocation = new HttpDnsSimpleLocation("010", 1, 1); } //CallerLogger.INSTANCE.d(M_MAIN + TAG, "使用缓存GPS信息：" + httpDnsSimpleLocation); diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java index 8d166c37e1..2055f76e42 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java @@ -8,9 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.function.notice.Config; import com.mogo.eagle.core.function.notice.R; import com.mogo.eagle.core.function.notice.adapter.PushMessageAdapter; import com.mogo.eagle.core.function.notice.model.PushBean; @@ -25,9 +23,6 @@ import com.mogo.module.common.view.OnPreventFastClickListener; import org.jetbrains.annotations.NotNull; -import java.util.HashMap; -import java.util.Map; - /** * @author congtaowang * @since 2020/9/1 @@ -66,7 +61,6 @@ public class MessageHistoryFragment extends MvpFragment< MessageHistoryView, Mes mEmptyPlaceHolder = findViewById( R.id.module_push_id_not_data ); mClose = findViewById( R.id.module_push_id_close ); - AnalyticsUtils.track( Config.NEWS_HISTORY_OPEN, null ); mClose.setOnClickListener( new OnPreventFastClickListener() { @Override public void onClickImpl( View v ) { @@ -76,7 +70,6 @@ public class MessageHistoryFragment extends MvpFragment< MessageHistoryView, Mes mClear.setOnClickListener( new OnPreventFastClickListener() { @Override public void onClickImpl( View v ) { - AnalyticsUtils.track( Config.NEWS_HISTORY_ALL_CLEAR, null ); if ( !mClearing ) { mClearing = true; AnimatorUtilsKt.startClearAnimator( @@ -97,12 +90,8 @@ public class MessageHistoryFragment extends MvpFragment< MessageHistoryView, Mes } mViewModel.delete( bean ); if ( action ) { - Map< String, Object > prop = new HashMap<>(); - prop.put( "title", bean.getTitle() ); - AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLICK, prop ); exitSelf(); } else { - AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLEAR, null ); mAdapter.removeItem( bean ); if ( mAdapter.getItemCount() == 0 ) { mEmptyPlaceHolder.setVisibility( View.VISIBLE ); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml index 37971199fb..759382f950 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml @@ -12,7 +12,7 @@ android:layout_width="@dimen/module_v2x_brake_image_width" android:layout_height="@dimen/module_v2x_brake_image_width" android:layout_marginStart="@dimen/module_v2x_brake_image_margin_left" - android:src="@drawable/v2x_icon_ahead_car_brake" + android:src="@drawable/icon_warning_v2x_emergency_brake" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index 517cf23278..4e2b923a44 100644 --- a/core/mogo-core-function-call/build.gradle +++ b/core/mogo-core-function-call/build.gradle @@ -43,10 +43,13 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.kotlinstdlibjdk7 - implementation rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler + // MoGo 数据埋点工具 + implementation rootProject.ext.dependencies.analytics + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt new file mode 100644 index 0000000000..d27b2bcf36 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt @@ -0,0 +1,61 @@ +package com.mogo.eagle.core.function.call.analytics + +import android.content.Context +import androidx.annotation.Keep +import androidx.collection.ArrayMap +import com.elegant.analytics.Analytics +import com.elegant.analytics.AnalyticsConfig +import com.elegant.analytics.IAnalyticsParamsProvider +import com.elegant.analytics.UploadMode +import com.mogo.cloud.passport.MoGoAiCloudClientConfig + +/** + * 埋点&数据统计 管理 + * @author donghongyu + */ +object AnalyticsManager { + + @Keep + fun init(context: Context?, isDebug: Boolean) { + // 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。 + // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。 + AnalyticsConfig.getInstance(context).appKey = "6bbe7e0e1ecd8e2f8dc336e1678a2791" + AnalyticsConfig.getInstance(context).uploadMode = if (isDebug) UploadMode.instant else UploadMode.cache + AnalyticsConfig.getInstance(context).setShouldLog(isDebug) + // 设置参数提供者 + AnalyticsConfig.getInstance(context).paramsProvider = object : IAnalyticsParamsProvider { + // 静态参数 + override fun staticParams(): Map { + return getAnalyticsCustomParams(isDebug) + } + + //动态参数 + override fun dynamicParams(): Map? { + return null + } + } + Analytics.getInstance().start(context) + } + + /** + * 埋点 + * + * @param event 事件名称 + * @param properties 事件参数 + */ + fun track(event: String?, properties: Map?) { + Analytics.getInstance().track(event, properties) + } + + + /** + * 静态的统计参数 + */ + fun getAnalyticsCustomParams(isDebug: Boolean): Map { + val map: MutableMap = ArrayMap() + map["debug"] = if (isDebug) 1 else 0 + map["sn"] = MoGoAiCloudClientConfig.getInstance().sn + + return map + } +} \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png index 96ff599767..e316ad9b1c 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png index 222e03b424..942da02ff6 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png index 7b3bd880ce..3e4b099213 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png index 65d789116e..390590cd1e 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png index 815cd48555..4d5c5ed413 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_optimal_route.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_optimal_route.png index 76ae6f035a..be0cfe095b 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_optimal_route.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_optimal_route.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png index 5ed8f2b24f..d5bc66b38e 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png index d8ef031e35..2c69c68bcc 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png index 69b729dae4..414cb39411 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png index b849484e66..f37f1682f6 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png index 0c8ab2ba76..fff133dcab 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vip_turn_light.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vip_turn_light.png index bba50f297a..86883f2c3f 100644 Binary files a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vip_turn_light.png and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vip_turn_light.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_car_collide_warning.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_car_collide_warning.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongjiancha_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongjiancha_vr.png diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png new file mode 100644 index 0000000000..86b955658e Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiebing_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiebing_vr.png diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png new file mode 100644 index 0000000000..d337e248c0 Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_yongdu_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_yongdu_vr.png diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 537229cf0f..249bbd25ac 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -36,12 +36,12 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api rootProject.ext.dependencies.androidxappcompat - api rootProject.ext.dependencies.analytics + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.analytics implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava - api rootProject.ext.dependencies.mogoaicloudrealtime + implementation rootProject.ext.dependencies.mogoaicloudrealtime implementation rootProject.ext.dependencies.amapnavi3dmap if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 7fb679dd8f..5dfedc4161 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -15,7 +15,6 @@ import android.widget.TextView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.aicloud.services.httpdns.IMogoHttpDns; import com.mogo.aicloud.services.httpdns.MogoHttpDnsHandler; -import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.commons.crash.FinalizeCrashFixer; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.device.Devices; @@ -74,12 +73,12 @@ public abstract class AbsMogoApplication extends Application { */ private void initARouter() { try { - ARouter.init(sApp); - // 初始化 arouter if (DebugConfig.isDebug()) { ARouter.openDebug(); ARouter.openLog(); } + // 初始化 arouter + ARouter.init(sApp); } catch (Exception e) { e.printStackTrace(); // 由于ARouter会在SP_AROUTER_CACHE.xml缓存路由表，如果出现了被删除的情况会报错，这里清除下就好了 @@ -149,15 +148,12 @@ public abstract class AbsMogoApplication extends Application { */ protected void asyncInit() { ThreadPoolService.execute(() -> { - - //初始化网络配置 - NetConfigUtils.init(); - // 初始化埋点 - AnalyticsUtils.init(sApp); if (DebugConfig.getCarMachineType() == CAR_MACHINE_TYPE_SELF_INNOVATE) { Devices.init(getApp()); Devices.checkBindState(); } + //初始化网络配置 + NetConfigUtils.init(); asyncInitImpl(); }); } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt index 487157b473..94c63c047d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt @@ -37,13 +37,13 @@ enum class EventTypeEnum( //施工 FOURS_ROAD_WORK( - "10006", "道路施工", "前方施工", R.drawable.v2x_icon_daolushigong_vr, + "10006", "道路施工", "前方施工", R.drawable.icon_warning_v2x_road_construction, "前方施工", "道路施工" ), //拥堵 FOURS_BLOCK_UP( - "10007", "道路拥堵", "前方拥堵", R.drawable.v2x_icon_yongdu_vr, + "10007", "道路拥堵", "前方拥堵", R.drawable.icon_warning_v2x_congestion, "前方道路拥堵", "道路拥堵" ), diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png deleted file mode 100644 index 31ea64f0ea..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png deleted file mode 100644 index 3b658c62d3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png deleted file mode 100644 index d5cca39f45..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png deleted file mode 100644 index 3ed7564641..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png index 05903f6e61..5cbd0c6809 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png index da68268420..9c33431aae 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml index 36123b8fe0..3fec33a8e2 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -8,7 +8,7 @@ 37px 435px 186px - 133px + 120px 37px 27px diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/analytics/IMogoAnalytics.java b/services/mogo-service-api/src/main/java/com/mogo/service/analytics/IMogoAnalytics.java index e8fe14fe8b..7d8f64ef00 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/analytics/IMogoAnalytics.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/analytics/IMogoAnalytics.java @@ -20,7 +20,9 @@ public interface IMogoAnalytics extends IProvider { * * @param event 事件名称 * @param properties 埋点参数 + * @see AnalyticsManager */ @Keep + @Deprecated void track( String event, Map< String, Object > properties ); } diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index f5eee60e6e..691033e5e6 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -18,13 +18,13 @@ import com.aispeech.export.config.AuthConfig; import com.aispeech.export.config.EchoConfig; import com.aispeech.export.engines.AILocalTTSEngine; import com.aispeech.export.intent.AILocalTTSIntent; -import com.aispeech.export.listeners.AILocalTTSListener; import com.aispeech.export.listeners.AITTSListener; import com.aispeech.lite.AuthType; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.cloud.commons.BuildConfig; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.tts.base.IMogoTTS; import com.mogo.tts.base.IMogoTTSCallback; @@ -59,27 +59,29 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private boolean mInitReady = true; private Context mContext; - public synchronized void release() { + public void release() { CallerLogger.INSTANCE.d(TAG, "release"); - if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) { - for (String cmd : mCmdMap.keySet()) { - try { - mVoiceClient.unRegisterCustomWakeupCmd(cmd); - } catch (Exception e) { - e.printStackTrace(); + ThreadUtils.runOnUiThread(() -> { + if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) { + for (String cmd : mCmdMap.keySet()) { + try { + mVoiceClient.unRegisterCustomWakeupCmd(cmd); + } catch (Exception e) { + e.printStackTrace(); + } } } - } - mQAndAMap.clear(); - mVoiceClient.release(); - if (mEngine != null) { - mEngine.destroy(); - mEngine = null; - } - mHasAuth = false; - mSpeakVoiceMap.clear(); - mCacheUnWakeupCommands.clear(); - mContext = null; + mQAndAMap.clear(); + mVoiceClient.release(); + if (mEngine != null) { + mEngine.destroy(); + mEngine = null; + } + mHasAuth = false; + mSpeakVoiceMap.clear(); + mCacheUnWakeupCommands.clear(); + mContext = null; + }); } private VoiceClient mVoiceClient; @@ -147,8 +149,10 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void success() { CallerLogger.INSTANCE.d(TAG, "授权成功"); - mHasAuth = true; - initTtsEngine(); + ThreadUtils.runOnUiThread(() -> { + mHasAuth = true; + initTtsEngine(); + }); } @Override @@ -251,7 +255,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList if (!mCmdMap.containsKey(cmd)) { return; } - CallerLogger.INSTANCE.d(TAG, "received command : " + cmd); + CallerLogger.INSTANCE.d(TAG, "received command : " + cmd); Iterator iterator = null; try { @@ -447,7 +451,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd); + CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -463,7 +467,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd); + CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -514,7 +518,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * @param status window_start_cancel 0 - 结束， 1 - 显示， 2 - 未激活调试进入 */ public static void startAssistant(Context context, int status) { - CallerLogger.INSTANCE.w(TAG, "startAssistant status = " + status); + CallerLogger.INSTANCE.w(TAG, "startAssistant status = " + status); final Intent intent = new Intent(); intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);