commit

flutter.sh

@@ -60,6 +60,13 @@ function android_apk(){
     rm -rf /Users/apple/lsy/gengmei_alpha/alpha/src/main/assets/flutter_assets
     cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/apk/${suff}/assets/flutter_assets /Users/apple/lsy/gengmei_alpha/alpha/src/main/assets/
 
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/app.aar
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/flutter_boost/outputs/aar/flutter_boost-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/flutter_boost.aar
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/gengmei_flutter_plugin/outputs/aar/gengmei_flutter_plugin-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/gengmei_flutter_plugin.aar
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/path_provider/outputs/aar/path_provider-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/path_provider.aar
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/sqflite/outputs/aar/sqflite-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/sqflite.aar
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/xservice_kit/outputs/aar/xservice_kit-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/xservice_kit.aar
+
 }
 
 #====build android
@@ -89,13 +96,13 @@ function android(){
     cp -r /Users/apple/lsy/gmalpha_flutter/build/sqflite/outputs/aar/sqflite-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/sqflite.aar
     cp -r /Users/apple/lsy/gmalpha_flutter/build/xservice_kit/outputs/aar/xservice_kit-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/xservice_kit.aar
 
-    cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/aar/app-${suff}.zip
-    cd /Users/apple/lsy/aar
-    unzip /Users/apple/lsy/aar/app-${suff}.zip
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/MergeTest/app/libs/jniLibs/armeabi-v7a/
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/Test/app/libs/armeabi-v7a/
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/gmalpha_flutter/build/
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/aar_update/androd${message}/
+#    cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/aar/app-${suff}.zip
+#    cd /Users/apple/lsy/aar
+#    unzip /Users/apple/lsy/aar/app-${suff}.zip
+#    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/MergeTest/app/libs/jniLibs/armeabi-v7a/
+#    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/Test/app/libs/armeabi-v7a/
+#    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/gmalpha_flutter/build/
+#    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/aar_update/androd${message}/
 }
 
 function android_publish(){
@@ -235,11 +242,11 @@ mkdir /Users/apple/lsy/aar_update/
 mkdir /Users/apple/lsy/aar_update/androd${message}/
 mkdir /Users/apple/lsy/aar_update/ios${message}/
 
-clean
-android_apk
+#clean
+#android_apk
 #android
 #android_publish
-#upload_android_aar
+upload_android_aar
 #ios
 #ios_publish
 #notifyDingDing

lib/NewMessageModel/util/Jump.dart

@@ -4,29 +4,33 @@ import 'package:flutter/material.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/AttentionPage.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/focusPage/FocusPage.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/likePage/LikePage.dart';
+import 'package:gmalpha_flutter/commonModel/base/AppBase.dart';
 import 'package:gmalpha_flutter/res/anim/Anim.dart';
 
 
 Future jumpToAttentionPage(BuildContext context){
-  return Navigator.push(
-              context,
-              CustomRoute(
-                AttentionPage('message_home')
-              ));
+  jumpToFlutter("message_attention",{"fromPage":"message_home"});
+//  return Navigator.push(
+//              context,
+//              CustomRoute(
+//                AttentionPage('message_home')
+//              ));
 }
 
 Future jumpToLikePage(BuildContext context){
-  return Navigator.push(
-              context,
-              CustomRoute(
-                LikePage('message_home')
-              ));
+  jumpToFlutter("message_like",{"fromPage":"message_home"});
+//  return Navigator.push(
+//              context,
+//              CustomRoute(
+//                LikePage('')
+//              ));
 }
 
 Future jumpToFocusPage(BuildContext context){
-  return Navigator.push(
-      context,
-      CustomRoute(
-          FocusPage('message_home')
-      ));
+  jumpToFlutter("message_focus",{"fromPage":"message_home"});
+//  return Navigator.push(
+//      context,
+//      CustomRoute(
+//          FocusPage('message_home')
+//      ));
 }
\ No newline at end of file

lib/commonModel/base/AppBase.dart

@@ -35,6 +35,14 @@ void jumpToNative(String jumpToName, Map params) {
   platform.invokeMethod("FLUTTER_TO_NATIVE", map);
 }
 
+void jumpToFlutter(String jumpToName,Map params){
+  Map map = {"page_name": jumpToName};
+  if (params != null) {
+    map.addAll(params);
+  }
+  platform.invokeMethod("FLUTTER_TO_FLUTTER", map);
+}
+
 Future getBuriedInfo() async {
   return await platform.invokeMethod(BURIED_METHOD, null);
 }

lib/main.dart

@@ -103,6 +103,27 @@ class _MyAppState extends State<MyApp> {
                     ? null
                     : int.parse(params["template_id"]),
                 params["fromPage"]);
+      },
+      "message_focus":(pageName, params, _){
+        if (!Api.getInstance().setDioCookie(params) ||
+            params["fromPage"] == null) {
+          return ErrorPage("出错：需要传递的参数为空");
+        }
+        return RouterCenterImpl().findNewMessageRouter()?.getFocusPage(params["fromPage"]);
+      },
+      "message_attention":(pageName, params, _){
+        if (!Api.getInstance().setDioCookie(params) ||
+            params["fromPage"] == null) {
+          return ErrorPage("出错：需要传递的参数为空");
+        }
+        return RouterCenterImpl().findNewMessageRouter()?.getAttentionPage(params["fromPage"]);
+      },
+      "message_like":(pageName, params, _){
+        if (!Api.getInstance().setDioCookie(params) ||
+            params["fromPage"] == null) {
+          return ErrorPage("出错：需要传递的参数为空");
+        }
+        return RouterCenterImpl().findNewMessageRouter()?.getLikePage(params["fromPage"]);
       }
     });
     FlutterBoost.handleOnStartPage();
@@ -113,11 +134,11 @@ class _MyAppState extends State<MyApp> {
     return MaterialApp(
       title: 'Flutter Boost example',
       debugShowCheckedModeBanner: false,
-      routes: {
-        '/': (context) {
-          return TestPage();
-        },
-      },
+//      routes: {
+//        '/': (context) {
+//          return TestPage();
+//        },
+//      },
       builder: buildOnce,
       theme: new ThemeData(
         primaryColor: Colors.white,
@@ -132,6 +153,9 @@ class _MyAppState extends State<MyApp> {
           size: 35.0,
         ),
       ),
+      home: Container(
+        color: Colors.transparent,
+      ),
     );
   }
 }

lib/userModel/page/userSetting/UserSettingModel.dart

@@ -7,6 +7,7 @@ import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_boost/flutter_boost.dart';
 import 'package:gmalpha_flutter/commonModel/GMBase.dart';
 import 'package:gmalpha_flutter/commonModel/live/BaseModel.dart';
 import 'package:gmalpha_flutter/commonModel/net/Api.dart';
@@ -205,8 +206,9 @@ class UserSettingModel extends BaseModel {
         UserEntityImpl().savenickName(name);
         UserEntityImpl().savecountryInfoId(countryId);
         UserEntityImpl().savecountryInfoName(cityLive.data);
-        Timer(Duration(milliseconds: 390), () {
-          Navigator.pop(context);
+        Timer(Duration(milliseconds: 200), () {
+          FlutterBoost.singleton.closePageForContext(context);
+//          Navigator.pop(context);
         });
       } else {
         Toast.show(context, "保存失败");

pubspec.yaml

@@ -29,6 +29,10 @@ dependencies:
   pull_to_refresh: ^1.5.0
   flutter_boost: ^0.0.420
 #  gengmei_flutter_plugin: ^0.0.731
+#  flutter_boost:
+#    git:
+#      url: 'https://github.com/alibaba/flutter_boost.git'
+#      ref: 'feature/flutter_1.9_upgrade'
   cached_network_image: ^1.1.1
   flutter_screenutil: ^0.5.3
   gengmei_flutter_plugin: