fix:合并代码文件处理。

ios/Podfile.lock

@@ -48,6 +48,9 @@ PODS:
     - Flutter
   - network_info_plus (0.0.1):
     - Flutter
+  - NTESBaseComponent (1.9)
+  - NTESQuickPass (3.6.4):
+    - NTESBaseComponent
   - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
@@ -56,6 +59,9 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
+  - quickpass_yidun_flutter (0.0.1):
+    - Flutter
+    - NTESQuickPass (= 3.6.4)
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
@@ -94,6 +100,7 @@ DEPENDENCIES:
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - quickpass_yidun_flutter (from `.symlinks/plugins/quickpass_yidun_flutter/ios`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
@@ -106,6 +113,8 @@ SPEC REPOS:
     - Bugly
     - MMKV
     - MMKVCore
+    - NTESBaseComponent
+    - NTESQuickPass
     - OrderedSet
 
 EXTERNAL SOURCES:
@@ -149,6 +158,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  quickpass_yidun_flutter:
+    :path: ".symlinks/plugins/quickpass_yidun_flutter/ios"
   sqflite_darwin:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
   url_launcher_ios:
@@ -181,10 +192,13 @@ SPEC CHECKSUMS:
   MMKVCore: a255341a3746955f50da2ad9121b18cb2b346e61
   mobile_use_statistics: 1ffc327ab7d351e7f9f1de7338b1c1ca8e42728a
   network_info_plus: cf61925ab5205dce05a4f0895989afdb6aade5fc
+  NTESBaseComponent: 6d1fd6802c2340005d35db9daafe15ee6b9b976c
+  NTESQuickPass: 35dcb9c05c879c4c68cea40a8c0f3e2ea3c9c696
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  quickpass_yidun_flutter: ed307236aa64956cbe19b8e95281ebe763a68963
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b

lib/data/api/atmob_api.g.dart

@@ -1701,42 +1701,23 @@ class _AtmobApi implements AtmobApi {
 
   @override
   Future<BaseResponse<LoginResponse>> oneClickLogin(
-      OneClickLoginRequest request) async {
+    OneClickLoginRequest request,
+  ) async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     final _data = <String, dynamic>{};
     _data.addAll(request.toJson());
-<<<<<<< HEAD
-    final _options = _setStreamType<dynamic>(
+    final _options = _setStreamType<BaseResponse<LoginResponse>>(
       Options(method: 'POST', headers: _headers, extra: _extra)
           .compose(
             _dio.options,
-            '/s/v1/chat/daily/exception/analyse',
+            '/s/v1/user/login/oneclick',
             queryParameters: queryParameters,
             data: _data,
           )
           .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
     );
-    final _result = await _dio.fetch(_options);
-    final _value = _result.data;
-=======
-    final _options = _setStreamType<BaseResponse<LoginResponse>>(Options(
-      method: 'POST',
-      headers: _headers,
-      extra: _extra,
-    )
-        .compose(
-          _dio.options,
-          '/s/v1/user/login/oneclick',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        )));
     final _result = await _dio.fetch<Map<String, dynamic>>(_options);
     late BaseResponse<LoginResponse> _value;
     try {
@@ -1748,7 +1729,6 @@ class _AtmobApi implements AtmobApi {
       errorLogger?.logError(e, s, _options);
       rethrow;
     }
->>>>>>> v1.1.0
     return _value;
   }
 

lib/data/bean/user_info.g.dart

@@ -17,6 +17,7 @@ UserInfo _$UserInfoFromJson(Map<String, dynamic> json) => UserInfo(
       virtual: json['virtual'] as bool?,
       isMine: json['isMine'] as bool?,
       avatar: json['avatar'] as String?,
+      isShowYesterday: json['isShowYesterday'] as bool?,
     );
 
 Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
@@ -30,4 +31,5 @@ Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
       'virtual': instance.virtual,
       'avatar': instance.avatar,
       'isMine': instance.isMine,
+      'isShowYesterday': instance.isShowYesterday,
     };

pubspec.lock

@@ -1246,7 +1246,7 @@ packages:
     description:
       name: quickpass_yidun_flutter
       sha256: f04f7bb1dd82d116e6e837c7c9d501af11cc4ce116998b4f739a50a5d718b108
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.5.6"
   recase: