Merge branch 'feature/gc/ios_mapkit_adapt' of git.atmob.com:Atmob-Flutter/location2025 into feature/gc/ios_mapkit_adapt

lib/data/api/atmob_api.dart

@@ -7,6 +7,7 @@ import 'package:location/data/api/request/contact_request.dart';
 import 'package:location/data/api/request/friends_list_request.dart';
 import 'package:location/data/api/request/friends_operation_request.dart';
 import 'package:location/data/api/request/login_request.dart';
+import 'package:location/data/api/request/member_list_request.dart';
 import 'package:location/data/api/request/message_request.dart';
 import 'package:location/data/api/request/operation_friend_request.dart';
 import 'package:location/data/api/request/order_status_request.dart';
@@ -148,7 +149,7 @@ abstract class AtmobApi {
 
   @POST("/s/v1/item/list")
   Future<BaseResponse<ItemListResponse>> getMemberList(
-      @Body() AppBaseRequest request);
+      @Body() MemberListRequest request);
 
   @POST("/s/v1/order/submitAndRequestPay")
   Future<BaseResponse<RequestPayResponse>> submitAndRequestPay(

lib/data/api/atmob_api.g.dart

@@ -1091,7 +1091,7 @@ class _AtmobApi implements AtmobApi {
 
   @override
   Future<BaseResponse<ItemListResponse>> getMemberList(
-      AppBaseRequest request) async {
+      MemberListRequest request) async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};

lib/data/api/request/member_list_request.dart

@@ -0,0 +1,15 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:location/base/app_base_request.dart';
+
+part 'member_list_request.g.dart';
+
+@JsonSerializable()
+class MemberListRequest extends AppBaseRequest {
+  @JsonKey(name: 'itemListType')
+  int? itemListType;
+
+  MemberListRequest(this.itemListType);
+
+  @override
+  Map<String, dynamic> toJson() => _$MemberListRequestToJson(this);
+}

lib/data/api/request/member_list_request.g.dart

@@ -0,0 +1,69 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'member_list_request.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+MemberListRequest _$MemberListRequestFromJson(Map<String, dynamic> json) =>
+    MemberListRequest(
+      (json['itemListType'] as num?)?.toInt(),
+    )
+      ..appPlatform = (json['appPlatform'] as num).toInt()
+      ..os = json['os'] as String
+      ..osVersion = json['osVersion'] as String
+      ..packageName = json['packageName'] as String?
+      ..appVersionName = json['appVersionName'] as String?
+      ..appVersionCode = (json['appVersionCode'] as num?)?.toInt()
+      ..channelName = json['channelName'] as String?
+      ..appId = (json['appId'] as num?)?.toInt()
+      ..tgPlatform = (json['tgPlatform'] as num?)?.toInt()
+      ..oaid = json['oaid'] as String?
+      ..aaid = json['aaid'] as String?
+      ..androidId = json['androidId'] as String?
+      ..imei = json['imei'] as String?
+      ..simImei0 = json['simImei0'] as String?
+      ..simImei1 = json['simImei1'] as String?
+      ..mac = json['mac'] as String?
+      ..idfa = json['idfa'] as String?
+      ..idfv = json['idfv'] as String?
+      ..machineId = json['machineId'] as String?
+      ..brand = json['brand'] as String?
+      ..model = json['model'] as String?
+      ..wifiName = json['wifiName'] as String?
+      ..region = json['region'] as String?
+      ..locLng = (json['locLng'] as num?)?.toDouble()
+      ..locLat = (json['locLat'] as num?)?.toDouble()
+      ..authToken = json['authToken'] as String?;
+
+Map<String, dynamic> _$MemberListRequestToJson(MemberListRequest instance) =>
+    <String, dynamic>{
+      'appPlatform': instance.appPlatform,
+      'os': instance.os,
+      'osVersion': instance.osVersion,
+      'packageName': instance.packageName,
+      'appVersionName': instance.appVersionName,
+      'appVersionCode': instance.appVersionCode,
+      'channelName': instance.channelName,
+      'appId': instance.appId,
+      'tgPlatform': instance.tgPlatform,
+      'oaid': instance.oaid,
+      'aaid': instance.aaid,
+      'androidId': instance.androidId,
+      'imei': instance.imei,
+      'simImei0': instance.simImei0,
+      'simImei1': instance.simImei1,
+      'mac': instance.mac,
+      'idfa': instance.idfa,
+      'idfv': instance.idfv,
+      'machineId': instance.machineId,
+      'brand': instance.brand,
+      'model': instance.model,
+      'wifiName': instance.wifiName,
+      'region': instance.region,
+      'locLng': instance.locLng,
+      'locLat': instance.locLat,
+      'authToken': instance.authToken,
+      'itemListType': instance.itemListType,
+    };

lib/data/repositories/member_repository.dart

@@ -5,6 +5,7 @@ import 'package:location/data/repositories/account_repository.dart';
 import 'package:location/utils/http_handler.dart';
 
 import '../../utils/payment_status_manager.dart';
+import '../api/request/member_list_request.dart';
 import '../api/request/order_status_request.dart';
 import '../api/request/submit_and_request_pay_request.dart';
 import '../api/response/item_list_response.dart';
@@ -24,9 +25,9 @@ class MemberRepository {
         .then((response) => response.freeMemberMinutes);
   }
 
-  Future<ItemListResponse> getMemberList() {
+  Future<ItemListResponse> getMemberList({int? itemListType}) {
     return atmobApi
-        .getMemberList(AppBaseRequest())
+        .getMemberList(MemberListRequest(itemListType))
         .then(HttpHandler.handle(true));
   }
 

lib/module/member/member_controller.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math';
 
 import 'package:agile_pay/flutter_pay.dart';
@@ -192,7 +193,9 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   }
 
   Future<void> _requestMemberData() {
-    return memberRepository.getMemberList().then((response) {
+    return memberRepository
+        .getMemberList(itemListType: Platform.isIOS ? 2 : 0)
+        .then((response) {
       goodsList.clear();
       payItemList.clear();
       _selectedGoods.value = null;