Merge branch 'v1.0.0' of git.atmob.com:Atmob-Flutter/location2025 into v1.0.0

# Conflicts:
#	lib/data/api/atmob_api.g.dart

android/app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "com.trace.location"
     compileSdk = rootProject.ext.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = rootProject.ext.ndkVersion
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

android/build.gradle

@@ -1,9 +1,10 @@
 allprojects {
     ext {
-        compileSdkVersion = 34
+        compileSdkVersion = 35
         applicationId = "com.shishi.dingwei"
         minSdkVersion = 23
         targetSdkVersion = 34
+        ndkVersion = '27.0.12077973'
     }
     repositories {
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

android/settings.gradle

@@ -20,7 +20,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.7.0" apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 

lib/data/api/atmob_api.dart

@@ -34,9 +34,8 @@ import 'package:location/data/api/response/request_pay_response.dart';
 import 'package:location/data/api/response/subscription_check_response.dart';
 import 'package:retrofit/error_logger.dart';
 import 'package:retrofit/http.dart';
-
+import 'package:retrofit/dio.dart';
 import '../bean/user_info.dart';
-
 part 'atmob_api.g.dart';
 
 @RestApi()
@@ -87,7 +86,7 @@ abstract class AtmobApi {
 
   @POST("/s/v1/location/track/query")
   Future<BaseResponse<QueryTrackResponse>> queryTrack(
-      @Body() QueryTrackRequest request);
+      @Body() QueryTrackRequest request, @DioOptions() RequestOptions options);
 
   @POST("/s/v1/friend/get")
   Future<BaseResponse<UserInfo?>> getUserInfoFromId(

lib/data/api/atmob_api.g.dart

@@ -440,28 +440,27 @@ class _AtmobApi implements AtmobApi {
 
   @override
   Future<BaseResponse<QueryTrackResponse>> queryTrack(
-      QueryTrackRequest request) async {
+    QueryTrackRequest request,
+    RequestOptions options,
+  ) async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     final _data = <String, dynamic>{};
     _data.addAll(request.toJson());
-    final _options = _setStreamType<BaseResponse<QueryTrackResponse>>(Options(
+    final newOptions = newRequestOptions(options);
+    newOptions.extra.addAll(_extra);
+    newOptions.headers.addAll(_dio.options.headers);
+    newOptions.headers.addAll(_headers);
+    final _options = newOptions.copyWith(
       method: 'POST',
-      headers: _headers,
-      extra: _extra,
-    )
-        .compose(
-          _dio.options,
-          '/s/v1/location/track/query',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        )));
+      baseUrl: _combineBaseUrls(
+        _dio.options.baseUrl,
+        baseUrl,
+      ),
+      queryParameters: queryParameters,
+      path: '/s/v1/location/track/query',
+    )..data = _data;
     final _result = await _dio.fetch<Map<String, dynamic>>(_options);
     late BaseResponse<QueryTrackResponse> _value;
     try {
@@ -1319,6 +1318,31 @@ class _AtmobApi implements AtmobApi {
     return _value;
   }
 
+  RequestOptions newRequestOptions(Object? options) {
+    if (options is RequestOptions) {
+      return options as RequestOptions;
+    }
+    if (options is Options) {
+      return RequestOptions(
+        method: options.method,
+        sendTimeout: options.sendTimeout,
+        receiveTimeout: options.receiveTimeout,
+        extra: options.extra,
+        headers: options.headers,
+        responseType: options.responseType,
+        contentType: options.contentType.toString(),
+        validateStatus: options.validateStatus,
+        receiveDataWhenStatusError: options.receiveDataWhenStatusError,
+        followRedirects: options.followRedirects,
+        maxRedirects: options.maxRedirects,
+        requestEncoder: options.requestEncoder,
+        responseDecoder: options.responseDecoder,
+        path: '',
+      );
+    }
+    return RequestOptions(path: '');
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/data/repositories/track_repository.dart

@@ -1,3 +1,4 @@
+import 'package:dio/dio.dart';
 import 'package:injectable/injectable.dart';
 import 'package:location/base/app_base_request.dart';
 import 'package:location/data/api/atmob_api.dart';
@@ -23,8 +24,12 @@ class TrackRepository {
       required int? endTime,
       required String? userId}) {
     return atmobApi
-        .queryTrack(QueryTrackRequest(
-            startTime: startTime, endTime: endTime, userId: userId))
+        .queryTrack(
+            QueryTrackRequest(
+                startTime: startTime, endTime: endTime, userId: userId),
+            RequestOptions(
+                receiveTimeout: Duration(seconds: 30),
+                connectTimeout: Duration(minutes: 2)))
         .then(HttpHandler.handle(true));
   }
 }

plugins/agile_pay/lib/src/alipay/alipay.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
+import 'package:alipay_kit_has_namespace/alipay_kit.dart';
 import 'package:flutter/widgets.dart';
 
 import '../assist/agile_pay_state_info.dart';
 import '../code/agile_pay_code.dart';
 import '../listener/i_agile_pay.dart';
 import 'ali_pay_info.dart';
-import 'package:alipay_kit/alipay_kit.dart';
 
 class Alipay extends AgilePayStateInfo implements IAgilePay {
   final AliPayInfo _aliPayInfo;

plugins/agile_pay/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   #支付
-  alipay_kit: ^6.0.0
+  alipay_kit_has_namespace: ^6.0.0
   #微信支付
   wechat_kit: ^6.0.1
   #goodle & apple

pubspec.lock

@@ -21,19 +21,19 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  alipay_kit:
+  alipay_kit_android_has_namespace:
     dependency: transitive
     description:
-      name: alipay_kit
-      sha256: "6d6086b4cda1e0cd9b29b6dfe8d0ce88b9efc1c9f2c8d6fb39ac24c4e0f79b06"
+      name: alipay_kit_android_has_namespace
+      sha256: "539db451eb750f20a84ca3907c730f985f4384897b3a6b3aed609e5f0a42878d"
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
-  alipay_kit_android:
+  alipay_kit_has_namespace:
     dependency: transitive
     description:
-      name: alipay_kit_android
-      sha256: "402917c30e5a1c1bb36cab7c99e355f65a98da96c2666657805a985b00937f6f"
+      name: alipay_kit_has_namespace
+      sha256: "6b86b80be2469285b0ba2396a8b71e2b372fcee6806c26e6ec7e8b5d934c750d"
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
@@ -794,42 +794,42 @@ packages:
     dependency: "direct main"
     description:
       name: mmkv
-      sha256: f725842c2dc07f6d30e944611c8a12e0def07c5b1eaf7a5e5f6e2c24b1678d00
+      sha256: "2cd899fe1d59c2ffd8c552202fde7a8701c85f290480daa9838a78f82c4de0fa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.2.2"
   mmkv_android:
     dependency: transitive
     description:
       name: mmkv_android
-      sha256: aa4521073e635367e9dc26548b606879dd4cb00391d755fd4fd9681e23a79caa
+      sha256: "0407d7a0338a56c20e9281363009fafa2c20b4e524d0058f9a614c6d482b123f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.2"
   mmkv_ios:
     dependency: transitive
     description:
       name: mmkv_ios
-      sha256: ff8c14134d22f79ca067fa24ebb7d5df1aadb7875c00e9e715befae4bf8e46d9
+      sha256: "79868842d886fc4f9a38fa75ab0f3ac03068a65405f6cb125ffa8bb427989ee7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.2"
   mmkv_ohos:
     dependency: transitive
     description:
       name: mmkv_ohos
-      sha256: d263180e82b2508d05ab9df31fd5236c81b257246d9c5f5b9c73e1a4a532ea3b
+      sha256: a4e96832f9ecb0adb13e9f65ecd81a18945c044d844d077c896ab90365166b28
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.2.2"
   mmkv_platform_interface:
     dependency: transitive
     description:
       name: mmkv_platform_interface
-      sha256: "5980cf939c065c8dec2fc051e49d98e4afcc16bc1a6bbc96f9614814fd540c43"
+      sha256: "65d5c1a2c43ad5d064bbf956eed45bb62e89c4fe8ccac40de829959e16ba62d1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.1"
   oaid:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -57,7 +57,7 @@ dependencies:
   flutter_smart_dialog: 4.9.8
 
   #数据存储
-  mmkv: 2.0.2
+  mmkv: 2.2.2
 
   #权限申请
   permission_handler: 11.3.1