add message

android/app/src/main/kotlin/com/example/gmalpha_flutter/MainActivity.kt

@@ -63,7 +63,7 @@ class MainActivity : FlutterActivity() {
                 result.success("wifi")
             } else if (call.method == "INIT_PARAMS") {
                 val map = HashMap<String, String>()
-                map.put("buildConfig", "release")
+                map.put("buildConfig", "debug")
                 //HERE
 //                                        map.put("proxy", "172.30.9.84:6666");
                 result.success(map)

lib/NewMessageModel/NewMessageRouter.dart

@@ -5,5 +5,5 @@ import 'package:gmalpha_flutter/NewMessageModel/NewMessageRouterImpl.dart';
 
 @Router("NewMessageModel", NewMessageRouterImpl, true)
 abstract class NewMessageRouter implements RouterBaser {
-  Widget getMessagePage();
+  Widget getMessagePage(String fromPage);
 }
\ No newline at end of file

lib/NewMessageModel/NewMessageRouterImpl.dart

@@ -5,7 +5,7 @@ import 'package:gmalpha_flutter/newMessageModel/page/MessagePage.dart';
 
 class NewMessageRouterImpl implements NewMessageRouter {
   @override
-  Widget getMessagePage() {
-    return MessagePage();
+  Widget getMessagePage(String fromPage) {
+    return MessagePage(fromPage);
   }
 }
\ No newline at end of file

lib/NewMessageModel/page/MessageModel.dart

@@ -24,6 +24,7 @@ class MessageModel extends BaseModel {
     getLatestMessage();
   }
 
+
   getMyMessage(page, count){
     MessageRepository.getInstance()
         .getMyMessage(page, count)

lib/NewMessageModel/page/MessagePage.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:gmalpha_flutter/NewMessageModel/page/MessageModel.dart';
+import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/LatestMessageEntity.dart';
+import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/MyMessageEntity.dart';
+import 'package:gmalpha_flutter/NewMessageModel/service/remote/entity/UnreadMessageEntity.dart';
 import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
 import 'common.dart';
 
@@ -17,7 +20,7 @@ enum LoadingStatus {
 class MessagePage extends StatefulWidget {
   MessageModel _messageModel;
 
-  MessagePage() {
+  MessagePage(String fromPage) {
     _messageModel = new MessageModel(1, 10);
   }
   @override
@@ -79,7 +82,6 @@ class _MessagePageState extends State<MessagePage> {
   void initState() {
     super.initState();
     _messageModel.init(context);
-    list.insertAll(0, [1]);
     //在初始化状态的方法里 设置ListView的监听
     _scrollController.addListener(() {
       //判断 当滑动到最底部的时候，去加载更多的数据
@@ -100,49 +102,84 @@ class _MessagePageState extends State<MessagePage> {
         title: messageTitle('消息'),
         elevation: 0,
       ),
-      body: ListView.builder(
-        itemCount: list.length + 1,
-        itemBuilder: (BuildContext context, int index) {
-          if (index == list.length) {
-            if(list.length == 1) {
-              return Container(
-                color: ALColors.ColorFFFFFF,
-                height: ScreenUtil().setHeight(430),
-                child: Center(child: Text('暂无相关内容', style: TextStyle(color: ALColors.Color999999, fontSize: ScreenUtil().setSp(16))))
-              );
-            } else {
-              return _loadingView();
-            }
-          } else {
-            if(index == 0) {
-              return topCard(_messageModel.latestMessageLive);
-            } else {
-              return Container(
-                color: ALColors.ColorFFFFFF,
-                child: Column(
-                  children: <Widget>[
-                    Center(
-                      child: messageList(_messageModel.myMessageLive),
-                    )
-                  ],
-                ),
-              );
-            }
-          }
-        },
-        controller: _scrollController,
+      body: SingleChildScrollView(
+        child: Center(
+          child: Column(
+            children: <Widget>[
+              topCard(),
+              StreamBuilder<MyMessageEntity>(
+                stream: _messageModel.myMessageLive.stream,
+                initialData: _messageModel.myMessageLive.data ,
+                builder: (BuildContext context, data){
+                  var dataList = data.data?.data;
+                  if(dataList == null) {
+                    return Container(
+                      color: ALColors.ColorFFFFFF,
+                      height: ScreenUtil().setHeight(430),
+                      child: Center(child: Text('暂无相关内容', style: TextStyle(color: ALColors.Color999999, fontSize: ScreenUtil().setSp(16))))
+                    );
+                  }
+                  print('++++++====================${dataList.length}=================');
+                  return ListView.builder(
+                    itemCount: dataList.length + 1,
+                    itemBuilder: (BuildContext context, int index) {
+                      if (index == dataList.length) {
+                        return _loadingView();
+                      } else {
+                        return Container(
+                          color: ALColors.ColorFFFFFF,
+                          child: Column(
+                            children: <Widget>[
+                              messageList(dataList[index])
+                            ],
+                          ),
+                        );
+                      }
+                    },
+                    controller: _scrollController,
+                  );
+                },
+              )
+            ]
+          ),
+        ),
       )
     );
   }
 
-  topCard(latestMessageLive){
+
+  topCard(){
     return Container(
       color: ALColors.ColorFFFFFF,
       child: Column(
         children: <Widget>[
-          messageTop('images/message_noti.png', '通知', '', 0),
-          messageTop('images/message_like.png', 'Like!', '还没有人给你Like!哦~', 0),
-          messageTop('images/message_att.png', '关注', '还没有人给你关注哦~', 0),
+          StreamBuilder<LatestMessageEntity>(
+            stream: _messageModel.latestMessageLive.stream,
+            initialData: _messageModel.latestMessageLive.data ,
+            builder: (BuildContext context, data){
+              var content = data.data?.data?.content ?? '没有新的通知';
+              print('-====================${data.data.data.content}=================');
+              return messageTop('images/message_noti.png', '通知', content == '' ? '没有新的通知' : content, 0);
+            },
+          ),
+          StreamBuilder<UnreadMessageEntity>(
+            stream: _messageModel.likeUnreadMessageLive.stream,
+            initialData: _messageModel.likeUnreadMessageLive.data ,
+            builder: (BuildContext context, data){
+              var voteCount = data.data?.data?.voteCount ?? 0;
+              print('-====================${voteCount}=================');
+              return messageTop('images/message_like.png', 'Like!', voteCount == 0 ? '还没有人给你Like!哦~' : '有$voteCount个人Like!了你', voteCount);
+            },
+          ),
+          StreamBuilder<UnreadMessageEntity>(
+            stream: _messageModel.followUnreadMessageLive.stream,
+            initialData: _messageModel.followUnreadMessageLive.data ,
+            builder: (BuildContext context, data){
+              var count = data.data?.data?.count ?? 0;
+              print('-====================${count}=================');
+              return messageTop('images/message_att.png', '关注', count == 0 ? '还没有人给你关注哦~' : '有$count个人关注了你', count);
+            },
+          ),
           Container(
             margin: EdgeInsets.only(left: ScreenUtil().setWidth(16), right: ScreenUtil().setWidth(16), bottom: ScreenUtil().setHeight(24)),
             height: ScreenUtil().setHeight(12),

lib/NewMessageModel/util/Jump.dart

+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:gmalpha_flutter/NewMessageModel/page/MessagePage.dart';
+
+void jumpToMs(BuildContext context){
+  Navigator.push(
+              context,
+              new MaterialPageRoute(
+                builder: (context) => MessagePage('') ,
+              ));
+}
\ No newline at end of file

lib/TestPage.dart

@@ -12,7 +12,7 @@ class TestPage extends StatelessWidget {
   TestPage() {
     Api.getInstance().setDioCookie({
       'Cookie':
-          'sessionid=iro2ke6i7rc9qselm7yogjf5xvgwzn1p; _gtid=203c91f8ebd811e981aa525400e82fab6765; _gm_token=2927681570850359'
+          'sessionid=k96qdzwb3bquf87g32kdfbn676jkfnmk; _gtid=6bcbb61eebf411e9bfa4525400e82fab7541; _gm_token=e0fc1c1570864112'
     });
   }
 
@@ -27,7 +27,7 @@ class TestPage extends StatelessWidget {
               presigePage(context),
               albumPage(context),
               userSettingPage(context),
-              
+              testMessagePage(context),
             ],
           ),
         ));
@@ -49,6 +49,15 @@ class TestPage extends StatelessWidget {
     );
   }
 
+  testMessagePage(BuildContext context) {
+    return base(
+        context,
+        RouterCenterImpl()
+            .findNewMessageRouter()
+            ?.getMessagePage(''),
+        "消息页面");
+  }
+
   testReportPage(BuildContext context) {
     return base(
         context,