From c95700933d90133db30f5cc7d1ea818a87c29837 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 13 Nov 2023 10:27:23 +0800 Subject: [PATCH] [6.2.0] trace biz --- .../biz/dispatch/DispatchAutoPilotManager.kt | 2 +- .../core/utilcode/util/SPStaticUtils.java | 729 ------------------ 2 files changed, 1 insertion(+), 730 deletions(-) delete mode 100644 core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SPStaticUtils.java diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index 997fdb61a0..c418329316 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -348,7 +348,7 @@ class DispatchAutoPilotManager private constructor() : AIAssist.getInstance(mContext).speakTTSVoice("云调度完成，车辆已到达${it.endLocAddress}") } }else{ - V2XBizTrace.onAck(M_BIZ + TAG, mapOf("ArriveAtStation" to arrivalNotification, "distanceFromSelf" to distanceFromSelf)) + V2XBizTrace.onAck(M_BIZ + TAG, mapOf("arriveErrorMsg" to "不在到站距离范围内", "ArriveAtStation" to arrivalNotification, "distanceFromSelf" to distanceFromSelf)) } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SPStaticUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SPStaticUtils.java deleted file mode 100644 index 9670990849..0000000000 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SPStaticUtils.java +++ /dev/null @@ -1,729 +0,0 @@ -package com.mogo.eagle.core.utilcode.util; - -import android.content.SharedPreferences; -import androidx.annotation.NonNull; - -import java.util.Map; -import java.util.Set; - -/** - * 
- *     author: Blankj
- *     blog  : http://blankj.com
- *     time  : 2019/01/04
- *     desc  : utils about shared preference
- *
- */ -public final class SPStaticUtils { - - private static SPUtils sDefaultSPUtils; - - /** - * Set the default instance of {@link SPUtils}. - * - * @param spUtils The default instance of {@link SPUtils}. - */ - public static void setDefaultSPUtils(final SPUtils spUtils) { - sDefaultSPUtils = spUtils; - } - - /** - * Put the string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final String value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, final String value, final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - - /** - * Return the string value in sp. - * - * @param key The key of sp. - * @return the string value if sp exists or {@code ""} otherwise - */ - public static String getString(@NonNull final String key) { - return getString(key, getDefaultSPUtils()); - } - - /** - * Return the string value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the string value if sp exists or {@code defaultValue} otherwise - */ - public static String getString(@NonNull final String key, final String defaultValue) { - return getString(key, defaultValue, getDefaultSPUtils()); - } - - - /** - * Put the int value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final int value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the int value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, final int value, final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - /** - * Return the int value in sp. - * - * @param key The key of sp. - * @return the int value if sp exists or {@code -1} otherwise - */ - public static int getInt(@NonNull final String key) { - return getInt(key, getDefaultSPUtils()); - } - - /** - * Return the int value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the int value if sp exists or {@code defaultValue} otherwise - */ - public static int getInt(@NonNull final String key, final int defaultValue) { - return getInt(key, defaultValue, getDefaultSPUtils()); - } - - /** - * Put the long value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final long value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the long value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, final long value, final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - /** - * Return the long value in sp. - * - * @param key The key of sp. - * @return the long value if sp exists or {@code -1} otherwise - */ - public static long getLong(@NonNull final String key) { - return getLong(key, getDefaultSPUtils()); - } - - /** - * Return the long value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the long value if sp exists or {@code defaultValue} otherwise - */ - public static long getLong(@NonNull final String key, final long defaultValue) { - return getLong(key, defaultValue, getDefaultSPUtils()); - } - - /** - * Put the float value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final float value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the float value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, final float value, final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - /** - * Return the float value in sp. - * - * @param key The key of sp. - * @return the float value if sp exists or {@code -1f} otherwise - */ - public static float getFloat(@NonNull final String key) { - return getFloat(key, getDefaultSPUtils()); - } - - /** - * Return the float value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the float value if sp exists or {@code defaultValue} otherwise - */ - public static float getFloat(@NonNull final String key, final float defaultValue) { - return getFloat(key, defaultValue, getDefaultSPUtils()); - } - - /** - * Put the boolean value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final boolean value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the boolean value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, final boolean value, final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - /** - * Return the boolean value in sp. - * - * @param key The key of sp. - * @return the boolean value if sp exists or {@code false} otherwise - */ - public static boolean getBoolean(@NonNull final String key) { - return getBoolean(key, getDefaultSPUtils()); - } - - /** - * Return the boolean value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the boolean value if sp exists or {@code defaultValue} otherwise - */ - public static boolean getBoolean(@NonNull final String key, final boolean defaultValue) { - return getBoolean(key, defaultValue, getDefaultSPUtils()); - } - - /** - * Put the set of string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - */ - public static void put(@NonNull final String key, final Set value) { - put(key, value, getDefaultSPUtils()); - } - - /** - * Put the set of string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void put(@NonNull final String key, - final Set value, - final boolean isCommit) { - put(key, value, isCommit, getDefaultSPUtils()); - } - - /** - * Return the set of string value in sp. - * - * @param key The key of sp. - * @return the set of string value if sp exists - * or {@code Collections.emptySet()} otherwise - */ - public static Set getStringSet(@NonNull final String key) { - return getStringSet(key, getDefaultSPUtils()); - } - - /** - * Return the set of string value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @return the set of string value if sp exists or {@code defaultValue} otherwise - */ - public static Set getStringSet(@NonNull final String key, - final Set defaultValue) { - return getStringSet(key, defaultValue, getDefaultSPUtils()); - } - - /** - * Return all values in sp. - * - * @return all values in sp - */ - public static Map getAll() { - return getAll(getDefaultSPUtils()); - } - - /** - * Return whether the sp contains the preference. - * - * @param key The key of sp. - * @return {@code true}: yes
{@code false}: no - */ - public static boolean contains(@NonNull final String key) { - return contains(key, getDefaultSPUtils()); - } - - /** - * Remove the preference in sp. - * - * @param key The key of sp. - */ - public static void remove(@NonNull final String key) { - remove(key, getDefaultSPUtils()); - } - - /** - * Remove the preference in sp. - * - * @param key The key of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void remove(@NonNull final String key, final boolean isCommit) { - remove(key, isCommit, getDefaultSPUtils()); - } - - /** - * Remove all preferences in sp. - */ - public static void clear() { - clear(getDefaultSPUtils()); - } - - /** - * Remove all preferences in sp. - * - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - */ - public static void clear(final boolean isCommit) { - clear(isCommit, getDefaultSPUtils()); - } - - /////////////////////////////////////////////////////////////////////////// - // dividing line - /////////////////////////////////////////////////////////////////////////// - - /** - * Put the string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final String value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final String value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - - /** - * Return the string value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the string value if sp exists or {@code ""} otherwise - */ - public static String getString(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getString(key); - } - - /** - * Return the string value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the string value if sp exists or {@code defaultValue} otherwise - */ - public static String getString(@NonNull final String key, - final String defaultValue, - @NonNull final SPUtils spUtils) { - return spUtils.getString(key, defaultValue); - } - - - /** - * Put the int value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final int value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the int value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final int value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - /** - * Return the int value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the int value if sp exists or {@code -1} otherwise - */ - public static int getInt(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getInt(key); - } - - /** - * Return the int value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the int value if sp exists or {@code defaultValue} otherwise - */ - public static int getInt(@NonNull final String key, final int defaultValue, @NonNull final SPUtils spUtils) { - return spUtils.getInt(key, defaultValue); - } - - /** - * Put the long value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final long value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the long value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final long value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - /** - * Return the long value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the long value if sp exists or {@code -1} otherwise - */ - public static long getLong(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getLong(key); - } - - /** - * Return the long value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the long value if sp exists or {@code defaultValue} otherwise - */ - public static long getLong(@NonNull final String key, final long defaultValue, @NonNull final SPUtils spUtils) { - return spUtils.getLong(key, defaultValue); - } - - /** - * Put the float value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final float value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the float value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final float value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - /** - * Return the float value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the float value if sp exists or {@code -1f} otherwise - */ - public static float getFloat(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getFloat(key); - } - - /** - * Return the float value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the float value if sp exists or {@code defaultValue} otherwise - */ - public static float getFloat(@NonNull final String key, final float defaultValue, @NonNull final SPUtils spUtils) { - return spUtils.getFloat(key, defaultValue); - } - - /** - * Put the boolean value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final boolean value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the boolean value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final boolean value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - /** - * Return the boolean value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the boolean value if sp exists or {@code false} otherwise - */ - public static boolean getBoolean(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getBoolean(key); - } - - /** - * Return the boolean value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the boolean value if sp exists or {@code defaultValue} otherwise - */ - public static boolean getBoolean(@NonNull final String key, - final boolean defaultValue, - @NonNull final SPUtils spUtils) { - return spUtils.getBoolean(key, defaultValue); - } - - /** - * Put the set of string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, final Set value, @NonNull final SPUtils spUtils) { - spUtils.put(key, value); - } - - /** - * Put the set of string value in sp. - * - * @param key The key of sp. - * @param value The value of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void put(@NonNull final String key, - final Set value, - final boolean isCommit, - @NonNull final SPUtils spUtils) { - spUtils.put(key, value, isCommit); - } - - /** - * Return the set of string value in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return the set of string value if sp exists - * or {@code Collections.emptySet()} otherwise - */ - public static Set getStringSet(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.getStringSet(key); - } - - /** - * Return the set of string value in sp. - * - * @param key The key of sp. - * @param defaultValue The default value if the sp doesn't exist. - * @param spUtils The instance of {@link SPUtils}. - * @return the set of string value if sp exists or {@code defaultValue} otherwise - */ - public static Set getStringSet(@NonNull final String key, - final Set defaultValue, - @NonNull final SPUtils spUtils) { - return spUtils.getStringSet(key, defaultValue); - } - - /** - * Return all values in sp. - * - * @param spUtils The instance of {@link SPUtils}. - * @return all values in sp - */ - public static Map getAll(@NonNull final SPUtils spUtils) { - return spUtils.getAll(); - } - - /** - * Return whether the sp contains the preference. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - * @return {@code true}: yes
{@code false}: no - */ - public static boolean contains(@NonNull final String key, @NonNull final SPUtils spUtils) { - return spUtils.contains(key); - } - - /** - * Remove the preference in sp. - * - * @param key The key of sp. - * @param spUtils The instance of {@link SPUtils}. - */ - public static void remove(@NonNull final String key, @NonNull final SPUtils spUtils) { - spUtils.remove(key); - } - - /** - * Remove the preference in sp. - * - * @param key The key of sp. - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void remove(@NonNull final String key, final boolean isCommit, @NonNull final SPUtils spUtils) { - spUtils.remove(key, isCommit); - } - - /** - * Remove all preferences in sp. - * - * @param spUtils The instance of {@link SPUtils}. - */ - public static void clear(@NonNull final SPUtils spUtils) { - spUtils.clear(); - } - - /** - * Remove all preferences in sp. - * - * @param isCommit True to use {@link SharedPreferences.Editor#commit()}, - * false to use {@link SharedPreferences.Editor#apply()} - * @param spUtils The instance of {@link SPUtils}. - */ - public static void clear(final boolean isCommit, @NonNull final SPUtils spUtils) { - spUtils.clear(isCommit); - } - - private static SPUtils getDefaultSPUtils() { - return sDefaultSPUtils != null ? sDefaultSPUtils : SPUtils.getInstance(); - } -} \ No newline at end of file