安卓1.2.1代码修改，iOS1.2.2代码提交

circle_app/android/app/build.gradle

@@ -72,7 +72,7 @@ android {
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode 14
-        versionName "1.2.0"
+        versionName "1.2.2"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

circle_app/ios/Runner.xcodeproj/project.pbxproj

@@ -381,7 +381,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -573,7 +573,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.exampe.circleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

circle_app/lib/app/aboutapp/logic.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_install_app/flutter_install_app.dart';
+// import 'package:flutter_install_app/flutter_install_app.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -32,8 +32,10 @@ class AboutappLogic extends GetxController {
       _updateInfo = bean.data;
       version = bean.data.version;
       update();
+      if (isUpdate) {
         showReportDialog(Get.context!, bean.data.constraint == 0, bean.data);
       }
+    }
 
     //getVersion();
     //  getAppVersion();
@@ -51,7 +53,7 @@ class AboutappLogic extends GetxController {
     if(isUpdate){
       showReportDialog(Get.context!, _updateInfo!.constraint == 0, _updateInfo!);
     }else {
-      showOKToast("暂无新版本");
+      showOKToast("当前已经是最新版本！");
     }
 
   }

circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart

@@ -454,6 +454,8 @@ class _TIMTextFieldLayoutNarrowState
         _buildRepliedMessage(widget.repliedMessage),
         Stack(
           children: [
+
+
             Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.only(
@@ -677,7 +679,7 @@ class _TIMTextFieldLayoutNarrowState
                   Container(
                     height: 40.sp,
                     width: Get.width,
-                    margin: EdgeInsets.only(bottom: showEmojiPanel ? Platform.isIOS ? 40.sp : 10.sp : 0),
+                    margin: EdgeInsets.only(bottom: showEmojiPanel ? Platform.isIOS ? 0.sp : 10.sp : 0),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [
@@ -786,7 +788,7 @@ class _TIMTextFieldLayoutNarrowState
               ),
             ),
             Positioned(
-              bottom: MediaQuery.of(context).padding.bottom + 20,
+              bottom:0,
               child: AnimatedContainer(
                 duration: Duration(
                     milliseconds: (showKeyboard && PlatformUtils().isAndroid)
@@ -800,7 +802,7 @@ class _TIMTextFieldLayoutNarrowState
                   children: [_getBottomContainer()],
                 ),
               ),
-            )
+            ),
           ],
         )
       ],

circle_app/lib/app/chat/view.dart

@@ -114,12 +114,12 @@ class _ChatPageState extends State<ChatPage> {
     return TIMChat(
       conversation: Get.arguments,
       customStickerPanel: renderCustomStickerPanel,
-      onTapAvatar :(String userId,TapDownDetails tapDownDetails)async{
+      // onTapAvatar :(String userId,TapDownDetails tapDownDetails)async{
-      var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: userId.toString().split('_').last);
+      // var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: userId.toString().split('_').last,preventDuplicates: false);
-      // setState(() {
+      // // setState(() {
-      //
+      // //
-      // });
+      // // });
-      },
+      // },
       controller : _timuiKitChatController,
       config:  TIMUIKitChatConfig(
 
@@ -171,7 +171,7 @@ class _ChatPageState extends State<ChatPage> {
           centerTitle: con.showName! ?? '',
           actionWdiget: GestureDetector(
             onTap: () async{
-            var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: con.userID.toString().split('_').last);
+            var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: con.userID.toString().split('_').last,preventDuplicates: false);
 
             },
             child: Text('TA的主页',style: TextStyle(color: const Color(0xFF00FFF4),fontSize:12.sp,fontWeight: FontWeight.w500),),
@@ -190,7 +190,9 @@ class _ChatPageState extends State<ChatPage> {
     print(url);
     return GestureDetector(
       onTap: () async {
-        var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: message.sender!.toString().split('_').last);
+        // V2TimConversation con = Get.arguments;
+        // if (message.sender == con.userID.toString()) return;
+        var data = await  Get.toNamed(AppRoutes.UserInfoActivity,arguments: message.sender!.toString().split('_').last,preventDuplicates: false);
       },
         child: Stack(
           alignment: Alignment.center,

circle_app/lib/app/dialog/UpdateDialog.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
- import 'package:flutter_install_app/flutter_install_app.dart';
+ // import 'package:flutter_install_app/flutter_install_app.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -260,7 +260,7 @@ class _CustomDialogState extends State<UpdateDialog> {
           //  SmartDialog.dismiss();
           print(error);
         });
-     await AppInstaller.installApk(filePath, actionRequired: false);
+     // await AppInstaller.installApk(filePath, actionRequired: false);
   }
 }
 

circle_app/lib/app/splash/logic.dart

@@ -25,31 +25,29 @@ class SplashLogic extends GetxController {
   void onReady() async {
     // TODO: implement onReady
     super.onReady();
+    loadConfig();
+    checkStatus();
   }
 
-  @override
+  loadConfig() async {
-  void onInit() {
+    var data1 =
-    super.onInit();
+        await DioManager.instance.get(url: Api.getCircleList, params: {});
-    //  await Future.delayed(Duration(seconds: 30));
+    var bean1 = BaseResponse<ConfigBean>.fromJson(
+        data1, (data1) => ConfigBean.fromJson(data1));
+    if (bean1.code == 200) {
+      configBean = bean1.data!;
 
-    // var data1 =
+      configBean.genderMap.forEach((key, value) {
-    //     await DioManager.instance.get(url: Api.getCircleList, params: {});
+        genderList.add(value);
-    // var bean1 = BaseResponse<ConfigBean>.fromJson(
+      });
-    //     data1, (data1) => ConfigBean.fromJson(data1));
+
-    // if (bean1.code == 200) {
+      configBean.orientationMap.forEach((key, value) {
-    //   configBean = bean1.data!;
+        orientationList.add(value);
-    //
+      });
-    //   configBean.genderMap.forEach((key, value) {
+      configBean.roleMap.forEach((key, value) {
-    //     genderList.add(value);
+        roleList.add(value);
-    //   });
+      });
-    //
+    }
-    //   configBean.orientationMap.forEach((key, value) {
-    //     orientationList.add(value);
-    //   });
-    //   configBean.roleMap.forEach((key, value) {
-    //     roleList.add(value);
-    //   });
-    // }
   }
 
   checkStatus() async {

circle_app/lib/app/userinfo/view.dart

@@ -51,9 +51,6 @@ class MyTabbedScreenState extends State<UserinfoPage>
   @override
   void dispose() {
     _tabController.dispose();
-    if (OverlayClass.overlayEntry != null) {
-      OverlayClass.overlayEntry!.remove();
-    }
     super.dispose();
   }
 

circle_app/lib/main.dart

@@ -15,6 +15,7 @@ import 'package:circle_app/util/util.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bugly/flutter_bugly.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -503,6 +504,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                       const TextStyle(fontSize: 19.0, color: Colors.white),
                   backgroundColor: Colors.grey,
                   animationCurve: Curves.easeIn,
+
                   // animationBuilder: const Miui10AnimBuilder(),
                   animationDuration: const Duration(milliseconds: 200),
                   duration: const Duration(seconds: 2),
@@ -510,6 +512,17 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                     title: '微乐园',
                     initialBinding: SplashBinding(),
                     getPages: AppPages.routes,
+                    /// 国际化处理
+                    localizationsDelegates: const [
+                      GlobalMaterialLocalizations.delegate,
+                      GlobalWidgetsLocalizations.delegate,
+                      GlobalCupertinoLocalizations.delegate, /// iOS一定要设置，不然报错
+                    ],
+                    locale: const Locale('zh', 'CN'),
+                    supportedLocales : const [
+                      Locale('zh', 'CN'),
+                      Locale('en', 'US'),
+                    ],
                     home: SplashPage(),
                     builder: FlutterSmartDialog.init(),
                     debugShowCheckedModeBanner: false,

circle_app/lib/view/notice.dart

@@ -6,9 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 typedef void NoticeCallback();
- class OverlayClass {
+
-   static OverlayEntry? overlayEntry;
-}
 
 void showFloatingButtonOverlay(
     BuildContext context, String nickname, String ageMsg, String avatar,int event,NoticeCallback noticeCallback) {
@@ -22,7 +20,7 @@ void showFloatingButtonOverlay(
   late Timer countdownTimer;
 
   // 创建 OverlayEntry
-  OverlayClass.overlayEntry = OverlayEntry(
+  overlayEntry = OverlayEntry(
     builder: (BuildContext context) {
       return Positioned(
         top: 30,
@@ -119,11 +117,7 @@ void showFloatingButtonOverlay(
                   GestureDetector(
                     onTap: () {
                       countdownTimer.cancel(); // 取消计时器
-                      try {
+                        overlayEntry!.remove();
-                        OverlayClass.overlayEntry!.remove();
-                      } catch (e) {
-
-                      }
                       noticeCallback();
 
                       // logic.setLike();
@@ -180,14 +174,9 @@ void showFloatingButtonOverlay(
     } else {
       timer.cancel();
       // 取消计时器
-
+      overlayEntry!.remove();
-        try {
-          OverlayClass.overlayEntry!.remove();
-        } catch (e) {
-
-        }
     }
   });
   // 将 OverlayEntry 添加到 Overlay 中
-  overlayState?.insert(OverlayClass.overlayEntry!);
+  overlayState?.insert(overlayEntry!);
 }

circle_app/pubspec.lock

@@ -606,14 +606,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.3"
-  flutter_install_app:
-    dependency: "direct main"
-    description:
-      name: flutter_install_app
-      sha256: "9b117006d17c900e671c26bcbc9b15c7b8efd15d6f9b4442ad5d576de20fab53"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
   flutter_intl:
     dependency: "direct main"
     description:
@@ -646,6 +638,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_luban:
     dependency: "direct main"
     description:

circle_app/pubspec.yaml

@@ -31,6 +31,8 @@ dependencies:
   flutter:
     sdk: flutter
 
+  flutter_localizations: # 国际化处理
+    sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -93,7 +95,7 @@ dependencies:
   #event_bus:
   event_bus: ^2.0.0
   #安装apk
-  flutter_install_app: 1.3.0
+#  flutter_install_app: 1.3.0
   #闪屏页
   flutter_native_splash: 2.2.16
   #腾讯离线推送