IP获取城市修改

lib/address/city_picker_page.dart

@@ -57,15 +57,17 @@ class _CityPickerPage extends State<CityPickerPage> {
                 style: TextStyle(
                     fontSize: 12.sp,
                     color: Colors.black,
-                    fontWeight: MyFontWeight.regular),
+                    fontWeight: MyFontWeight.regular,
+                ),
               ),
             ),
           ),
           Container(
             width: 1.w,
             color: Colors.black,
-            margin:
+            margin: EdgeInsets.only(
-                EdgeInsets.only(top: 2.h, bottom: 2.h, left: 10.w, right: 16.w),
+              top: 2.h, bottom: 2.h, left: 10.w, right: 16.w,
+            ),
           ),
           Icon(
             Icons.search,

lib/constant.dart

@@ -11,8 +11,6 @@ const String chatImageHost = "http://skk8mlm5b.hn-bkt.clouddn.com/";
 const String socketHost = kDebugMode ? '192.168.10.200' : '47.93.216.24';
 const int socketPort = 9090;
 
-const ipBaseUrl = "http://whois.pconline.com.cn";
-
 /// 小程序接口的请求地址
 const localMiniBaseUrl = "http://192.168.10.54:8765/app/"; ///本地
 ///线上

lib/data/mip_data.dart

@@ -0,0 +1,29 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'mip_data.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class MIpData {
+	String? ret;
+	Mip? data;
+
+	MIpData();
+
+	factory MIpData.fromJson(Map<String, dynamic> json) => _$MIpDataFromJson(json);
+
+	Map<String, dynamic> toJson() => _$MIpDataToJson(this);
+
+}
+
+@JsonSerializable(explicitToJson: true)
+class Mip {
+	String? ip;
+	List<String>? location;
+
+
+	Mip({this.ip, this.location});
+
+	factory Mip.fromJson(Map<String, dynamic> json) => _$MipFromJson(json);
+	Map<String, dynamic> toJson() => _$MipToJson(this);
+
+}

lib/data/mip_data.g.dart

@@ -0,0 +1,30 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'mip_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+MIpData _$MIpDataFromJson(Map<String, dynamic> json) => MIpData()
+  ..ret = json['ret'] as String?
+  ..data = json['data'] == null
+      ? null
+      : Mip.fromJson(json['data'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$MIpDataToJson(MIpData instance) => <String, dynamic>{
+      'ret': instance.ret,
+      'data': instance.data?.toJson(),
+    };
+
+Mip _$MipFromJson(Map<String, dynamic> json) => Mip(
+      ip: json['ip'] as String?,
+      location: (json['location'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList(),
+    );
+
+Map<String, dynamic> _$MipToJson(Mip instance) => <String, dynamic>{
+      'ip': instance.ip,
+      'location': instance.location,
+    };

lib/data/vip_card.dart

@@ -68,11 +68,11 @@ class VipCard {
 
 	VipCard();
 
+	@JsonKey(includeToJson: false, includeFromJson: false)
 	Color color = Color(0xFF32A060);
 
 	factory VipCard.fromJson(Map<String, dynamic> json) => _$VipCardFromJson(json);
 
 	Map<String, dynamic> toJson() => _$VipCardToJson(this);
 
-
 }

lib/main_page.dart

@@ -90,6 +90,8 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
         break;
       case AppLifecycleState.detached: // APP结束时调用
         break;
+      case AppLifecycleState.hidden:
+        break;
     }
   }
 

lib/retrofit/min_api.g.dart

@@ -14,7 +14,7 @@ class _MinApiService implements MinApiService {
     this.baseUrl,
     this.errorLogger,
   }) {
-    baseUrl ??= serviceMiniBaseUrl;
+    baseUrl ??= 'http://192.168.10.54:8765/app/';
   }
 
   final Dio _dio;

lib/retrofit/retrofit_api.dart

@@ -81,7 +81,6 @@ abstract class ApiService {
     BuildContext? context,
     String? token,
     bool showLoading = false,
-    bool isIp = false,
     bool pay = true,
     ParseErrorLogger? errorLogger,
   }) {
@@ -91,7 +90,6 @@ abstract class ApiService {
     }
     print("软件当前运行的模式 kReleaseMode:" + (kReleaseMode ? "发布模式" : "调试模式"));
     baseUrl = kReleaseMode ? serviceBaseUrl : localBaseUrl;
-    if (isIp) baseUrl = ipBaseUrl;
     dio.options = BaseOptions(
       connectTimeout: 30000.milliseconds,
       receiveTimeout: 30000.milliseconds,
@@ -188,14 +186,12 @@ abstract class ApiService {
       @Part(name: "folderId") int folderId, bool isVideo);
 
   /// 周边搜索
-  @GET(
+  @GET("https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all")
-      "https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all")
   Future<dynamic> searchPoi(@Path("lat") String lat, @Path("lng") String lng,
       @Path("keywords") String keywords, int size, int page);
 
   /// 逆地理编码
-  @GET(
+  @GET("https://restapi.amap.com/v3/geocode/regeo?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&extensions=base")
-      "https://restapi.amap.com/v3/geocode/regeo?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&extensions=base")
   Future<dynamic> geocodeRegeo(
       @Path("lat") String lat, @Path("lng") String lng);
 
@@ -612,12 +608,15 @@ abstract class ApiService {
 
   ///兑换积分门店列表
   @GET("/store/storeListByCreditId/{creditGoodsId}")
-  Future<BaseListData<Store>> storeListByCreditId(
+  Future<BaseListData<Store>> storeListByCreditId(@Path("creditGoodsId") String creditGoodsId);
-      @Path("creditGoodsId") String creditGoodsId);
+
+  ///获取APP门店推广渠道
+  @GET("http://whois.pconline.com.cn/ipJson.jsp?json=true")
+  Future<String> getIpInfo();
 
   ///获取APP门店推广渠道
-  @GET("/ipJson.jsp")
+  @GET("https://myip.ipip.net/json")
-  Future<String?> getIpInfo();
+  Future<String> getIpInfo1();
 
   // Future<Uint8List> getUrlFile(String url);
 

lib/retrofit/retrofit_api.g.dart

@@ -14,7 +14,7 @@ class _ApiService implements ApiService {
     this.baseUrl,
     this.errorLogger,
   }) {
-    baseUrl ??= serviceBaseUrl;
+    baseUrl ??= 'http://192.168.10.54:8766/app/';
   }
 
   final Dio _dio;
@@ -3744,7 +3744,7 @@ class _ApiService implements ApiService {
   }
 
   @override
-  Future<String?> getIpInfo() async {
+  Future<String> getIpInfo() async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
@@ -3756,7 +3756,7 @@ class _ApiService implements ApiService {
     )
         .compose(
           _dio.options,
-          '/ipJson.jsp',
+          'http://whois.pconline.com.cn/ipJson.jsp?json=true',
           queryParameters: queryParameters,
           data: _data,
         )
@@ -3766,9 +3766,42 @@ class _ApiService implements ApiService {
           baseUrl,
         )));
     final _result = await _dio.fetch<String>(_options);
-    late String? _value;
+    late String _value;
     try {
-      _value = _result.data;
+      _value = _result.data!;
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    return _value;
+  }
+
+  @override
+  Future<String> getIpInfo1() async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    const Map<String, dynamic>? _data = null;
+    final _options = _setStreamType<String>(Options(
+      method: 'GET',
+      headers: _headers,
+      extra: _extra,
+    )
+        .compose(
+          _dio.options,
+          'https://myip.ipip.net/json',
+          queryParameters: queryParameters,
+          data: _data,
+        )
+        .copyWith(
+            baseUrl: _combineBaseUrls(
+          _dio.options.baseUrl,
+          baseUrl,
+        )));
+    final _result = await _dio.fetch<String>(_options);
+    late String _value;
+    try {
+      _value = _result.data!;
     } on Object catch (e, s) {
       errorLogger?.logError(e, s, _options);
       rethrow;

lib/union/union_page.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
@@ -10,6 +11,7 @@ import 'package:geolocator/geolocator.dart';
 import 'package:get/utils.dart';
 import 'package:huixiang/constant.dart';
 import 'package:huixiang/data/ip_data.dart';
+import 'package:huixiang/data/mip_data.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/main.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
@@ -197,18 +199,14 @@ class UnionPageState extends State<UnionPage>
   queryIpInfo() async {
     S.current.zhengzaijiazai.loading;
     try {
-      ApiService apiIpService = ApiService(Dio(), context: context, isIp: true);
+      ApiService apiIpService = ApiService(Dio(), context: context);
-      String? baseData = await apiIpService.getIpInfo().catchError((onError) {
+      String ipResult = await apiIpService.getIpInfo1().catchError((onError) {
-        debugPrint("onError: ${onError}");
+        return "";
-        return Future.value(null);
       });
-      if (baseData?.isNotEmpty ?? false) {
+      if (ipResult.isNotEmpty) {
-        debugPrint("baseData: ${baseData}");
+        String string = ipResult.replaceAll("\n", "");
-        String ipDataStr = baseData!
+        MIpData ipData = MIpData.fromJson(jsonDecode(string));
-            .replaceAll("if(window.IPCallBack) {IPCallBack(", "")
+        areaName = ipData.data?.location?[2];
-            .replaceAll(");}", "");
-        IpData ipData = IpData.fromJson(jsonDecode(ipDataStr));
-        areaName = ipData.city?.replaceAll("市", "");
       }
     } finally {
       getLocation(showLoading: false);
@@ -218,8 +216,9 @@ class UnionPageState extends State<UnionPage>
 
   loadFinish({bool showLoading = true}) {
     SmartDialog.dismiss(status: SmartStatus.loading);
-    if (showLoading)
+    if (showLoading) {
       S.current.zhengzaijiazai.loading;
+    }
     _allKey = [GlobalKey(), GlobalKey(), GlobalKey(), GlobalKey()];
     setState(() {});
   }

lib/union/union_select_city.dart

@@ -3,12 +3,13 @@ import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:huixiang/data/ip_data.dart';
+import 'package:huixiang/data/mip_data.dart';
+import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
-import '../data/ip_data.dart';
-import '../retrofit/retrofit_api.dart';
 
 class UnionSelectCity extends StatefulWidget {
   final Map<String, dynamic>? arguments;
@@ -23,7 +24,6 @@ class UnionSelectCity extends StatefulWidget {
 class _UnionSelectCity extends State<UnionSelectCity> {
   RefreshController refreshController = RefreshController();
   late Map<String, dynamic> areaMap;
-  ApiService? apiIpService;
   String? ipName;
   int ipState = 0;
   List<String> hotCity = [];
@@ -60,19 +60,19 @@ class _UnionSelectCity extends State<UnionSelectCity> {
   }
 
   queryIpInfo() async {
-    apiIpService = ApiService(
+    ApiService? apiIpService = ApiService(
         Dio(),
         context: context,
-        isIp: true
     );
-    String? baseData = await apiIpService?.getIpInfo().catchError((onError) {});
+    String ipResult = await apiIpService.getIpInfo1().catchError((onError) {
-    if (baseData?.isNotEmpty ?? false) {
+      return "";
-      print("baseData: ${baseData}");
+    });
-      String ipDataStr = baseData!.replaceAll("if(window.IPCallBack) {IPCallBack(", "").replaceAll(");}", "");
+    if (ipResult.isNotEmpty) {
-      IpData ipData = IpData.fromJson(jsonDecode(ipDataStr));
+      String string = ipResult.replaceAll("\n", "");
-      ipName = ipData.city?.replaceAll("市", "");
+      MIpData ipData = MIpData.fromJson(jsonDecode(string));
+      ipName = ipData.data?.location?[2];
     }
-    if(ipName != widget.arguments?["cityName"] ){
+    if (ipName != widget.arguments?["cityName"] && (ipName?.isNotEmpty ?? false)) {
       ipState = 2;
       setState((){});
     }