Merge pull request #43 from netease-george/main

feat:9.7.2 发布

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: 9.7.1
+version: 9.7.2
 
 environment:
   sdk: ">=2.16.1 <4.0.0"

nim_chatkit_location/CHANGELOG.md

@@ -1,5 +1,9 @@
 # NimChatKitLocation ChangeLog
 
+## 9.7.2(Jun 20, 2024)
+### Bug fix
+* 修复上报数据版本号问题
+
 ## 9.7.1(Feb 21, 2024)
 ### New Features
 * 地图位置消息插件化实现

nim_chatkit_location/lib/chat_kit_location.dart

@@ -18,7 +18,7 @@ import 'l10n/S.dart';
 class ChatKitLocation {
   static const String kPackage = 'nim_chatkit_location';
 
-  static const String _kVersion = '1.0.0';
+  static const String _kVersion = '9.7.2';
 
   static const String _kName = 'ChatKitLocation';
 

nim_chatkit_location/lib/l10n/chatLocation_localization/chat_kit_location_client_localizations.dart

@@ -64,15 +64,18 @@ import 'chat_kit_location_client_localizations_zh.dart';
 /// be consistent with the languages listed in the ChatKitLocationClientLocalizations.supportedLocales
 /// property.
 abstract class ChatKitLocationClientLocalizations {
-  ChatKitLocationClientLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+  ChatKitLocationClientLocalizations(String locale)
+      : localeName = intl.Intl.canonicalizedLocale(locale.toString());
 
   final String localeName;
 
   static ChatKitLocationClientLocalizations? of(BuildContext context) {
-    return Localizations.of<ChatKitLocationClientLocalizations>(context, ChatKitLocationClientLocalizations);
+    return Localizations.of<ChatKitLocationClientLocalizations>(
+        context, ChatKitLocationClientLocalizations);
   }
 
-  static const LocalizationsDelegate<ChatKitLocationClientLocalizations> delegate = _ChatKitLocationClientLocalizationsDelegate();
+  static const LocalizationsDelegate<ChatKitLocationClientLocalizations>
+      delegate = _ChatKitLocationClientLocalizationsDelegate();
 
   /// A list of this localizations delegate along with the default localizations
   /// delegates.
@@ -84,7 +87,8 @@ abstract class ChatKitLocationClientLocalizations {
   /// Additional delegates can be added by appending to this list in
   /// MaterialApp. This list does not have to be used at all if a custom list
   /// of delegates is preferred or required.
-  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
     delegate,
     GlobalMaterialLocalizations.delegate,
     GlobalCupertinoLocalizations.delegate,
@@ -146,34 +150,37 @@ abstract class ChatKitLocationClientLocalizations {
   String get locationTitle;
 }
 
-class _ChatKitLocationClientLocalizationsDelegate extends LocalizationsDelegate<ChatKitLocationClientLocalizations> {
+class _ChatKitLocationClientLocalizationsDelegate
+    extends LocalizationsDelegate<ChatKitLocationClientLocalizations> {
   const _ChatKitLocationClientLocalizationsDelegate();
 
   @override
   Future<ChatKitLocationClientLocalizations> load(Locale locale) {
-    return SynchronousFuture<ChatKitLocationClientLocalizations>(lookupChatKitLocationClientLocalizations(locale));
+    return SynchronousFuture<ChatKitLocationClientLocalizations>(
+        lookupChatKitLocationClientLocalizations(locale));
   }
 
   @override
-  bool isSupported(Locale locale) => <String>['en', 'zh'].contains(locale.languageCode);
+  bool isSupported(Locale locale) =>
+      <String>['en', 'zh'].contains(locale.languageCode);
 
   @override
   bool shouldReload(_ChatKitLocationClientLocalizationsDelegate old) => false;
 }
 
-ChatKitLocationClientLocalizations lookupChatKitLocationClientLocalizations(Locale locale) {
-
-
+ChatKitLocationClientLocalizations lookupChatKitLocationClientLocalizations(
+    Locale locale) {
   // Lookup logic when only language code is specified.
   switch (locale.languageCode) {
-    case 'en': return ChatKitLocationClientLocalizationsEn();
-    case 'zh': return ChatKitLocationClientLocalizationsZh();
+    case 'en':
+      return ChatKitLocationClientLocalizationsEn();
+    case 'zh':
+      return ChatKitLocationClientLocalizationsZh();
   }
 
   throw FlutterError(
-    'ChatKitLocationClientLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
-    'an issue with the localizations generation tool. Please file an issue '
-    'on GitHub with a reproducible sample app and the gen-l10n configuration '
-    'that was used.'
-  );
+      'ChatKitLocationClientLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+      'an issue with the localizations generation tool. Please file an issue '
+      'on GitHub with a reproducible sample app and the gen-l10n configuration '
+      'that was used.');
 }

nim_chatkit_location/lib/l10n/chatLocation_localization/chat_kit_location_client_localizations_en.dart

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-
-
 import 'chat_kit_location_client_localizations.dart';
 
 /// The translations for English (`en`).
-class ChatKitLocationClientLocalizationsEn extends ChatKitLocationClientLocalizations {
+class ChatKitLocationClientLocalizationsEn
+    extends ChatKitLocationClientLocalizations {
   ChatKitLocationClientLocalizationsEn([String locale = 'en']) : super(locale);
 
   @override

nim_chatkit_location/lib/l10n/chatLocation_localization/chat_kit_location_client_localizations_zh.dart

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-
-
 import 'chat_kit_location_client_localizations.dart';
 
 /// The translations for Chinese (`zh`).
-class ChatKitLocationClientLocalizationsZh extends ChatKitLocationClientLocalizations {
+class ChatKitLocationClientLocalizationsZh
+    extends ChatKitLocationClientLocalizations {
   ChatKitLocationClientLocalizationsZh([String locale = 'zh']) : super(locale);
 
   @override

nim_chatkit_location/pubspec.lock

@@ -453,6 +453,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -465,26 +489,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -521,18 +545,18 @@ packages:
     dependency: "direct main"
     description:
       name: netease_corekit
-      sha256: "5ade70b62b72a1649c4b0eac0d926c242a475707c3eb023061bbe1dd52587ad9"
+      sha256: dbce89daa99f1dbc043b31a83161e8e0fcf9b870c4d0e439cf65f69734024186
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   netease_corekit_im:
     dependency: "direct main"
     description:
       name: netease_corekit_im
-      sha256: "020f879675a5343dbfb9e4f0868bb554832c4661f4b11007078a78b6e97b61d2"
+      sha256: ae1fc8f61f453e637abbf3f05a9591f52d8dbaaec11c7667d0b629a900bf0d82
       url: "https://pub.dev"
     source: hosted
-    version: "9.7.1"
+    version: "9.7.2"
   netease_plugin_core_kit:
     dependency: "direct main"
     description:
@@ -545,18 +569,18 @@ packages:
     dependency: "direct main"
     description:
       name: nim_chatkit
-      sha256: "13c8ea01c88cd36094d585a2a93e2c2fa62903b53c2433c61c9bc81be3ceebed"
+      sha256: "55a6dce55ebeaa42ed94281615630afa00688ca51dbd1e48ca187b21f05653d2"
       url: "https://pub.dev"
     source: hosted
-    version: "9.7.0"
+    version: "9.7.2"
   nim_core:
     dependency: "direct main"
     description:
       name: nim_core
-      sha256: "9107a1e1c08a9f2dc094ebf1eea49dcc3c404a26d584f537bd192ca8042d2c5f"
+      sha256: "72f07209a5b565eb0b1e1e73da8c7a9f55ebf7c38d80094fe2ce679230385d85"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.5"
+    version: "1.7.7"
   nim_core_macos:
     dependency: transitive
     description:
@@ -569,10 +593,10 @@ packages:
     dependency: transitive
     description:
       name: nim_core_platform_interface
-      sha256: a93ea84b1d79043dfa88d39fad214d417f0e577542030b07c9049695ef9d5691
+      sha256: "86af4f5ca80dadb4cf9f1d79a18844a82dfce95b2fb2c20cd7f953f2ae7fcdd7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.5"
+    version: "1.7.7"
   nim_core_web:
     dependency: transitive
     description:
@@ -609,10 +633,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -1042,14 +1066,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "13.0.0"
   webview_flutter:
     dependency: transitive
     description:
@@ -1131,5 +1155,5 @@ packages:
     source: hosted
     version: "2.0.0"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
+  dart: ">=3.2.0-0 <4.0.0"
   flutter: ">=3.10.0"

nim_chatkit_location/pubspec.yaml

@@ -1,6 +1,6 @@
 name: nim_chatkit_location
 description: Chat UI base on ChatKit.
-version: 9.7.1
+version: 9.7.2
 homepage: https://github.com/netease-kit/nim-uikit-flutter
 
 environment:
@@ -21,20 +21,20 @@ dependencies:
 #    path: ../../common/netease_common_ui
 
   netease_corekit_im:
-        ">=9.7.0 <10.0.0"
+        ">=9.7.2 <10.0.0"
 #    path: ../../netease_corekit/netease_corekit_im
   netease_corekit:
-        ">=1.2.0 <1.3.0"
+        ">=1.2.1 <1.3.0"
 #    path: ../../netease_corekit/netease_corekit
   nim_chatkit:
-        ">=9.7.0 <10.0.0"
+        ">=9.7.2 <10.0.0"
 #    path: ../nim_chatkit
   nim_core: ^1.7.4
   #      path: ../../nim_core/nim_core
 
   netease_plugin_core_kit:
     ^9.7.1
-  #    path: ../../plugin/netease_plugin_core_kit
+#      path: ../../plugin/netease_plugin_core_kit
 
   permission_handler: ^11.0.1
   cached_network_image: ^3.3.1

nim_chatkit_ui/CHANGELOG.md

@@ -1,5 +1,9 @@
 # NimChatKitUI ChangeLog
 
+## 9.7.2(Jun 20, 2024)
+### Bug fix
+* 修复上报数据版本号问题
+
 ## 9.7.1(Feb 21, 2024)
 ### New Features
 * 地图位置消息插件化实现

nim_chatkit_ui/lib/chat_kit_client.dart

@@ -259,6 +259,6 @@ class ChatKitClient {
                   IMKitRouter.getArgumentFormMap<String>(context, 'chatTitle')!,
             ));
 
-    XKitReporter().register(moduleName: 'ChatUIKit', moduleVersion: '1.1.0');
+    XKitReporter().register(moduleName: 'ChatUIKit', moduleVersion: '9.7.2');
   }
 }