.

Author: shiyiya

.gitignore

@@ -44,3 +44,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+/release/

android/app/build.gradle

@@ -49,26 +49,80 @@ android {
         versionName flutterVersionName
         multiDexEnabled true
 
-//        ndk {
-//            abiFilters 'armeabi', 'armeabi-v7a', 'x86'//, 'x86_64', 'mips', 'mips64', 'arm64-v8a',
-//        }
-
         manifestPlaceholders = [
                 JPUSH_PKGNAME: applicationId,
                 JPUSH_APPKEY : 'a8e4d99ac7f968133d73ff19',
                 JPUSH_CHANNEL: "developer-default",
         ]
     }
 
+//    signingConfigs {
+//        config {
+//            keyAlias keystoreProperties["keyAlias"]
+//            keyPassword keystoreProperties["keyPassword"]
+//            storeFile file(keystoreProperties["storeFile"])
+//            storePassword keystoreProperties["storePassword"]
+//        }
+//    }
+
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+            // signingConfig signingConfigs.config
+        }
+        profile {
+            minifyEnabled false
+            shrinkResources false
+            // signingConfig signingConfigs.config
+        }
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
+
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a"
+                // 'armeabi', 'armeabi-v7a', 'x86'//, 'x86_64', 'mips', 'mips64', 'arm64-v8a',
+            }
+        }
+    }
+
+    tasks.whenTaskAdded { task ->
+        if (task.name == "assembleRelease") {
+            task.finalizedBy copyRelease
         }
     }
 }
 
+task copyRelease {
+    doLast {
+        def fromFile = "../../build/app/outputs/apk/release/app-release.apk"
+        def intoFile = "../../release/"
+        def sourceFile = file(fromFile)
+        def destinationPath = file(intoFile)
+        def time = buildTime()
+        def destinationFileName = "clicli_v${flutterVersionName}+${flutterVersionCode}_${time}.apk"
+
+
+        if (!sourceFile.exists()) {
+            throw new GradleException("Source file does not exist.")
+        } else {
+            if (!destinationPath.exists()) {
+                destinationPath.mkdir()
+            }
+            copy {
+                from fromFile
+                into intoFile
+                rename { destinationFileName }
+            }
+        }
+        println("\nRelease file copied to ${destinationPath}/${destinationFileName} .")
+    }
+}
+
+def static buildTime() {
+    return new Date().format("MMdd-HHmmss")
+}
+
 flutter {
     source '../..'
 }

ios/Podfile.lock

@@ -19,6 +19,13 @@ PODS:
   - HLSCachingReverseProxyServer (0.1.0):
     - GCDWebServer (~> 3.5)
     - PINCache (>= 3.0.1-beta.3)
+  - JCore (2.7.1)
+  - JPush (3.7.0):
+    - JCore (< 3.0.0, >= 2.0.0)
+  - jpush_flutter (0.0.2):
+    - Flutter
+    - JCore (= 2.7.1)
+    - JPush (= 3.7.0)
   - package_info (0.0.1):
     - Flutter
   - path_provider_ios (0.0.1):
@@ -49,6 +56,7 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
@@ -63,6 +71,8 @@ SPEC REPOS:
     - FMDB
     - GCDWebServer
     - HLSCachingReverseProxyServer
+    - JCore
+    - JPush
     - PINCache
     - PINOperation
     - Toast
@@ -76,6 +86,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_downloader/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
+  jpush_flutter:
+    :path: ".symlinks/plugins/jpush_flutter/ios"
   package_info:
     :path: ".symlinks/plugins/package_info/ios"
   path_provider_ios:
@@ -100,6 +112,9 @@ SPEC CHECKSUMS:
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
   HLSCachingReverseProxyServer: 59935e1e0244ad7f3375d75b5ef46e8eb26ab181
+  JCore: 9d5bda3a172c65bbe14f2806ab0f6246f8a06065
+  JPush: 1fd7a326e7e6588eba517659ce1b79a144e54938
+  jpush_flutter: d5fd523a73277ed66d453fc7ac1c981d1fa525e2
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
   PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086

ios/Runner.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 
 /* Begin PBXFileReference section */
 		0694F1A2275F37A900D1F45D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+		06AD73D1276834D8002EADD2 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		363C923035B61A09D9DDE57C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
@@ -106,6 +107,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				06AD73D1276834D8002EADD2 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -359,6 +361,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
@@ -490,6 +493,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
@@ -513,6 +517,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Runner.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

lib/api/post.dart

@@ -1,8 +1,9 @@
 import 'package:clicli_dark/utils/dio_utils.dart';
 import 'package:flutter/cupertino.dart';
 
-const host =
-    !bool.fromEnvironment("dart.vm.product") ? 'http://localhost:8080' : '';
+const host = !bool.fromEnvironment("dart.vm.product")
+    ? 'http://localhost:8080'
+    : 'http://64.227.101.251:8080';
 
 getPost(
   type,

lib/instance.dart

@@ -1,37 +1,35 @@
-// import 'package:clicli_dark/config.dart';
+import 'package:clicli_dark/config.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
-// import 'package:jpush_flutter/jpush_flutter.dart';
+import 'package:jpush_flutter/jpush_flutter.dart';
 import 'package:package_info/package_info.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class Instances {
-  static final homeStackscaffoldKey = GlobalKey<ScaffoldState>();
-
-  static ScaffoldState? get scaffoldState =>
-      Instances.homeStackscaffoldKey.currentState;
-
   static final navigatorKey = GlobalKey<NavigatorState>();
 
-  static NavigatorState? get navigatorState =>
-      Instances.navigatorKey.currentState;
+  static NavigatorState get navigatorState =>
+      Instances.navigatorKey.currentState!;
 
-  static BuildContext get currentContext => navigatorState!.overlay!.context;
+  static BuildContext get currentContext => navigatorState.overlay!.context;
 
-  static ThemeData get currentTheme => Theme.of(navigatorState!.context);
+  static ThemeData get currentTheme => Theme.of(navigatorState.context);
 
   static Color get currentThemeColor => currentTheme.primaryColor;
 
   static late SharedPreferences sp;
 
   static EventBus eventBus = EventBus();
 
-  // static JPush jp = JPush();
+  static late JPush jp;
 
   static String appVersion = '';
 
   static init() async {
-    // jp.setup(appKey: Config.jpushKey, channel: 'developer-default');
+    if (!Config.isDev) {
+      jp = JPush();
+      jp.setup(appKey: Config.jpushKey, channel: 'developer-default');
+    }
     sp = await SharedPreferences.getInstance();
     await PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
       final String v = packageInfo.version;

lib/main.dart

@@ -10,6 +10,7 @@ import 'package:clicli_dark/pages/player_page.dart';
 import 'package:clicli_dark/pages/time_line_page.dart';
 import 'package:clicli_dark/service/events.dart';
 import 'package:clicli_dark/service/theme_manager.dart';
+import 'package:clicli_dark/utils/toast_utils.dart';
 import 'package:clicli_dark/utils/version_util.dart';
 import 'package:clicli_dark/widgets/webview.dart';
 import 'package:flutter/material.dart';
@@ -64,7 +65,7 @@ class _CliCliAppState extends State<CliCliApp> {
       'CliCli://player': (_) => PlayerPage(data: arg!['data']),
       'CliCli://login': (_) => const LoginPage(),
       'CliCli://fav': (_) => const BgiPage(),
-      'CliCli://timeline': (_) => TimeLinePage(),
+      'CliCli://timeline': (_) => const TimeLinePage(),
       'CliCli://history': (_) => const HistoryPage(),
       'CliCli://webview': (_) => CWebView(url: arg!['url'])
     };
@@ -119,24 +120,22 @@ class _MyHomePageState extends State<MyHomePage> {
   final _pageController = PageController();
 
   void _onPageChange(int index) {
-    if (index == _currentPageIndex) return;
-    setState(() {
-      _currentPageIndex = index;
-      _pageController.jumpToPage(index);
-    });
+    if (index == _currentPageIndex) {
+      _toTop(index);
+    } else {
+      setState(() {
+        _currentPageIndex = index;
+        _pageController.jumpToPage(index);
+      });
+    }
   }
 
   int lastBack = 0;
 
   Future<bool> _doubleBackExit() {
     final int now = DateTime.now().millisecondsSinceEpoch;
     if (now - lastBack > 1000) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          duration: Duration(milliseconds: 1000),
-          content: Text('再按一次退出应用'),
-        ),
-      );
+      showSnackBar('再按一次退出应用');
       lastBack = DateTime.now().millisecondsSinceEpoch;
       return Future.value(false);
     } else {
@@ -145,6 +144,12 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  _toTop(int i) {
+    Instances.eventBus.fire(
+      MainButtonNavDoubleClickToTop([MainStack.home, MainStack.ugc][i]),
+    );
+  }
+
   @override
   void dispose() {
     _pageController.dispose();
@@ -157,7 +162,6 @@ class _MyHomePageState extends State<MyHomePage> {
     return WillPopScope(
       onWillPop: _doubleBackExit,
       child: Scaffold(
-        key: Instances.homeStackscaffoldKey,
         body: PageView.builder(
           itemCount: pagesIcon.length,
           controller: _pageController,
@@ -179,9 +183,7 @@ class _MyHomePageState extends State<MyHomePage> {
                     width: 35,
                     height: 35,
                   ),
-                  onPressed: () {
-                    _onPageChange(i);
-                  },
+                  onPressed: () => _onPageChange(i),
                 ),
               ),
             ),