Merge pull request #37 from netease-george/main

feat:9.7.0 发布
netease-kit · Jan 25, 2024 · 1c98d1d · 1c98d1d
2 parents e4ed77e + ef7dba1
commit 1c98d1d
Show file tree

Hide file tree

Showing 98 changed files with 4,834 additions and 1,168 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/im_demo/CHANGELOG.md b/im_demo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # IMKit(Flutter) ChangeLog
 
+## 9.7.0(Jan 25, 2024)
+### New Features
+* 新增合并转发和多选功能
+* 新增群管理
+* 新增换行消息
+
 ## 1.2.0(Nov 8, 2023)
 ### New Features
 * 新增@功能

diff --git a/im_demo/android/app/src/main/res/values/strings.xml b/im_demo/android/app/src/main/res/values/strings.xml
@@ -3,5 +3,5 @@
 <!-- found in the LICENSE file. -->
 
 <resources>
-    <string name="app_name">云信IM</string>
+    <string name="app_name">云信IM(flutter)</string>
 </resources>
diff --git a/im_demo/ios/Podfile b/im_demo/ios/Podfile
@@ -85,6 +85,14 @@ post_install do |installer|
              ## dart: PermissionGroup.bluetooth
              # 'PERMISSION_BLUETOOTH=0'
            ]
+         #https://github.com/fluttercommunity/plus_plugins/issues/2154#issuecomment-1730330223
+         config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+
+         #https://stackoverflow.com/a/77134628/5734049
+         xcconfig_path = config.base_configuration_reference.real_path
+         xcconfig = File.read(xcconfig_path)
+         xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+         File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
          end
 
   end

diff --git a/im_demo/ios/Runner/Info.plist b/im_demo/ios/Runner/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>云信IM</string>
+	<string>云信IM(flutter)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

diff --git a/im_demo/lib/src/home/home_page.dart b/im_demo/lib/src/home/home_page.dart
@@ -4,7 +4,13 @@
 
 import 'dart:convert';
 
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:im_demo/l10n/S.dart';
+import 'package:im_demo/src/mine/mine_page.dart';
+import 'package:netease_common_ui/utils/color_utils.dart';
 import 'package:netease_corekit_im/router/imkit_router_factory.dart';
 import 'package:netease_corekit_im/service_locator.dart';
 import 'package:netease_corekit_im/services/login/login_service.dart';
@@ -13,17 +19,11 @@ import 'package:nim_chatkit_ui/chat_kit_client.dart';
 import 'package:nim_chatkit_ui/view/chat_kit_message_list/item/chat_kit_message_item.dart';
 import 'package:nim_chatkit_ui/view/input/actions.dart';
 import 'package:nim_chatkit_ui/view_model/chat_view_model.dart';
-import 'package:netease_common_ui/utils/color_utils.dart';
 import 'package:nim_contactkit/repo/contact_repo.dart';
 import 'package:nim_contactkit_ui/page/contact_page.dart';
 import 'package:nim_conversationkit/repo/conversation_repo.dart';
 import 'package:nim_conversationkit_ui/conversation_kit_client.dart';
 import 'package:nim_conversationkit_ui/page/conversation_page.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:im_demo/l10n/S.dart';
-import 'package:im_demo/src/mine/mine_page.dart';
 import 'package:nim_core/nim_core.dart';
 import 'package:provider/provider.dart';
 import 'package:yunxin_alog/yunxin_alog.dart';
@@ -164,11 +164,12 @@ class _HomePageState extends State<HomePage> {
     ConversationKitClient.instance.conversationUIConfig = ConversationUIConfig(
         itemConfig: ConversationItemConfig(
             lastMessageContentBuilder: (context, conversationInfo) {
-      if (conversationInfo.session.lastMessageType == NIMMessageType.custom) {
-        return S.of(context).customMessage;
-      }
-      return null;
-    }));
+              if (conversationInfo.session.lastMessageType == NIMMessageType.custom &&
+                  conversationInfo.session.lastMessageAttachment == null) {
+                return S.of(context).customMessage;
+              }
+              return null;
+            }));
   }
 
   @override

diff --git a/im_demo/lib/src/mine/about.dart b/im_demo/lib/src/mine/about.dart
@@ -51,7 +51,7 @@ class AboutPage extends StatelessWidget {
               ),
               // 如果引入package_info 则不需要手动修改此处，但是如果只为了版本号引入不值得
               trailing: Text(
-                'V1.2.0',
+                'V9.7.0',
                 style: _style,
               ),
             ),

diff --git a/im_demo/pubspec.yaml b/im_demo/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.0
+version: 9.7.0
 
 environment:
   sdk: ">=2.16.1 <4.0.0"
@@ -32,16 +32,6 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-
-  netease_corekit_im:
-    ">=1.2.0 <1.3.0"
-#    path: ../../netease_corekit/netease_corekit_im
-  netease_common_ui:
-    ">=1.2.0 <1.3.0"
-#    path: ../../common/netease_common_ui
-  nim_conversationkit:
-    ">=1.2.0 <1.3.0"
-#    path: ../nim_conversationkit
   nim_conversationkit_ui:
     path: ../nim_conversationkit_ui
   nim_chatkit_ui:
@@ -55,18 +45,15 @@ dependencies:
 #  地理位置消息支持
   nim_chatkit_location:
     path: ../nim_chatkit_location
-  nim_core:
-    ^1.7.3
-#    path: ../../nim_core/nim_core
   yunxin_alog: ^2.0.0
-  fluttertoast: ^8.1.2
+  fluttertoast: ^8.2.4
     #  高德定位
   amap_flutter_location: ^3.0.0
     #  高德地图
   amap_flutter_map: ^3.0.0
   permission_handler: ^11.0.1
   # 网图加载
-  cached_network_image: ^3.2.3
+  cached_network_image: ^3.3.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

diff --git a/nim_chatkit_location/CHANGELOG.md b/nim_chatkit_location/CHANGELOG.md
@@ -1,5 +1,9 @@
 # NimChatKitLocation ChangeLog
 
+## 9.7.0(Jan 25, 2024)
+### Dependency Updates
+* 升级FlutterToast 到^8.2.4
+
 ## 1.2.0(Nov 8, 2023)
 ### New Features
 * 位置消息功能独立模块

diff --git a/nim_chatkit_location/README.md b/nim_chatkit_location/README.md
@@ -1,13 +1,11 @@
-# kit.nim_chatkit_location
+# nim_chatkit_location
 
-提供位置消息功能实现（包含UI）
+A new Flutter project.
 
-### Declaring dependencies
-如需添加 ChatKitUI 的依赖项，您必须将 pub 库添加到项目中。
+## Getting Started
 
-在应用或模块的 `pubspec.yaml` 文件中添加所需工件的依赖项：
+For help getting started with Flutter development, view the online
+[documentation](https://flutter.dev/).
 
-```
-dependencies:
-  nim_chatkit_location: ^1.0.0
-```
+For instructions integrating Flutter modules to your existing applications,
+see the [add-to-app documentation](https://flutter.dev/docs/development/add-to-app).