Bump version to 1.6.2+620, update dependencies

Heetoprime · Oct 23, 2021 · ef97a83 · ef97a83
1 parent bfaca25
commit ef97a83
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 182 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -12,8 +12,6 @@ PODS:
     - Reachability
   - device_info_plus (0.0.1):
     - Flutter
-  - disk_space (0.0.1):
-    - Flutter
   - DKImagePickerController/Core (4.3.2):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
@@ -55,8 +53,6 @@ PODS:
     - Flutter
   - flutter_qjs (0.0.1):
     - Flutter
-  - flutter_webview_plugin (0.0.1):
-    - Flutter
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
@@ -99,13 +95,11 @@ DEPENDENCIES:
   - catcher (from `.symlinks/plugins/catcher/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - disk_space (from `.symlinks/plugins/disk_space/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
   - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
   - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_qjs (from `.symlinks/plugins/flutter_qjs/ios`)
-  - flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - just_audio (from `.symlinks/plugins/just_audio/ios`)
@@ -141,8 +135,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
-  disk_space:
-    :path: ".symlinks/plugins/disk_space/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
@@ -153,8 +145,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_qjs:
     :path: ".symlinks/plugins/flutter_qjs/ios"
-  flutter_webview_plugin:
-    :path: ".symlinks/plugins/flutter_webview_plugin/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
   image_gallery_saver:
@@ -187,15 +177,13 @@ SPEC CHECKSUMS:
   catcher: 67a006a3c121c4bbf1202d1e5ea186afb7ef4a18
   connectivity_plus: 5f0eb61093bec56935f21a1699dd2758bc895587
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  disk_space: e94d34bbdf77954adfb39e60bde9cc5c7233eda6
   DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_qjs: 00a5691bdef3079061466f6fd88cd7d6986fb8b6
-  flutter_webview_plugin: ed9e8a6a96baf0c867e90e1bce2673913eeac694
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -176,7 +176,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/components/analytics.dart b/lib/components/analytics.dart
@@ -1,17 +1,7 @@
-import 'dart:math';
-
 import 'package:chaldea/components/components.dart';
-import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
-import 'package:dio_cookie_manager/dio_cookie_manager.dart';
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 import 'package:intl/intl_standalone.dart';
 
-const _hjs = 'https://hm.baidu.com/hm.js?';
-const _hgif = 'https://hm.baidu.com/hm.gif?';
-
-const _kBDID = '9de65dbb7a214ca258974c37c5e060d2';
-
 class Analyzer {
   const Analyzer._();
 
@@ -68,117 +58,4 @@ class Analyzer {
       logger.e('report analytics failed', e, s);
     });
   }
-
-  static Future<void> sendBdtj({String? bdId}) async {
-    if (!db.hasNetwork) return;
-    // TODO: invalid, ignored by bdtj
-    try {
-      if (PlatformU.isIOS || PlatformU.isAndroid) {
-        launchStaticUrl(_constructUrl());
-        return;
-      }
-      if (kReleaseMode) {
-        // don't send for desktop
-        return;
-      }
-      String url = _constructUrl();
-      bdId ??= _kBDID;
-      final String hjs = _hjs + bdId;
-
-      final size = MediaQuery.of(kAppKey.currentContext!).size;
-      final random = Random(DateTime.now().microsecondsSinceEpoch);
-
-      final cookieJar = PersistCookieJar();
-      final cookies = await cookieJar.loadForRequest(Uri.parse(hjs));
-      String? hca() => cookies
-          .firstWhereOrNull((c) => c.name.trim() == 'HMACCOUNT_BFESS')
-          ?.value;
-
-      bool fresh = hca() == null;
-      bool first = true;
-
-      Map<String, String> genMap() {
-        print('bdtj: fresh=$fresh, first=$first');
-        final Map<String, dynamic> _param = {
-          // 'hca':null,
-          'cc': 1,
-          'ck': 1,
-          'cl': '24-bit',
-          'ds': '${size.width}x${size.height}',
-          'vl': 750,
-          // 'ep': null,
-          // 'et':xxx?3:0,
-          'ja': 0,
-          'ln': Intl.getCurrentLocale(),
-          'lo': 0,
-          'rnd':
-              (random.nextInt(90000) + 10000) * 100000 + random.nextInt(100000),
-          'si': bdId,
-          'v': '1.2.80',
-          'lv': fresh ? 1 : 2,
-          'sn': fresh
-              ? 1917
-              : first
-                  ? 2091
-                  : 2096,
-
-          /// wrong
-          'r': 0,
-          'ww': size.width,
-          // 'ct':null,
-          'u': url,
-          // 'tt':null,
-        };
-        if (!fresh) {
-          _param['lt'] = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-        }
-        if (!fresh && first) {
-          _param['hca'] = hca();
-        }
-        if (!fresh && first) {
-          _param['ep'] = '5207,2678';
-
-          /// wrong
-        }
-        _param['et'] = _param['ep'] == null ? 0 : 3;
-        if (fresh || !first) {
-          _param['ct'] = '!!';
-        }
-        if (fresh || !first) {
-          _param['uu'] = 'Chaldea ${PlatformU.operatingSystem}';
-        }
-        // logger.i(_param);
-        return _param.map((key, value) => MapEntry(key, value.toString()));
-      }
-
-      final _dio = HttpUtils.defaultDio;
-      _dio.interceptors.add(CookieManager(cookieJar));
-      await _dio.get(hjs);
-      String gifUrl1 =
-          Uri.parse(_hgif).replace(queryParameters: genMap()).toString();
-      first = false;
-      var gif1 = _dio.get(gifUrl1);
-      await Future.delayed(const Duration(milliseconds: 66));
-      String gifUrl2 =
-          Uri.parse(_hgif).replace(queryParameters: genMap()).toString();
-      var gif2 = _dio.get(gifUrl2);
-      await Future.wait([gif1, gif2]);
-    } catch (e, s) {
-      logger.e('bdtj failed', e, s);
-    }
-  }
-
-  static Future<void> launchStaticUrl(String url) async {
-    final plugin = FlutterWebviewPlugin();
-    await plugin.launch(url, hidden: true).catchError((e, s) async {
-      logger.e('loading webview failed, url=$url', e, s);
-    });
-    print('$url launched');
-    await Future.delayed(const Duration(seconds: 10));
-    plugin.dispose();
-  }
-
-  static String _constructUrl({String? platform}) {
-    return '$kServerRoot/bdtj/${Language.currentLocaleCode}/${platform ?? PlatformU.operatingSystem}/${AppInfo.version}';
-  }
 }
diff --git a/lib/modules/home/subpage/about_page.dart b/lib/modules/home/subpage/about_page.dart
@@ -1,6 +1,7 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:chaldea/components/components.dart';
 import 'package:chaldea/modules/extras/updates.dart';
+import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -40,6 +41,13 @@ class _AboutPageState extends State<AboutPage> {
                 showDebugInfo = true;
               });
             },
+            onLongPress: () async {
+              setState(() {
+                showDebugInfo = true;
+              });
+              await Clipboard.setData(ClipboardData(text: AppInfo.uuid));
+              EasyLoading.showToast('UUID ' + S.current.copied);
+            },
             child: _AboutProgram(
               name: AppInfo.appName,
               version: AppInfo.fullVersion2,
@@ -70,7 +78,7 @@ class _AboutPageState extends State<AboutPage> {
                     subtitle: Text(EnumUtil.titled(db.appSetting.gitSource)),
                     trailing: db.runtimeData.upgradableVersion != null
                         ? Text(db.runtimeData.upgradableVersion!.version + '↑',
-                        style: const TextStyle(color: Colors.redAccent))
+                            style: const TextStyle(color: Colors.redAccent))
                         : null,
                     onTap: () {
                       AutoUpdateUtil.checkAppUpdate(background: false);
@@ -176,7 +184,7 @@ class _AboutPageState extends State<AboutPage> {
                           height: 120,
                         ),
                         applicationLegalese:
-                        'Copyright © 2021 cc.narumi.\nAll rights reserved.',
+                            'Copyright © 2021 cc.narumi.\nAll rights reserved.',
                       ),
                     ),
                   );

diff --git a/lib/widgets/charts/line_chart.dart b/lib/widgets/charts/line_chart.dart
@@ -177,7 +177,7 @@ class SimpleLineChart<T extends num> extends StatelessWidget {
         isStrokeCapRound: true,
         dotData: FlDotData(show: false),
         belowBarData: BarAreaData(show: false),
-        spots: [
+        spots: const [
           FlSpot(1, 2.8),
           FlSpot(3, 1.9),
           FlSpot(6, 3),