Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	lib/login/login_page.dart

	pubspec.lock

android/gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

lib/article/hot_article_details_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
+import 'package:share/share.dart';
 
 class HotArticleDetailsPage extends StatefulWidget {
   @override

lib/home/activity_list_page.dart

@@ -64,6 +64,12 @@ class _ActivityListPage extends State<ActivityListPage>
     }
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    _refreshController.dispose();
+  }
+
   RefreshController _refreshController = RefreshController();
 
   @override

lib/union/store_details_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter_html/image_render.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:share/share.dart';
 
 class StoreDetailsPage extends StatefulWidget {
   final Map<String, dynamic> arguments;
@@ -26,7 +27,9 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
         action: Container(
               margin: EdgeInsets.only(right: 15),
               child: GestureDetector(
-                onTap: () {},
+                onTap: () {
+                  Share.share('https://www.sohu.com/a/346415345_99912465');
+                },
                 child: Icon(
                   Icons.share,
                   size: 24,

pubspec.yaml

@@ -39,6 +39,7 @@ dependencies:
   permission_handler: ^5.0.1+1
   amap_flutter_map: ^1.0.0
   amap_flutter_location: ^2.0.0  # Null safety
+  share: ^0.6.1+1
 
 #  flutter_baidu_mapapi_search: ^2.0.1
 #  flutter_baidu_mapapi_map: ^2.0.1
@@ -79,13 +80,14 @@ dependencies:
   cached_network_image: ^2.0.0
 
   flutter_html: ^1.3.0    #2.1.0
-  photo_view: ^0.11.1
+#  photo_view: ^0.11.1
 
   chewie: ^0.12.2
   video_player: ^1.0.1
 
   package_info: ^2.0.2
 
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -93,6 +95,7 @@ dev_dependencies:
   build_runner: ^1.11.5
   json_serializable: ^3.5.1
 
+
 flutter:
 
   uses-material-design: true