diff --git a/android/gradle.properties b/android/gradle.properties
index fb26bd5a..90c0c415 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,8 +1,10 @@
 #org.gradle.jvmargs=-Xmx1536M
-org.gradle.jvmargs=-Xmx4096m
+#org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 MobSDK.mobEnv=x
 MobSDK.spEdition=FP
 android.injected.testOnly=false
+org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
+
 
diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart
index fe170086..4ca5a825 100644
--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:fast_gbk/fast_gbk.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:gbk2utf8/gbk2utf8.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/activity.dart';
 import 'package:huixiang/retrofit/data/article.dart';
diff --git a/pubspec.lock b/pubspec.lock
index f108ad48..60fcba17 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -217,6 +217,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
+  fast_gbk:
+    dependency: "direct main"
+    description:
+      name: fast_gbk
+      sha256: "3f0dc0309986f615404ea8d1fccf00a535dc00ee90b88d71492866bd95586489"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
   ffi:
     dependency: transitive
     description:
@@ -389,22 +397,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "9.2.0"
-  gbk2utf8:
-    dependency: "direct main"
-    description:
-      name: gbk2utf8
-      sha256: "83a255e974b970d20538c1661bd5b7ee9120e106fbb10478cffcd515ba480e34"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.1"
   geolocator:
     dependency: "direct main"
     description:
       name: geolocator
-      sha256: "01fed879aa87185efebfb1d23de619077bcc7d83ffdebd0aad6f74392f84fb40"
+      sha256: "3018f6a37b1ec3c9dfb1adaa1ce406c0522c293a1a623ead94c32cd93a255fd3"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.2.1"
+    version: "6.1.12"
   geolocator_platform_interface:
     dependency: transitive
     description:
@@ -413,14 +413,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.9"
-  geolocator_web:
-    dependency: transitive
-    description:
-      name: geolocator_web
-      sha256: "9a7f3c5061fb8fb26103fc67e07343eebd4d3b15d18c6d75766e2a1a8b0618f8"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.1"
   gradient_widgets:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index bb41d1c3..8accc489 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: 海峡姐妹.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 3.2.22+65
+version: 3.2.31+66
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -41,7 +41,7 @@ dependencies:
 
   permission_handler: ^5.0.1+1
 
-  geolocator: ^6.2.1
+  geolocator: ^6.1.12
 #  location: ^3.2.4
 
   dio: ^3.0.10
@@ -56,7 +56,7 @@ dependencies:
   flutter_screenutil: 5.0.0+1
   bubble_tab_indicator: ^0.1.6
 
-  gbk2utf8: ^1.0.1
+  fast_gbk: ^1.0.0
 
   visibility_detector: ^0.3.3