From 78d7eaa6c49251971fcb9dda3f4552e2d8d71199 Mon Sep 17 00:00:00 2001
From: lxm <1274844347@qq.com>
Date: Thu, 22 May 2025 18:57:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(amap=5Fservice):=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在`NavigationActivity.kt`中解决了合并冲突，并添加了AMapLocationClient的隐私政策展示和用户同意设置，以确保应用合规性。
---
 .../com/yunqiinnovation/amap_service/NavigationActivity.kt  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationActivity.kt b/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationActivity.kt
index d40b4e9ba..9009ec725 100644
--- a/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationActivity.kt
+++ b/local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationActivity.kt
@@ -4,10 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-<<<<<<< HEAD
-=======
 import com.amap.api.location.AMapLocationClient
->>>>>>> 96a785bba4ad238e32ea70b32b8e36fd5775e800
 import com.amap.api.navi.AMapNavi
 import com.amap.api.navi.AMapNaviListener
 import com.amap.api.navi.AMapNaviView
@@ -39,15 +36,12 @@ class NavigationActivity : AppCompatActivity(), AMapNaviListener, AMapNaviViewLi
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_navigation)
         context = this
-<<<<<<< HEAD
-=======
 
         // 设置隐私政策展示状态
         AMapLocationClient.updatePrivacyShow(this, true, true)
         // 设置用户同意隐私政策
         AMapLocationClient.updatePrivacyAgree(this, true)
 
->>>>>>> 96a785bba4ad238e32ea70b32b8e36fd5775e800
         // 初始化导航视图
         naviView = findViewById(R.id.navi_view)
         naviView.onCreate(savedInstanceState)