2024-12-19 修改

修改：
1. bug修改 机场三字码获取详情时未获取国家

app/build.gradle

@@ -45,11 +45,11 @@ android {
 
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "17"
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -6,9 +6,6 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
@@ -24,6 +21,27 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
+    <!--用于进行网络定位-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!--用于访问GPS定位-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <!--用于获取运营商信息，用于支持提供运营商信息相关的接口-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!--用于访问wifi网络信息，wifi信息会用于进行网络定位-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <!--用于访问网络，网络定位需要上网-->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!--用于写入缓存数据到扩展存储卡-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--用于申请调用A-GPS模块-->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <!--如果设置了target >= 28 如果需要启动后台定位则必须声明这个权限-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <!--如果您的应用需要后台定位权限，且有可能运行在Android Q设备上,并且设置了target>28，必须增加这个权限声明-->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+
     <application
         android:name=".OASystem"
         android:allowBackup="true"
@@ -37,7 +55,8 @@
         tools:targetApi="31">
         <activity
             android:name=".ui.group_management.entry_and_exit_fee_detail.OtherPaymentDetailActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTop"/>
         <activity
             android:name=".ui.group_management.entry_and_exit_fee_detail.EntryAndExitPaymentDetailActivity"
             android:exported="false"
@@ -277,6 +296,10 @@
             </intent-filter>
         </activity>
 
+        <meta-data
+            android:name="com.amap.api.v2.apikey"
+            android:value="8502e62e1d6022fbf4288ed1aa390aa0	" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.pan_american.android.file_provider"
@@ -288,6 +311,9 @@
         </provider>
 
         <service android:name=".data.network.TCPService" />
+        
+        <service android:name="com.amap.api.location.APSService" />
+        
     </application>
 
 </manifest>

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AddAirplaneThreeCodeActivity.kt

@@ -113,6 +113,7 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
                             four = detailResponse.data.four
                             airPort = detailResponse.data.airPort
                             airPort_En = detailResponse.data.airPort_En
+                            country = detailResponse.data.country
                             city = detailResponse.data.city
                             remark = detailResponse.data.remark
                         }