Merge branch 'dev' of https://git.onewaygame.cn/deepsound/deepvoice_client into lxm

local_plugins/amap_service/android/src/main/kotlin/com/yunqiinnovation/amap_service/NavigationActivity.kt

@@ -4,6 +4,10 @@ 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
@@ -35,6 +39,15 @@ 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)