From 3c60657d72f3ee65e2cfe7eac557cbc3d2f85776 Mon Sep 17 00:00:00 2001 From: anonymous Date: Wed, 31 May 2023 11:27:19 +0800 Subject: [PATCH] Flutter TUIKit 2.1.0+1 --- CHANGELOG.md | 11 +++++++++ .../Flutter/GeneratedPluginRegistrant.swift | 2 +- example/pubspec.lock | 24 +++++++------------ .../flutter/generated_plugin_registrant.cc | 6 ++--- .../windows/flutter/generated_plugins.cmake | 2 +- .../view_models/tui_chat_global_model.dart | 2 +- .../core/core_services_implements.dart | 15 ------------ .../tim_uikit_more_panel.dart | 2 +- .../tim_uikit_text_field_layout/wide.dart | 2 +- pubspec.lock | 22 ++++++----------- pubspec.yaml | 16 ++++++------- 11 files changed, 42 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c82a4b..42ead16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## 2.1.0+1 + +### Improvements + +* Removed `disk_space` dependency as many customers reported difficulty in obtaining this dependency successfully. +* Replaced `fc_native_video_thumbnail_for_us` with its original version `fc_native_video_thumbnail`. + +### Bug Fixes + +* Fixed an issue where `universal_html` could be blocking the compilation. + ## 2.1.0 ### Breaking Changes diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index c03736a..05deca4 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,7 +8,7 @@ import Foundation import audioplayers_darwin import desktop_drop import device_info_plus -import fc_native_video_thumbnail_for_us +import fc_native_video_thumbnail import package_info_plus import pasteboard import path_provider_foundation diff --git a/example/pubspec.lock b/example/pubspec.lock index 07cc86d..6d07ec2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -313,14 +313,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.1" - disk_space: - dependency: transitive - description: - name: disk_space - sha256: fb27eb2d09ac04784f45b95b1355538b2355c76a081eeaa8439d1a5cfa263888 - url: "https://pub.dev" - source: hosted - version: "0.2.1" dotted_border: dependency: transitive description: @@ -385,14 +377,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.12.6" - fc_native_video_thumbnail_for_us: + fc_native_video_thumbnail: dependency: transitive description: - name: fc_native_video_thumbnail_for_us - sha256: db6fa2998195ef5eadac690ae58d6a909ddb5b0283ebbbf9ae4e0e8f99a54902 + name: fc_native_video_thumbnail + sha256: "6c029f017702435aabe96bd2f60be9a2415e62fe0b2f0ce31a51d7cd4b51f674" url: "https://pub.dev" source: hosted - version: "0.4.8+1" + version: "0.4.0" ffi: dependency: transitive description: @@ -1264,18 +1256,18 @@ packages: dependency: transitive description: name: universal_html - sha256: "5ff50b7c14d201421cf5230ec389a0591c4deb5c817c9d7ccca3b26fe5f31e34" + sha256: f2e0ff0c4af8e4bbda4d273ca4a11be4055414f478fad5c161609b74790ff696 url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.2.2" universal_io: dependency: transitive description: name: universal_io - sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef" + sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d" url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.0" url_launcher: dependency: transitive description: diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc index 03ccc3e..18fd67a 100644 --- a/example/windows/flutter/generated_plugin_registrant.cc +++ b/example/windows/flutter/generated_plugin_registrant.cc @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -18,8 +18,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin")); DesktopDropPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("DesktopDropPlugin")); - FcNativeVideoThumbnailForUsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FcNativeVideoThumbnailForUsPluginCApi")); + FcNativeVideoThumbnailPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FcNativeVideoThumbnailPluginCApi")); PasteboardPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PasteboardPlugin")); PermissionHandlerWindowsPluginRegisterWithRegistrar( diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index ad68f93..f381b9a 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -5,7 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_windows desktop_drop - fc_native_video_thumbnail_for_us + fc_native_video_thumbnail pasteboard permission_handler_windows url_launcher_windows diff --git a/lib/business_logic/view_models/tui_chat_global_model.dart b/lib/business_logic/view_models/tui_chat_global_model.dart index 0981926..4442a02 100644 --- a/lib/business_logic/view_models/tui_chat_global_model.dart +++ b/lib/business_logic/view_models/tui_chat_global_model.dart @@ -212,7 +212,7 @@ class TUIChatGlobalModel extends ChangeNotifier implements TIMUIKitClass { (_messageListMap[currentSelectedConv] ?? []).sublist( max(0, ((_messageListMap[currentSelectedConv] ?? []).length - 20))); _currentConversationList.removeLast(); - notifyListeners(); + // notifyListeners(); } V2TimMessageReceipt? getMessageReadReceipt(String msgID) { diff --git a/lib/data_services/core/core_services_implements.dart b/lib/data_services/core/core_services_implements.dart index cc2ac7d..47fc81a 100644 --- a/lib/data_services/core/core_services_implements.dart +++ b/lib/data_services/core/core_services_implements.dart @@ -8,14 +8,10 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_glo import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversation_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; - import 'package:tencent_cloud_chat_uikit/data_services/core/core_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/tim_uikit_config.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; - import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; - -import 'package:disk_space/disk_space.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/web_support/uikit_web_support.dart' if (dart.library.html) 'package:tencent_cloud_chat_uikit/data_services/core/web_support/uikit_web_support_implement.dart'; @@ -292,17 +288,6 @@ class CoreServicesImpl implements CoreServices { selfInfoViewModel.setLoginInfo(_loginInfo!) } }); - - if (PlatformUtils().isMobile && - selfInfoViewModel.globalConfig?.isCheckDiskStorageSpace == true) { - final diskSpace = await DiskSpace.getFreeDiskSpace; - if (diskSpace != null && diskSpace < 1024) { - callOnCallback(TIMCallback( - type: TIMCallbackType.INFO, - infoRecommendText: TIM_t("设备存储空间不足，建议清理，以获得更好使用体验"), - infoCode: 6661403)); - } - } } // Deprecated diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart index 59e2ea7..a02d16b 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:device_info_plus/device_info_plus.dart'; -import 'package:fc_native_video_thumbnail_for_us/fc_native_video_thumbnail_for_us.dart'; +import 'package:fc_native_video_thumbnail/fc_native_video_thumbnail.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/wide.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/wide.dart index 94c9f37..c390f5b 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/wide.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/wide.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; -import 'package:fc_native_video_thumbnail_for_us/fc_native_video_thumbnail_for_us.dart'; +import 'package:fc_native_video_thumbnail/fc_native_video_thumbnail.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:package_info_plus/package_info_plus.dart'; diff --git a/pubspec.lock b/pubspec.lock index d87d9fb..a140f2d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -322,13 +322,13 @@ packages: source: hosted version: "3.0.3" csslib: - dependency: transitive + dependency: "direct main" description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "0.17.2" csv: dependency: transitive description: @@ -385,14 +385,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.1" - disk_space: - dependency: "direct main" - description: - name: disk_space - sha256: fb27eb2d09ac04784f45b95b1355538b2355c76a081eeaa8439d1a5cfa263888 - url: "https://pub.dev" - source: hosted - version: "0.2.1" dotted_border: dependency: "direct main" description: @@ -449,14 +441,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.12.6" - fc_native_video_thumbnail_for_us: + fc_native_video_thumbnail: dependency: "direct main" description: - name: fc_native_video_thumbnail_for_us - sha256: db6fa2998195ef5eadac690ae58d6a909ddb5b0283ebbbf9ae4e0e8f99a54902 + name: fc_native_video_thumbnail + sha256: "6c029f017702435aabe96bd2f60be9a2415e62fe0b2f0ce31a51d7cd4b51f674" url: "https://pub.dev" source: hosted - version: "0.4.8+1" + version: "0.4.0" ffi: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 711fb42..54205a3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: tencent_cloud_chat_uikit description: A powerful chat UI component library and business logic for Tencent Cloud Chat, creating seamless in-app chat modules for delightful user experiences. -version: 2.1.0 +version: 2.1.0+1 homepage: https://www.tencentcloud.com/products/im?from=pub repository: https://github.com/TencentCloud/tc-chat-uikit-flutter documentation: https://comm.qq.com/im/doc/flutter/en/TUIKit/readme.html @@ -22,10 +22,10 @@ dependencies: sdk: flutter adaptive_action_sheet: ^2.0.1 provider: ^6.0.1 - intl: ^0.18.0 + intl: any get_it: ^7.2.0 dotted_border: ^2.0.0+2 - flutter_svg: ^1.0.0 + flutter_svg: ^2.0.6 image_picker: ^0.8.5+3 file_picker: ^5.3.0 tencent_super_tooltip: ^0.0.1 @@ -51,11 +51,10 @@ dependencies: loading_animation_widget: ^1.1.0+3 permission_handler: ^10.2.0 tuple: ^2.0.0 - flutter_markdown: ^0.6.9 + flutter_markdown: ^0.6.15 url_launcher: ^6.1.4 - universal_html: ^2.0.8 + universal_html: ^2.2.2 link_preview_generator: ^1.2.0 - disk_space: ^0.2.1 http: ^0.13.5 crypto: ^3.0.2 collection: ^1.15.0 @@ -65,14 +64,15 @@ dependencies: tencent_keyboard_visibility: ^1.0.1 tim_ui_kit_sticker_plugin: ^2.0.1 tencent_im_base: ^1.0.57 - fc_native_video_thumbnail_for_us: ^0.4.8+1 + fc_native_video_thumbnail: any audioplayers: ^3.0.1 path: ^1.8.1 tencent_cloud_uikit_core: ^1.0.2 pasteboard: ^0.2.0 desktop_drop: ^0.4.1 - device_info_plus: ^9.0.1 + device_info_plus: any cross_file: ^0.3.3+4 + csslib: 0.17.2 diff_match_patch: ^0.4.1 dev_dependencies: