From f18830ef472a60b6f823eccd49521c33be657e07 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Tue, 19 Aug 2025 17:21:49 +0800
Subject: [PATCH] chore: clean

---
 app/src/main/AndroidManifest.xml              |  5 ----
 .../com/zcshou/gogogo/FragmentSettings.java   | 27 -------------------
 .../java/com/zcshou/gogogo/GoApplication.java | 11 +++-----
 .../java/com/zcshou/gogogo/MainActivity.java  |  7 -----
 app/src/main/res/values/strings.xml           |  6 +----
 app/src/main/res/xml/preferences_main.xml     | 23 ----------------
 6 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6dca9bf..09bf560 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,11 +61,6 @@
             android:name="org.apache.http.legacy"
             android:required="false" />
 
-        <!-- 百度地图开发者 Key -->
-        <meta-data
-            android:name="com.baidu.lbsapi.API_KEY"
-            android:value="${MAPS_API_KEY}" />
-
         <!-- 百度地图 间隔定位必须配置此service否则功能无效 -->
         <service
             android:name="com.baidu.location.f"
diff --git a/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java b/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java
index d6af450..1e98d04 100644
--- a/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java
+++ b/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java
@@ -59,33 +59,6 @@ public class FragmentSettings extends PreferenceFragmentCompat {
         EditTextPreference pfAltitude = findPreference("setting_altitude");
         setupDecimalEditTextPreference(pfAltitude);
 
-        ListPreference pfMap = findPreference("setting_map_type");
-        if (pfMap != null) {
-            // 使用自定义 SummaryProvider
-            pfMap.setSummaryProvider((Preference.SummaryProvider<ListPreference>) preference -> Objects.requireNonNull(preference.getEntry()));
-            pfMap.setOnPreferenceChangeListener((preference, newValue) -> !newValue.toString().trim().isEmpty());
-        }
-        EditTextPreference pfMapKey = findPreference("setting_map_key");
-        if (pfMapKey != null) {
-            pfMapKey.setSummary(pfMapKey.getText());
-            pfMapKey.setOnPreferenceChangeListener((preference, newValue) -> {
-                if (newValue.toString().trim().isEmpty()) {
-                    GoUtils.DisplayToast(this.getContext(), getResources().getString(R.string.app_error_input_null));
-                    return false;
-                } else {
-                    if (!newValue.toString().matches("[a-zA-Z0-9]+")) {
-                        GoUtils.DisplayToast(this.getContext(), getResources().getString(R.string.app_error_input));
-                        return false;
-                    } else {
-                        pfMapKey.setSummary(newValue.toString());
-                        SDKInitializer.setApiKey(newValue.toString());
-                        SDKInitializer.initialize(requireContext().getApplicationContext());
-                        return true;
-                    }
-                }
-            });
-        }
-
         EditTextPreference pfLatOffset = findPreference("setting_lat_max_offset");
         setupDecimalEditTextPreference(pfLatOffset);
 
diff --git a/app/src/main/java/com/zcshou/gogogo/GoApplication.java b/app/src/main/java/com/zcshou/gogogo/GoApplication.java
index bef167d..24252ee 100644
--- a/app/src/main/java/com/zcshou/gogogo/GoApplication.java
+++ b/app/src/main/java/com/zcshou/gogogo/GoApplication.java
@@ -34,14 +34,11 @@ public class GoApplication extends Application {
         SDKInitializer.setAgreePrivacy(this, true);
         // 百度定位 7.5 开始，要求必须同意隐私政策，默认为false(官方说可以统一为以上接口，但实际测试并不行，定位还是需要单独设置)
         LocationClient.setAgreePrivacy(true);
+        SDKInitializer.setApiKey(BuildConfig.MAPS_API_KEY);
+        // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
+        SDKInitializer.initialize(this);
 
-        try {
-            // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
-            SDKInitializer.initialize(this);
-            SDKInitializer.setCoordType(CoordType.BD09LL);
-        } catch (BaiduMapSDKException e) {
-            XLog.e("ERROR init baidu sdk");
-        }
+        SDKInitializer.setCoordType(CoordType.BD09LL);
     }
 
     /**
diff --git a/app/src/main/java/com/zcshou/gogogo/MainActivity.java b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
index 7603907..641d6bc 100644
--- a/app/src/main/java/com/zcshou/gogogo/MainActivity.java
+++ b/app/src/main/java/com/zcshou/gogogo/MainActivity.java
@@ -455,13 +455,6 @@ public class MainActivity extends BaseActivity implements SensorEventListener {
 
     /*============================== 主界面地图 相关 ==============================*/
     private void initMap() {
-        // 从参数区取地图key
-        String key = sharedPreferences.getString("setting_map_key", BuildConfig.MAPS_API_KEY);
-        if (key != null && !key.equals(getResources().getString(R.string.setting_map_key_default))) {
-            SDKInitializer.setApiKey(key);
-            SDKInitializer.initialize(getApplicationContext());
-        }
-
         // 地图初始化
         mMapView = findViewById(R.id.bdMapView);
         mMapView.showZoomControls(false);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91bc7bf..9aad9af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,11 +63,7 @@
     <string name="setting_bike_default">10.0</string>
     <string name="setting_altitude">海拔高度(米)</string>
     <string name="setting_altitude_default">55.0</string>
-    <!-- 地图相关参数 -->
-    <string name="setting_group_map">地图</string>
-    <string name="setting_map_type">地图类型</string>
-    <string name="setting_map_key">地图 KEY</string>
-    <string name="setting_map_key_default">无自定义 KEY</string>
+
     <!-- 位置偏移相关参数 -->
     <string name="setting_group_location_offset">位置偏移</string>
     <string name="setting_random_offset">随机偏移</string>
diff --git a/app/src/main/res/xml/preferences_main.xml b/app/src/main/res/xml/preferences_main.xml
index 9a4d841..9d62941 100644
--- a/app/src/main/res/xml/preferences_main.xml
+++ b/app/src/main/res/xml/preferences_main.xml
@@ -45,29 +45,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:title="@string/setting_group_map"
-        app:iconSpaceReserved="false">
-        <ListPreference
-            app:key="setting_map_type"
-            app:title="@string/setting_map_type"
-            app:entries="@array/array_map_type"
-            app:entryValues="@array/array_map_type_values"
-            app:dialogTitle="@string/setting_map_type"
-            app:defaultValue="0"
-            app:iconSpaceReserved="false">
-        </ListPreference>
-
-        <EditTextPreference
-            app:key="setting_map_key"
-            app:title="@string/setting_map_key"
-            app:defaultValue="@string/setting_map_key_default"
-            app:summary="@string/setting_map_key_default"
-            android:inputType="textCapCharacters|textNoSuggestions"
-            app:iconSpaceReserved="false"/>
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         app:title="@string/setting_group_location_offset"
         app:iconSpaceReserved="false">