异常提示

Author: Cosyment

.gitignore

@@ -1,48 +1,52 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-/ios/DerivedData/
-/ios/Pods/
-/macos/DerivedData/
-/macos/Pods/
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+pubspec.lock
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+/android/local.properties
+/ios/DerivedData/
+/ios/Pods/
+/ios/Podfile.lock
+/macos/DerivedData/
+/macos/Pods/
+/macos/Podfile.lock

android/.gitignore

@@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+/app/local.properties

android/app/local.properties

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:http/http.dart' as http;
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:tubesavely/http/request_exception.dart';
 
 import '../utils/constants.dart';
 import 'extend_http_client.dart';
@@ -12,14 +13,14 @@ class HttpRequest {
   static final SafeHttpClient _httpClient = SafeHttpClient(http.Client());
 
   static Future<dynamic> request<T>(String url, T Function(dynamic) fromJson,
-      {method = 'GET', Map<String, dynamic>? params, Function(Object)? exception}) async {
+      {method = 'GET', Map<String, dynamic>? params, Function(RequestException)? exception}) async {
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
     var headers = {
       'appName': packageInfo.appName,
       'platform': Platform.operatingSystem,
       'version': packageInfo.version,
       'buildNumber': packageInfo.buildNumber,
-      'systemVersion': Platform.operatingSystemVersion,
+      // 'systemVersion': Platform.operatingSystemVersion,
     };
     http.Response? response;
 
@@ -46,13 +47,12 @@ class HttpRequest {
           return fromJson(data);
         }
       } else {
-        return fromJson('');
+        exception?.call(RequestException(content['code'], errorMessage));
       }
     } catch (e) {
       debugPrint(e.toString());
       errorMessage = 'server internal exception';
-      exception?.call(e);
+      exception?.call(RequestException(-1, errorMessage));
     }
-    throw Exception(errorMessage);
   }
 }

android/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+class RequestException implements Exception {
+  final int code;
+  final String message;
+
+  RequestException(this.code, this.message);
+}

android/local.properties

@@ -40,7 +40,10 @@ class _DownloadPageState extends State<DownloadPage> with AutomaticKeepAliveClie
         Urls.shortVideoParse,
         params: {'url': url},
         (jsonData) => VideoModel.fromJson(jsonData),
-        exception: (e) => {debugPrint('parse exception $e'), ToastUtil.error(S.current.toastVideoExecuteError)});
+        exception: (e) => {
+              debugPrint('parse exception $e'),
+              if (e.code == 401) {ToastUtil.error(e.message)} else {ToastUtil.error(S.current.toastVideoExecuteError)}
+            });
 
     setState(() {
       videoModelList.add(videoModel);

ios/Podfile.lock

@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:tubesavely/core/downloader/downloader.dart';
+import 'package:tubesavely/generated/l10n.dart';
 import 'package:tubesavely/http/http_request.dart';
 import 'package:tubesavely/model/pair.dart';
 import 'package:tubesavely/model/video_model.dart';
@@ -15,6 +16,8 @@ import 'package:tubesavely/widget/iconed_button.dart';
 import 'package:tubesavely/widget/progress_button.dart';
 import 'package:tubesavely/widget/radio_group.dart';
 
+import '../../../utils/toast_util.dart';
+
 class VideoDetailPage extends StatefulWidget {
   final String? url;
 
@@ -46,7 +49,11 @@ class _VideoDetailPagePageState extends State<VideoDetailPage> with SingleTicker
         Urls.shortVideoParse,
         params: {'url': url},
         (jsonData) => VideoModel.fromJson(jsonData),
-        exception: (e) => {debugPrint('parse exception $e')});
+        exception: (e) => {
+              debugPrint('parse exception $e'),
+              if (e.code == 401) {ToastUtil.error(e.message)} else {ToastUtil.error(S.current.toastVideoExecuteError)},
+              Navigator.pop(context)
+            });
 
     setState(() {
       //过滤全部全部视频