commit

flutter.sh

@@ -260,12 +260,12 @@ mkdir /Users/apple/lsy/aar_update/androd${message}/
 mkdir /Users/apple/lsy/aar_update/ios${message}/
 
 clean
-#android_apk
+android_apk
 #android
 #android_publish
 #copyAAR
 #upload_android_aar
-ios
+#ios
 #ios_publish
 #notifyDingDing
 

images/add.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.75" y="0.75" width="22.5" height="22.5" stroke="#8E8E8E" stroke-width="1.5"/>
+<path d="M5 12H19" stroke="#8E8E8E" stroke-width="1.5"/>
+<path d="M12 19L12 5" stroke="#8E8E8E" stroke-width="1.5"/>
+</svg>

images/find.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H6V1.45455H1.45455V6H0V0Z" fill="#8E8E8E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 0H18V1.45455H22.5455V6H24V0Z" fill="#8E8E8E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 24H6V22.5455H1.45455V18H0V24Z" fill="#8E8E8E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 24H18V22.5455H22.5455V18H24V24Z" fill="#8E8E8E"/>
+<rect x="16.0399" y="8.1998" width="1.8" height="1.8" fill="#8E8E8E"/>
+<rect x="6.03992" y="8.1998" width="1.8" height="1.8" fill="#8E8E8E"/>
+<path d="M6.99988 14.9996H16.9999V16.4996H6.99988V14.9996Z" fill="#8E8E8E"/>
+</svg>

images/home.svg

+<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 10L13 1L25 10M4.5 7.375V22.5H21.5V7.375" stroke="#8E8E8E" stroke-width="1.5"/>
+</svg>

images/message.svg

+<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1V21L4.91111 17.4103H23V1H1Z" stroke="#8E8E8E" stroke-width="1.5"/>
+</svg>

images/user.svg

+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 23V20C1 18.3431 2.34315 17 4 17H20C21.6569 17 23 18.3431 23 20V23" stroke="#8E8E8E" stroke-width="1.5"/>
+<circle cx="12" cy="7" r="6.25" stroke="#8E8E8E" stroke-width="1.5"/>
+</svg>

lib/AlbumModel/page/album/AlbumModel.dart

@@ -260,6 +260,10 @@ class AlbumModel extends BaseModel {
   }
 
   void clickItem(BuildContext context, int index) {
+    if(maxVideoCount==0&&albumLive.data[index].isVideo){
+      Toast.show(context, "头像暂时不支持视频哦～");
+      return;
+    }
     String path;
     if (Platform.isAndroid) {
       path = albumLive.data[index].realPath;

lib/AlbumModel/page/album/AlbumPage.dart

@@ -222,7 +222,7 @@ class AlbumState extends BasePage<AlbumPage>
               );
             }
             String during;
-            if (_model.maxVideoCount > 0 && _model.isVideo(newIndex)) {
+            if (_model.isVideo(newIndex)) {
               during = _model.getFormatTime(imgList.data[newIndex].during);
             }
             return GestureDetector(
@@ -246,6 +246,13 @@ class AlbumState extends BasePage<AlbumPage>
                           : _model.isSelect(newIndex)
                               ? SvgPicture.asset("images/album_sel.svg")
                               : SvgPicture.asset("images/album_not_sel.svg"),
+                      _model.maxVideoCount == 0 && _model.isVideo(newIndex)
+                          ? Container(
+                              width: double.maxFinite,
+                              height: double.maxFinite,
+                              color: ALColors.Color33000000,
+                            )
+                          : Container(),
                       _model.maxVideoCount > 0 && _model.isVideo(newIndex)
                           ? _model.isFullSelectVideo() &&
                                   !_model.isSelectVideo(newIndex)
@@ -262,7 +269,7 @@ class AlbumState extends BasePage<AlbumPage>
                                   color: ALColors.Color33000000,
                                 )
                               : Container(),
-                      _model.maxVideoCount > 0 && _model.isVideo(newIndex)
+                      _model.isVideo(newIndex)
                           ? Container(
                               width: double.maxFinite,
                               height: double.maxFinite,
@@ -318,6 +325,11 @@ class AlbumState extends BasePage<AlbumPage>
                 },
                 itemCount: snapshot.data.length,
                 itemBuilder: (context, index) {
+                  String showDirName = snapshot.data[index].dirName;
+                  if (snapshot.data[index].dirName.length > 10) {
+                    showDirName =
+                        "${snapshot.data[index].dirName.substring(0, 10)}...";
+                  }
                   return GestureDetector(
                     onTap: () => _model.selectDir(index),
                     child: Row(
@@ -333,7 +345,7 @@ class AlbumState extends BasePage<AlbumPage>
                         Container(
                           padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
                           child: baseText(
-                              "${snapshot.data[index].dirName} (${snapshot.data[index].picCount})",
+                              "${showDirName} (${snapshot.data[index].picCount})",
                               11,
                               ALColors.Color323232),
                         ),

lib/Annotations/RouterCenterRestore.mark.dart

@@ -11,6 +11,7 @@
 //NewMessageRouterImpl is resign : true
 //UserRouterImpl is resign : true
 //WebRouterImpl is resign : true
+//AskRouterImpl is resign : true
 
 import "package:gmalpha_flutter/MainModel/MainRouterImpl.dart";
 import "package:gmalpha_flutter/MainModel/MainRouter.dart";
@@ -26,6 +27,8 @@ import "package:gmalpha_flutter/UserModel/UserRouterImpl.dart";
 import "package:gmalpha_flutter/UserModel/UserRouter.dart";
 import "package:gmalpha_flutter/WebModel/WebRouterImpl.dart";
 import "package:gmalpha_flutter/WebModel/WebRouter.dart";
+import "package:gmalpha_flutter/AskModel/AskRouterImpl.dart";
+import "package:gmalpha_flutter/AskModel/AskRouter.dart";
 
 import "package:gmalpha_flutter/Annotations/RouterCenterRestore.dart";
 import "package:gmalpha_flutter/Annotations/RouterBaser.dart";
@@ -58,9 +61,10 @@ class RouterCenterImpl {
     map.putIfAbsent("FindModel", () => FindRouterImpl());
     map.putIfAbsent("buried_router", () => BuriedImpl());
     map.putIfAbsent("albumModel", () => AlbumRouterImpl());
-    map.putIfAbsent("NewMessageModel", () => NewMessageRouterImpl());
+    map.putIfAbsent("MessageModel", () => NewMessageRouterImpl());
     map.putIfAbsent("UserModel", () => UserRouterImpl());
     map.putIfAbsent("WebModel", () => WebRouterImpl());
+    map.putIfAbsent("AskRouter", () => AskRouterImpl());
   }
 
   RouterBaser getModel(String modelName) {
@@ -96,10 +100,10 @@ class RouterCenterImpl {
   }
 
   NewMessageRouter findNewMessageRouter() {
-    if (map["NewMessageModel"] == null) {
+    if (map["MessageModel"] == null) {
       return null;
     }
-    return map["NewMessageModel"] as NewMessageRouter;
+    return map["MessageModel"] as NewMessageRouter;
   }
 
   UserRouter findUserRouter() {
@@ -115,4 +119,11 @@ class RouterCenterImpl {
     }
     return map["WebModel"] as WebRouter;
   }
+
+  AskRouter findAskRouter() {
+    if (map["AskRouter"] == null) {
+      return null;
+    }
+    return map["AskRouter"] as AskRouter;
+  }
 }

lib/AskModel/AskRouter.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:gmalpha_flutter/Annotations/RouterBaser.dart';
+import 'package:gmalpha_flutter/Annotations/anno/Router.dart';
+import 'package:gmalpha_flutter/AskModel/AskRouterImpl.dart';
+
+@Router("AskRouter",AskRouterImpl,true)
+abstract class AskRouter implements RouterBaser{
+  bool showModel();
+}
\ No newline at end of file

lib/AskModel/AskRouterImpl.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:gmalpha_flutter/AskModel/AskRouter.dart';
+
+class AskRouterImpl extends AskRouter{
+  @override
+  bool showModel() {
+    return true;
+  }
+}
\ No newline at end of file

lib/BuriedLib/BuriedImpl.dart

@@ -36,6 +36,6 @@ class BuriedImpl implements BuriedRouter {
   void onClick(String pageName, String buttonName) {
     print("lsy !! ON CLICK  ");
     BuriedCenter.getInstance().onEvent(
-        "CLICK_EVENT", {"page_name": pageName, "button_name": buttonName});
+        "on_click_button", {"page_name": pageName, "button_name": buttonName});
   }
 }

lib/BuriedLib/buried/BuriedCenter.dart

@@ -44,7 +44,8 @@ class BuriedCenter {
     normalRequest.params["referrer_id"] = referrer_id ?? "";
     normalRequest.params["extra_param"] = extra_param ?? "";
     normalRequest.params["referrer_tab_name"] = referrer_tab_name ?? "";
-    normalRequest.params["isPush"] = isPush ?? "";
+    normalRequest.params["is_push"] = isPush ?? "0";
+    normalRequest.params["fake"] = isPush ?? "";
     sendTask.sendBuried(normalRequest);
   }
 

lib/Home/HomeModel.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
+import 'package:gmalpha_flutter/commonModel/GMBase.dart';
+
+class HomeModel extends BaseModel {
+  LiveData<int> indexLive = new LiveData();
+  LiveData<int> widgetLive = new LiveData();
+  final List<BottomNavigationBarItem> items = [];
+  final pages = [];
+  int currentIndex = 0;
+
+  @override
+  void dispose() {
+    indexLive.dispost();
+    widgetLive.dispost();
+  }
+
+  void init() {
+    var mainWidget = RouterCenterImpl().findMainRouter()?.getMainWidget();
+    var findPage = RouterCenterImpl().findFindRouter()?.getFindPage("ww");
+    var showModel = RouterCenterImpl().findAskRouter()?.showModel();
+    var messagePage =
+        RouterCenterImpl().findNewMessageRouter()?.getMessagePage("main");
+    var userPage = RouterCenterImpl().findUserRouter()?.getUserPage();
+    if (mainWidget != null) {
+      items.add(
+          BottomNavigationBarItem(icon: SvgPicture.asset("images/home.svg")
+              ,title: Container()));
+      pages.add(mainWidget);
+    }
+    if (findPage != null) {
+      items.add(
+          BottomNavigationBarItem(icon: SvgPicture.asset("images/find.svg")
+          ,title: Container()));
+      pages.add(findPage);
+    }
+    if (showModel) {
+      items.add(
+          BottomNavigationBarItem(icon: SvgPicture.asset("images/add.svg")
+              ,title: Container()));
+    }
+    if (messagePage != null) {
+      items.add(BottomNavigationBarItem(
+          icon: SvgPicture.asset("images/message.svg")
+          ,title: Container()));
+      pages.add(messagePage);
+    }
+    if (userPage != null) {
+      items.add(
+          BottomNavigationBarItem(icon: SvgPicture.asset("images/user.svg")
+              ,title: Container()));
+      pages.add(userPage);
+    }
+  }
+
+  void onTap(int index) {
+    indexLive.notifyView(index);
+    if(index==2){
+      //TODO
+    }else if(index<2){
+      widgetLive.notifyView(index);
+    }else{
+      widgetLive.notifyView(index-1);
+    }
+  }
+}

lib/Home/HomePage.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'HomeModel.dart';
+
+class HomePage extends StatefulWidget {
+  HomeModel _model;
+
+  HomePage() {
+    _model = new HomeModel();
+  }
+
+  @override
+  State<StatefulWidget> createState() => HomeState(_model);
+}
+
+class HomeState extends State<HomePage> {
+  HomeModel _model;
+
+  HomeState(this._model);
+
+  @override
+  void initState() {
+    super.initState();
+    _model.init();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        bottomNavigationBar: StreamBuilder<int>(
+            stream: _model.indexLive.stream,
+            initialData: _model.indexLive.data,
+            builder: (con, data) {
+              int index = data.data ?? 0;
+              return BottomNavigationBar(
+                  items: _model.items,
+                  currentIndex: index,
+                  onTap: (index) {
+                    _model.onTap(index);
+                  });
+            }),
+        body: StreamBuilder<int>(
+            stream: _model.widgetLive.stream,
+            initialData: _model.widgetLive.data,
+            builder: (con, data) {
+              int index = data.data ?? 0;
+              return IndexedStack(
+                index: index,
+                children: _model.pages[index],
+              );
+            }));
+  }
+
+  @override
+  void dispose() {
+    _model.dispose();
+    super.dispose();
+  }
+}

lib/MainModel/MainRouter.dart

@@ -10,4 +10,6 @@ import 'package:gmalpha_flutter/MainModel/MainRouterImpl.dart';
 
 @Router("MainModel", MainRouterImpl, true)
 abstract class MainRouter implements RouterBaser {
+
+  Widget getMainWidget();
 }

lib/MainModel/MainRouterImpl.dart

@@ -5,6 +5,11 @@
 
 import 'package:flutter/material.dart';
 import 'package:gmalpha_flutter/MainModel/MainRouter.dart';
+import 'package:gmalpha_flutter/MainModel/page/main/MainPage.dart';
 
 class MainRouterImpl implements MainRouter {
+  @override
+  Widget getMainWidget() {
+    return MainPage();
+  }
 }

lib/MainModel/page/main/MainModel.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:gmalpha_flutter/commonModel/GMBase.dart';
+
+class MainModel extends BaseModel{
+
+
+  @override
+  void dispose() {
+    // TODO: implement dispose
+  }
+
+}
\ No newline at end of file

lib/MainModel/page/main/MainPage.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:gmalpha_flutter/MainModel/page/main/MainModel.dart';
+
+class MainPage extends StatefulWidget {
+  MainModel _model;
+
+  MainPage() {
+    _model = MainModel();
+  }
+
+  @override
+  State<StatefulWidget> createState() =>MainState(_model);
+}
+
+class MainState extends State<MainPage> {
+
+  MainModel _model;
+
+  MainState(this._model);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        color: Colors.green,
+      ),
+    );
+  }
+
+}

lib/MessageModel/NewMessageRouter.dart

@@ -3,7 +3,7 @@ import 'package:gmalpha_flutter/Annotations/RouterBaser.dart';
 import 'package:gmalpha_flutter/Annotations/anno/Router.dart';
 import 'package:gmalpha_flutter/MessageModel/NewMessageRouterImpl.dart';
 
-@Router("NewMessageModel", NewMessageRouterImpl, true)
+@Router("MessageModel", NewMessageRouterImpl, true)
 abstract class NewMessageRouter implements RouterBaser {
   Widget getAttentionPage(String fromPage);
   Widget getMessagePage(String fromPage);

lib/TestPage.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
+import 'package:gmalpha_flutter/Home/HomePage.dart';
 import 'package:gmalpha_flutter/commonModel/net/Api.dart';
 import 'package:gmalpha_flutter/res/anim/Anim.dart';
 import 'commonModel/GMBase.dart';
@@ -13,7 +14,8 @@ class TestPage extends StatelessWidget {
   TestPage() {
     Api.getInstance().setDioCookie({
       'Cookie':
-          '_gm_token=709ed71571898502; sessionid=usixwh8e2bfykdsiq5ydt0ss6kfc0c26; _gtid=52ebb2a2f62611e9b181525400e82fab3838'
+//          '_gm_token=709ed71571898502; sessionid=usixwh8e2bfykdsiq5ydt0ss6kfc0c26; _gtid=52ebb2a2f62611e9b181525400e82fab3838'
+      ' _gm_token=461c711573012410; sessionid=7ll0z21gfzg28d386u1itnz1kv3kug0q; _gtid=a5c32d00ffb011e9b747525400e82fab5496'
     });
   }
 
@@ -33,6 +35,7 @@ class TestPage extends StatelessWidget {
               likePage(context),
               focusPage(context),
               findPage(context),
+              TestHome(context),
             ],
           ),
         ));
@@ -82,8 +85,8 @@ class TestPage extends StatelessWidget {
       Navigator.push(
           context,
           new CustomRoute(RouterCenterImpl().findAlbumRouter()?.getAlbumPage(
-              "com.example.gmalpha_flutter", true, 9, null, false, "test",
-              maxVideoCount: 1)));
+              "com.example.gmalpha_flutter", true, 1, null, false, "test",
+              maxVideoCount: 0)));
     }, "相册页面");
   }
 
@@ -136,4 +139,13 @@ class TestPage extends StatelessWidget {
       );
     }, "发现页面");
   }
+
+  TestHome(BuildContext context) {
+    return base(context, () {
+      Navigator.push(
+          context,
+          new CustomRoute(HomePage())
+      );
+    }, "主页页面");
+  }
 }

lib/UserModel/UserRouterImpl.dart

@@ -6,12 +6,15 @@ import 'package:flutter/src/widgets/framework.dart';
 import 'package:gmalpha_flutter/UserModel/UserRouter.dart';
 import 'package:gmalpha_flutter/UserModel/page/comment/CommentSuggestPage.dart';
 import 'package:gmalpha_flutter/UserModel/page/reputation/ReputationsPage.dart';
+import 'package:gmalpha_flutter/UserModel/page/user/UserPage.dart';
 import 'package:gmalpha_flutter/UserModel/page/userSetting/UserSettingPage.dart';
 import 'package:gmalpha_flutter/UserModel/service/remote/entity/UserEntity.user.dart';
 
 class UserRouterImpl implements UserRouter {
   @override
-  Widget getUserPage() {}
+  Widget getUserPage() {
+    return UserPage();
+  }
 
   @override
   Widget getUserSettingPage(String userID, String refer) {
@@ -30,6 +33,6 @@ class UserRouterImpl implements UserRouter {
 
   @override
   Widget getReputationsPage(int userId, String userName, String fromPage) {
-    return ReputationsPage(userId,userName,fromPage);
+    return ReputationsPage(userId, userName, fromPage);
   }
 }

lib/UserModel/page/user/UserModel.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:gmalpha_flutter/commonModel/GMBase.dart';
+
+class UserModel extends BaseModel{
+  @override
+  void dispose() {
+    // TODO: implement dispose
+  }
+
+}
\ No newline at end of file

lib/UserModel/page/user/UserPage.dart

+/*
+ * @author lsy
+ * @date   2019-11-05
+ **/
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:gmalpha_flutter/UserModel/page/user/UserModel.dart';
+
+class UserPage extends StatefulWidget {
+  UserModel _model;
+
+  UserPage() {
+    _model = UserModel();
+  }
+
+  @override
+  State<StatefulWidget> createState() => UserState(_model);
+}
+
+class UserState extends State<UserPage> {
+
+  UserModel _model;
+
+  UserState(this._model);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        color: Colors.yellow,
+      ),
+    );
+  }
+}

lib/WebModel/page/ActivityReportPage.dart

@@ -48,8 +48,8 @@ class ActivityReportState extends BasePage<ActivityReportPage> {
             RouterCenterImpl()
                 .findBuriedRouter()
                 ?.onClick(pageName(), "return");
-            Navigator.pop(context, "");
-//            jumpToNative("search", null);
+            jumpToNative("search", null);
+            Navigator.pop(context);
           },
           action: <Widget>[
             GestureDetector(

pubspec.yaml

@@ -39,7 +39,7 @@ dependencies:
   gengmei_flutter_plugin:
     git:
       url: 'git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git'
-      ref: "656e2fdd256f6da7588a9aba2d24662b2b18af8e"
+      ref: "02bd549a993a9c6c0cb49b52c79927b984b030fd"
 #  gengmei_flutter_plugin:
 #    path: /Users/apple/lsy/gengmei_flutter_plugin
   flutter_drag_scale: