8.8

lib/internal/bbs/bbs_router.dart

@@ -111,7 +111,8 @@ class BbsRouter implements IRouterProvider{
       router.define(chatRoom, handler: Handler(handlerFunc: (_, params){
         String id = params["id"].first;
         String type = params["type"].first;
-        return ChatDetailPage(id,type);
+        String toUserId = params["toUserId"].first;
+        return ChatDetailPage(id,type,toUserId);
       }));
 
       router.define(questionList, handler: Handler(handlerFunc: (_, params) => QuestionList()));

lib/internal/bbs/page/buy_service.dart

@@ -272,7 +272,7 @@ class BuyServiceState extends State<BuyService> {
       String roomId = res.sessionid;
       toasts("支付成功，即将进入聊天室！");
       NavigatorUtils.push(
-          context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne");
+          context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne&toUserId=''");
       print(666);
     }, onError: (code, msg) {
       toasts(msg);

lib/internal/bbs/page/chat_room.dart

@@ -25,9 +25,10 @@ import 'package:liftmanager/net/api_service.dart';
 import 'package:liftmanager/utils/theme_utils.dart';
 
 class ChatDetailPage extends StatefulWidget {
-  ChatDetailPage(this.id, this.type);
+  ChatDetailPage(this.id, this.type,this.toUserId);
   final String id;
   final String type;
+  final String toUserId;
   @override
   _ChatDetailPageState createState() => _ChatDetailPageState();
   // _ChatDetailPageState createState() => _ChatDetailPageState(type,index);
@@ -52,6 +53,7 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
   List<dynamic> storyListUserOnline = [];
   //避免从附近的人打招呼重复的initRoom
   bool isTrim = false;
+  int dataTable;
 
   final controller = TextEditingController();
   void _handleSubmitted(context, String text) {
@@ -63,7 +65,7 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
       // if(type == 1){
       print(666);
       Provider.of<WebSocketProvide>(context, listen: false)
-          .sendMessage(context, text, widget.id,1);
+          .sendMessage(context, text, widget.id,1,dataTable,widget.toUserId);
       showEmoji = false;
       // }
       // new Future.delayed(Duration(milliseconds: 1000),(){
@@ -188,6 +190,13 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
   void initState() {
     emojiList = emoji.split(',');
     print(emojiList);
+
+    if(widget.type == "nearToOne"){
+      dataTable = 3;
+    }else {
+      dataTable = null;
+    }
+    
     
     print(JsonEncoder().convert(emojiList));
     print(66669999);
@@ -369,7 +378,7 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
       String imagesUrl;
       imagesUrl = (res.pathUrl);
       Provider.of<WebSocketProvide>(context, listen: false)
-          .sendMessage(context, imagesUrl, widget.id,2);
+          .sendMessage(context, imagesUrl, widget.id,2,dataTable,widget.toUserId);
     }, onError: (code, msg) {
       dismissLoading(context);
       toasts(msg);

lib/internal/bbs/page/expert_list.dart

@@ -155,7 +155,7 @@ class ExpertListState extends BasePageState<ExpertList, ExpertListPresenter> {
       print(res);
       String roomId = res.sessionid;
       toasts("即将进入聊天室！");
-      NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne");
+      NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne&toUserId=''");
       print(666);
     }, onError: (code, msg) {
       toasts(msg);

lib/internal/bbs/page/recommend_ask.dart

@@ -86,7 +86,7 @@ class RecommendAskState extends State<RecommendAsk> {
     
     NewApiService().orderReceiving(obj, onSuccess: (res) {
       toasts("操作成功");
-      NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${detailObj.sessionId}&type=someToOne");
+      NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${detailObj.sessionId}&type=someToOne&toUserId=''");
       _hasData = true;
       setState(() {});
     }, onError: (code, msg) {

lib/internal/bbs/provide/websocket.dart

@@ -169,13 +169,16 @@ class WebSocketProvide with ChangeNotifier{
       // historyMessageString.add(data.toString());
       // setStringEvent(roomId,historyMessageString);
       // print(JsonEncoder().convert(prefs.getStringList(obj["sessionid"])));
+      String friendsInit = randomInt(1111,9999).toString() + DateTime.now().millisecondsSinceEpoch.toString();
       print(123);
       List<String>strChat;
+      print(prefs.getStringList(obj["sessionid"]));
       // ignore: unrelated_type_equality_checks
-      if(prefs.getStringList(obj["sessionid"]) != ""){
+      if(prefs.getStringList(obj["sessionid"]) != "" && prefs.getStringList(obj["sessionid"]) != null){
         strChat = prefs.getStringList(obj["sessionid"]);
       }else {
         strChat = [];
+        FastNotification.push("friendAction",friendsInit);
       }
       
       print(JsonEncoder().convert(data));
@@ -190,7 +193,7 @@ class WebSocketProvide with ChangeNotifier{
         historyMessageqqq = historyMessageString.map((item)=>jsonDecode(item)).toList();
         FastNotification.push("chat_room",historyMessageqqq);
       }
-      String friendsInit = randomInt(1111,9999).toString() + DateTime.now().millisecondsSinceEpoch.toString();
+      
       prefs.setString("changeRoomId",obj["sessionid"]);
       FastNotification.push("friendAction",friendsInit);
     }
@@ -256,6 +259,8 @@ class WebSocketProvide with ChangeNotifier{
         print("JsonEncoder().convert(INITROOM)---------------------");
         historyMessageqqq = msgListInitRoom;
         FastNotification.push("chat_room",historyMessageqqq);
+        String friendsInit = randomInt(1111,9999).toString() + DateTime.now().millisecondsSinceEpoch.toString();
+        FastNotification.push("friendAction",friendsInit);
       }
       
     }
@@ -278,7 +283,7 @@ class WebSocketProvide with ChangeNotifier{
       //触发通知
     notifyListeners();
   }
-  void sendMessage(context,data,id,msgType){//发送消息
+  void sendMessage(context,data,id,msgType,dataTable,toUserId){//发送消息
   FocusScope.of(context).requestFocus(FocusNode());
   if(!socketIsConnect){
     showAlert(
@@ -311,9 +316,12 @@ class WebSocketProvide with ChangeNotifier{
     var objs = {
       "cmd":"CHAT",
       "type":msgType,
+      "dataTable":dataTable,
+      "receiver":toUserId,
       "avatarUrl":FlutterStars.SpUtil.getString("avatarUrl"),
       "time": DateTime.now().millisecondsSinceEpoch,
       "fromUser":int.parse(FlutterStars.SpUtil.getString(Constant.userId)),
+      "userId":int.parse(FlutterStars.SpUtil.getString(Constant.userId)),
       "name":FlutterStars.SpUtil.getString("username"),
       "sessionid":id,
       "msg":data
@@ -329,7 +337,8 @@ class WebSocketProvide with ChangeNotifier{
   
     print("LOOP");
     var objs = {
-      "cmd":"LOOP"
+      "cmd":"LOOP",
+      "userId":int.parse(FlutterStars.SpUtil.getString(Constant.userId))
     };
     
     String text = json.encode(objs).toString();
@@ -360,27 +369,7 @@ class WebSocketProvide with ChangeNotifier{
     // print(777);
     channel.sink.add(text);
   }
-  void loginAllSeconds(id){//临时重新初始化房间
-  roomId = id;
-  // getOnlineUserEvent(roomId);
-  // print(JsonEncoder().convert(roomId));
-  // print(555);
-    var objs = {
-      "cmd":"LOGINALL",
-      "type":1,
-      "avatarUrl":FlutterStars.SpUtil.getString("avatarUrl"),
-      "time": DateTime.now().millisecondsSinceEpoch,
-      "fromUser":int.parse(FlutterStars.SpUtil.getString(Constant.userId)),
-      "name":FlutterStars.SpUtil.getString("username"),
-      "sessionid":roomId,
-      "msg":"我是app端初始化临时"
-    };
-    
-    String text = json.encode(objs).toString();
-    // print(text);
-    // print(778);
-    channel.sink.add(text);
-  }
+  
   void incomeFriend(id){//进入朋友房间
   roomId = id;
   // getOnlineUserEvent(roomId);

lib/internal/friends/page/friends_list.dart

@@ -128,24 +128,34 @@ with TickerProviderStateMixin, AutomaticKeepAliveClientMixin{
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
     LogUtil.d(JsonEncoder().convert(friendsList));
+    LogUtil.d(JsonEncoder().convert(listOne));
       LogUtil.d("5555665-------------");
+      LogUtil.d(changeRoomId);
     friendsList = [];
     if(changeRoomId !=null){
       dynamic firstContent;
-      listOne.forEach((item){
-        if(item.sessionid == changeRoomId){
-          firstContent = item;
-        }else {
-          friendsList.add(item);
+      if(listOne.length<1){
+        friendsList = [];
+      }else {
+        listOne.forEach((item){
+          if(item.sessionid == changeRoomId){
+            firstContent = item;
+          }else {
+            friendsList.add(item);
+          }
+        });
+        if(firstContent != null){
+          friendsList.insert(0, firstContent);
         }
-      });
-      friendsList.insert(0, firstContent);
+      }
+      
+      
     }else {
       friendsList = listOne;
     }
     
     LogUtil.d(JsonEncoder().convert(friendsList));
-    LogUtil.d("5555665--------------------");
+    LogUtil.d("5555677--------------------");
     
     return Scaffold(
       appBar: MyAppBar(

lib/internal/friends/page/message_page/conversation_item.dart

@@ -28,9 +28,9 @@ class ConversationItem extends StatelessWidget {
           // conversationItemData.sessionid
           // NavigatorUtils.push(context, "${FriendsRouter.chatRoom}");
           if(conversationItemData.dataTable == 3){
-            NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${conversationItemData.sessionid}&type=nearToOne");
+            NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${conversationItemData.sessionid}&type=nearToOne&toUserId=${conversationItemData.userId}");
           }else {
-            NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${conversationItemData.sessionid}&type=oneToOne");
+            NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${conversationItemData.sessionid}&type=oneToOne&toUserId=''");
           }
           // NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=${conversationItemData.sessionid}&type=oneToOne");
         },

lib/internal/friends/page/near_detail.dart

@@ -51,11 +51,12 @@ class NearDetailState extends State<NearDetail> {
       // LogUtil.d("5555664");
       print(res["room"]);
       String roomId = res["room"];
-      if(res["type"]==1){
-        NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne");
-      }else {
-        NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=oneToOne");
-      }
+      NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=nearToOne&toUserId=$id");
+      // if(res["type"]==1){
+      //   NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne");
+      // }else {
+      //   NavigatorUtils.push(context, "${BbsRouter.chatRoom}?id=$roomId&type=oneToOne");
+      // }
       print(41414111);
       
       setState(() {});

lib/internal/wode/page/edit_text_page.dart

@@ -45,6 +45,7 @@ class EditTextState extends State<EditTextPage> {
     return Scaffold(
       appBar: MyAppBar(
         centerTitle: widget.title,
+        isBack:false,
         actions: <Widget>[
           FlatButton(
             child: Text("完成"),

lib/internal/wode/page/order/buy_service.dart

@@ -308,7 +308,7 @@ class BuyServiceState extends State<BuyService> {
       String roomId = res.sessionid;
       toasts("支付成功，即将进入聊天室！");
       NavigatorUtils.push(
-          context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne");
+          context, "${BbsRouter.chatRoom}?id=$roomId&type=someToOne&toUserId=''");
       print(666);
     }, onError: (code, msg) {
       toasts(msg);

lib/internal/wode/page/personal_page.dart

@@ -66,9 +66,11 @@ class PersonalPageState extends State<PersonalPage>
   }
 
   void setUser(UserInfoEntity user) {
-    print(user);
+    print(user.userName);
+    print(user.avatarUrl);
+    print("8653555------------");
     provider.setUser(user); 
-    FlutterStars.SpUtil.putString('username', user.userName);
+    FlutterStars.SpUtil.putString('username', user.nickName);
     FlutterStars.SpUtil.putString('avatarUrl', user.avatarUrl);
   }
 
@@ -222,6 +224,8 @@ class PersonalPageState extends State<PersonalPage>
                             ),
                           ).then(
                             (value) {
+                              print(value);
+                              print(123333);
                               if (value != null) {
                                 _modifyName(value);
                               }