Bladeren bron

feat(app): 集成 MapLibre 并更新相关依赖- 在 gradle.properties 中添加 MapLibre Token
- 在 app/build.gradle 中添加 MapLibre 相关的 manifestPlaceholder 和依赖
- 在 AndroidManifest.xml 中添加 MapLibre API Key 的 meta-data
- 更新 MqttTopic 中设备 OSD 数据发布的主题

mws 3 maanden geleden
bovenliggende
commit
c1dd13e035

+ 3 - 0
app/build.gradle

@@ -21,6 +21,7 @@ android {
         manifestPlaceholders["API_KEY"] = project.AIRCRAFT_API_KEY
         manifestPlaceholders["GMAP_API_KEY"] = project.GMAP_API_KEY
         manifestPlaceholders["AMAP_API_KEY"] = project.AMAP_API_KEY
+        manifestPlaceholders["MAPLIBRE_TOKEN"] = project.MAPLIBRE_TOKEN
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -121,6 +122,7 @@ dependencies {
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
+    implementation 'com.squareup.okio:okio:3.4.0' // 请根据需要使用最新版本
 
 
 
@@ -132,6 +134,7 @@ dependencies {
     implementation libs.androidx.ui.graphics
     implementation libs.androidx.ui.tooling.preview
     implementation libs.androidx.material3
+    implementation libs.androidx.media3.decoder
 
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit

+ 4 - 1
app/src/main/AndroidManifest.xml

@@ -64,7 +64,10 @@
         <meta-data
             android:name="com.dji.sdk.API_KEY"
             android:value="${API_KEY}"/>
-
+        <!-- Maplibre Token-->
+        <meta-data
+            android:name="com.dji.mapkit.maplibre.apikey"
+            android:value="${MAPLIBRE_TOKEN}" />
 
         <activity
             android:name="com.paul.drone.activity.LoginActivity"

+ 1 - 1
app/src/main/java/com/paul/drone/util/mqtt/MqttTopic.java

@@ -24,7 +24,7 @@ public class MqttTopic {
     public static final String REMOTE_LIVE_LIKE = "drone/remote/+/live";
 
     // 设备OSD数据发布
-    public static final String PUBLISH_DEVICE_OSD = "thing/product/%s/osd";
+    public static final String PUBLISH_DEVICE_OSD = "thing/product/mobile/%s/osd";
 
     /**
      * 获取完整主题

+ 1 - 1
gradle.properties

@@ -44,7 +44,7 @@ AIRCRAFT_API_KEY = b94756d3153412a694d8d745
 GMAP_API_KEY = your_google_maps_api_key_here
 #AMAP_API_KEY = your_amap_api_key_here
 AMAP_API_KEY = b8a57128a503ff0eae47a5dd37d91963
-
+MAPLIBRE_TOKEN = ENTER YOUR  MapLibre TOKEN
 
 ANDROID_MIN_SDK_VERSION=23
 ANDROID_TARGET_SDK_VERSION=34