聊天室改

lib/internal/bbs/page/chat_room.dart

@@ -125,29 +125,35 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
     //   }
     // }
     // if ((widget.type == "someToOne")&& isTrim==false) {
-    if ((widget.type == "someToOne" || widget.type == "nearToOne")&& isTrim==false) {
-      new Future.delayed(Duration(milliseconds: 500), () {
-        Provider.of<WebSocketProvide>(context, listen: false)
-            .incomeRoom(widget.id);
-        getStringEvent(widget.id);
-      });
-    } 
-    // else if (widget.type == "nearToOne"){
+    // if ((widget.type == "someToOne" || widget.type == "nearToOne")&& isTrim==false) {
     //   new Future.delayed(Duration(milliseconds: 500), () {
     //     Provider.of<WebSocketProvide>(context, listen: false)
-    //         .loginAllSeconds(widget.id);
+    //         .incomeRoom(widget.id);
     //     getStringEvent(widget.id);
     //   });
-    else {
     // } 
-    // else if (widget.type == "oneToOne") {
-      new Future.delayed(Duration(milliseconds: 500), () {
+    // // else if (widget.type == "nearToOne"){
+    // //   new Future.delayed(Duration(milliseconds: 500), () {
+    // //     Provider.of<WebSocketProvide>(context, listen: false)
+    // //         .loginAllSeconds(widget.id);
+    // //     getStringEvent(widget.id);
+    // //   });
+    // else {
+    // // } 
+    // // else if (widget.type == "oneToOne") {
+    //   new Future.delayed(Duration(milliseconds: 500), () {
+    //     Provider.of<WebSocketProvide>(context, listen: false)
+    //         .incomeFriend(widget.id);
+    //     getStringEvent(widget.id);
+    //   });
+    // }
+    // isTrim = false;
+
+    new Future.delayed(Duration(milliseconds: 500), () {
         Provider.of<WebSocketProvide>(context, listen: false)
-            .incomeFriend(widget.id);
+            .incomeRoom(widget.id);
         getStringEvent(widget.id);
       });
-    }
-    isTrim = false;
   }
 
   void initJump() async {
@@ -260,27 +266,27 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
       prefs.setStringList(roomId, []);
     }
 
-    if (flustars.SpUtil.getString(roomId + "userOnline") != null &&
-        flustars.SpUtil.getString(roomId + "userOnline") != "") {
-      // if(prefs.getString(roomId+"userOnline")!=null){
-      // String hisStringUserOnline = prefs.getString(roomId+"userOnline");
-      // flustars.SpUtil.putString(roomId+"userOnline", res.token);
-      String hisStringUserOnline =
-          flustars.SpUtil.getString(roomId + "userOnline");
-      for (var value in JsonDecoder().convert(hisStringUserOnline)) {
-        print(value);
-        storyListUserOnline.add(value);
-      }
-      ;
-      // storyListUserOnline = JsonDecoder().convert(hisStringUserOnline);
-      // storyListUserOnline = hisStringUserOnline.map((item)=>jsonDecode(item)).toList();
+    // if (flustars.SpUtil.getString(roomId + "userOnline") != null &&
+    //     flustars.SpUtil.getString(roomId + "userOnline") != "") {
+    //   // if(prefs.getString(roomId+"userOnline")!=null){
+    //   // String hisStringUserOnline = prefs.getString(roomId+"userOnline");
+    //   // flustars.SpUtil.putString(roomId+"userOnline", res.token);
+    //   String hisStringUserOnline =
+    //       flustars.SpUtil.getString(roomId + "userOnline");
+    //   for (var value in JsonDecoder().convert(hisStringUserOnline)) {
+    //     print(value);
+    //     storyListUserOnline.add(value);
+    //   }
+    //   ;
+    //   // storyListUserOnline = JsonDecoder().convert(hisStringUserOnline);
+    //   // storyListUserOnline = hisStringUserOnline.map((item)=>jsonDecode(item)).toList();
 
-    } else {
-      //  prefs.setString(roomId+"userOnline",'');
-    }
+    // } else {
+    //   //  prefs.setString(roomId+"userOnline",'');
+    // }
 
-    print(JsonEncoder().convert(storyList));
-    print(JsonEncoder().convert(storyListUserOnline));
+    // print(JsonEncoder().convert(storyList));
+    // print(JsonEncoder().convert(storyListUserOnline));
 
     new Future.delayed(Duration(milliseconds: 1000), () {
       setState(() {
@@ -373,14 +379,14 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
   @override
   Widget build(BuildContext context) {
     double width = MediaQuery.of(context).size.width;
-    print(JsonEncoder().convert(msgList));
+    // print(JsonEncoder().convert(msgList));
     imagesList = [];
     msgList.forEach((element) {
       if(element["type"]==2){
                             imagesList.add(element["msg"]);
                           }
     });
-    print(1234567980);
+    // print(1234567980);
     
     return ChangeNotifierProvider<WebSocketProvide>(
       create: (_) => provider,
@@ -427,10 +433,10 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
                         physics: ClampingScrollPhysics(),
                         itemBuilder: (BuildContext context, int index) {
                           int typeUser;
-                          print(msgList[index]["fromUser"]);
-                          print(msgList[index]["msg"]);
+                          // print(msgList[index]["fromUser"]);
+                          // print(msgList[index]["msg"]);
                           // print(jsonDecode(msgList[index])["fromUser"]);
-                          print(123456789);
+                          // print(1234567890);
                           if (msgList[index]["fromUser"] ==
                               flustars.SpUtil.getString(Constant.userId)) {
                             typeUser = 1;
@@ -535,7 +541,7 @@ class _ChatDetailPageState extends State<ChatDetailPage> {
                                 setState(() {
                                   hasText = text.length > 0 ? true : false;
                                 });
-                                print('change=================== $text');
+                                // print('change=================== $text');
                               },
                               // onSubmitted:_handleSubmitted,
                               enabled: true, //bu禁用

lib/internal/bbs/page/recommend_ask.dart

@@ -136,7 +136,7 @@ class RecommendAskState extends State<RecommendAsk> {
 
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);

lib/internal/bbs/page/tab/video/video_detail.dart

@@ -190,7 +190,7 @@ class VideoDetailState extends State<VideoDetail> {
     print(width);
     print(height);
     print(12345678);
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);

lib/internal/bbs/provide/websocket.dart

@@ -15,6 +15,7 @@ import 'package:liftmanager/common/common.dart';
 import 'package:flustars/flustars.dart' as FlutterStars;
 import 'package:liftmanager/utils/toast.dart';
 import 'package:liftmanager/routers/fluro_navigator.dart';
+import 'dart:async';
 
 class WebSocketProvide with ChangeNotifier{
   List<dynamic> historyMessageqqq = [];//接收到哦的所有的历史消息
@@ -24,7 +25,27 @@ class WebSocketProvide with ChangeNotifier{
   String roomId;
   bool socketIsConnect = false;
   bool isSend = true;
+  Timer _timer;
+  void startTimer() {
+    //设置 10 秒回调一次
+    const period = const Duration(seconds: 10);
+    _timer = Timer.periodic(period, (timer) {
+      initLoop();
+    });
+  }
 
+  void cancelTimer() {
+    if (_timer != null) {
+      _timer.cancel();
+      _timer = null;
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    cancelTimer();
+  }
   
   // DartNotificationCenter.subscribe(
   //   channel: CHANNEL_NAME,
@@ -87,6 +108,11 @@ class WebSocketProvide with ChangeNotifier{
       isSend = true;
       print('websocket重连');
     }
+    // else {
+    //   startTimer();
+    // }
+    cancelTimer();
+    startTimer();
     socketIsConnect = true;
   }
 
@@ -107,19 +133,20 @@ class WebSocketProvide with ChangeNotifier{
     print(414141);
   }
 
-  void getOnlineUserEvent(id)async{
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    // String userStr = prefs.getString(id+"userOnline");
-    String userStr = FlutterStars.SpUtil.getString(id+"userOnline");
-    // List<dynamic>setUserList = userStr.map((item)=>jsonDecode(item)).toList();
-    if(userStr!=null&&userStr!=""){
-      List<dynamic>setUserList = jsonDecode(userStr);
-      FastNotification.push("set_user",setUserList);
-      // LogUtil.d(prefs.getString(id+"userOnline"));
-      print(33333);
-    }
+  //用户头像显示
+  // void getOnlineUserEvent(id)async{
+  //   SharedPreferences prefs = await SharedPreferences.getInstance();
+  //   // String userStr = prefs.getString(id+"userOnline");
+  //   String userStr = FlutterStars.SpUtil.getString(id+"userOnline");
+  //   // List<dynamic>setUserList = userStr.map((item)=>jsonDecode(item)).toList();
+  //   if(userStr!=null&&userStr!=""){
+  //     List<dynamic>setUserList = jsonDecode(userStr);
+  //     FastNotification.push("set_user",setUserList);
+  //     // LogUtil.d(prefs.getString(id+"userOnline"));
+  //     print(33333);
+  //   }
     
-  }
+  // }
 
   randomInt(int min, int max) {
     return new Random().nextInt(max) % (max - min + 1) + min;
@@ -141,7 +168,16 @@ class WebSocketProvide with ChangeNotifier{
       //正常消息
       // historyMessageString.add(data.toString());
       // setStringEvent(roomId,historyMessageString);
-      List<String>strChat = prefs.getStringList(obj["sessionid"]);
+      // print(JsonEncoder().convert(prefs.getStringList(obj["sessionid"])));
+      print(123);
+      List<String>strChat;
+      // ignore: unrelated_type_equality_checks
+      if(prefs.getStringList(obj["sessionid"]) != ""){
+        strChat = prefs.getStringList(obj["sessionid"]);
+      }else {
+        strChat = [];
+      }
+      
       print(JsonEncoder().convert(data));
       print("JsonEncoder().convert(data)---------------------");
       strChat.add(data);
@@ -170,20 +206,29 @@ class WebSocketProvide with ChangeNotifier{
         // if(prefs.getString(key+"userOnline") != null){
         //   strUserOnline = prefs.getString(key+"userOnline");
         // }
+        print(jsonEncode(value));
+        print("--------------------------------------///123456");
+        // value.forEach((key,item){
+        //   if(value[key]["msgList"].length>0){
+        //     // str.add(JsonEncoder().convert(item["msgList"]));
+        //     item["msgList"].forEach((ii){
+        //       str.add(JsonEncoder().convert(ii));
+        //     });
+        //     // str.add(item["msgList"].toString());
+        //   }
+        //   // if(item["flag"]){
+        //   //   strUserOnline.add(item.toString());
+        //   // }
+          
+        // });
         
-        value.forEach((item){
-          if(item["msgList"].length>0){
+        if(value["msgList"].length>0){
             // str.add(JsonEncoder().convert(item["msgList"]));
-            item["msgList"].forEach((ii){
+            value["msgList"].forEach((ii){
               str.add(JsonEncoder().convert(ii));
             });
             // str.add(item["msgList"].toString());
           }
-          // if(item["flag"]){
-          //   strUserOnline.add(item.toString());
-          // }
-          
-        });
         // strUserOnline = value.toString();
         strUserOnline = JsonEncoder().convert(value);
         
@@ -191,62 +236,24 @@ class WebSocketProvide with ChangeNotifier{
         setOnlineUserEvent(key+"userOnline",strUserOnline);
       });
       LogUtil.d(msgObj);
-      print("456456111------------------------");
+      // print("456456111------------------------");
       // msgList.forEach((item){
       //   historyMessageString.add(jsonEncode(item));
       // });
       // setStringEvent();
-    }else if(obj["cmd"] =="SYSTEM"){
-      //系统消息
-       List<dynamic>userList = jsonDecode(obj["msg"]);
-      //  List<String>userListStr = [];
-      //  userList.forEach((item){
-      //    print(item);
-      //    userListStr.add(item.toString());
-      //  });
-       
-      // List<dynamic>userList = jsonDecode(obj["msg"]).map((t)=>jsonDecode(t)).toList();
-      String setUserListStr;
-      List<dynamic>setUserList=[];
-      LogUtil.d(userList);
-      // prefs.setString(userList[0]["sessionId"].toString()+"userOnline",obj["msg"]);
-      FlutterStars.SpUtil.putString(userList[0]["sessionId"].toString()+"userOnline",obj["msg"]);
-      // userList.forEach((item){
-      //   // LogUtil.d(item.avatarUrl);
-      //   // LogUtil.d(item["avatarUrl"]);
-      //   // var params = {
-      //   //   "avatarUrl":item["avatarUrl"],
-      //   //   "name":item["name"],
-      //   //   "flag":item["flag"],
-      //   // };
-      //   // setUserList.add(params);
-      //   List<String>str = 
-      //   List<dynamic>strObj = str.map((t)=>jsonDecode(t)).toList();
-      //   List<dynamic>lastObj = [];
-        
-        
-
-
-      //   strObj.forEach((val){
-      //     if(item["userId"] == val["userId"]){
-      //       lastObj.addAll(item);
-      //     }else {
-      //       lastObj.addAll(val);
-      //     }
-          
-      //   });
-        
-      // });
-      if(userList[0]["sessionId"].toString()==roomId){
-        // setUserListStr = prefs.getString(userList[0]["sessionId"].toString()+"userOnline");
-        setUserListStr = FlutterStars.SpUtil.getString(userList[0]["sessionId"].toString()+"userOnline");
-        print(JsonEncoder().convert(setUserListStr));
-        print(56566666);
-        setUserList = jsonDecode(setUserListStr);
-        print(JsonEncoder().convert(setUserList));
-        print(roomId);
-        print("roomId/////////////20200612150634081101746");
-        FastNotification.push("set_user",setUserList);  //触发通知
+    }else if (obj["cmd"] =="INITROOM"){
+      List<dynamic>msgListInitRoom = jsonDecode(obj["msg"]);
+      if(msgListInitRoom != null && msgListInitRoom != []){
+        List<String>strList = [];
+        msgListInitRoom.forEach((item){
+          strList.add(JsonEncoder().convert(item));
+        });
+        setStringEvent(obj["sessionid"],strList);
+        print(JsonEncoder().convert(msgListInitRoom));
+        print(prefs.getStringList(obj["sessionid"]));
+        print("JsonEncoder().convert(INITROOM)---------------------");
+        historyMessageqqq = msgListInitRoom;
+        FastNotification.push("chat_room",historyMessageqqq);
       }
       
     }
@@ -297,8 +304,8 @@ class WebSocketProvide with ChangeNotifier{
     return;
   }
   roomId = id;
-  print(JsonEncoder().convert(roomId));
-  print(555);
+  // print(JsonEncoder().convert(roomId));
+  // print(555);
     var objs = {
       "cmd":"CHAT",
       "type":msgType,
@@ -315,32 +322,47 @@ class WebSocketProvide with ChangeNotifier{
     channel.sink.add(text);
   }
 
+  void initLoop(){//定时10秒发送
+  
+  
+    print("LOOP");
+    var objs = {
+      "cmd":"LOOP"
+    };
+    
+    String text = json.encode(objs).toString();
+    // print(text);
+    // print(777);
+    channel.sink.add(text);
+  }
+
   void incomeRoom(id){//进入房间
   roomId = id;
-  getOnlineUserEvent(roomId);
-  print(JsonEncoder().convert(roomId));
-  print(555);
+  // getOnlineUserEvent(roomId);
+  // print(JsonEncoder().convert(roomId));
+  // print(555);
     var objs = {
       "cmd":"INITROOM",
       "type":1,
       "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":roomId,
-      "msg":"我首次进入房间"
+      "msg":"进入房间"
     };
     
     String text = json.encode(objs).toString();
-    print(text);
-    print(777);
+    // print(text);
+    // print(777);
     channel.sink.add(text);
   }
   void loginAllSeconds(id){//临时重新初始化房间
   roomId = id;
-  getOnlineUserEvent(roomId);
-  print(JsonEncoder().convert(roomId));
-  print(555);
+  // getOnlineUserEvent(roomId);
+  // print(JsonEncoder().convert(roomId));
+  // print(555);
     var objs = {
       "cmd":"LOGINALL",
       "type":1,
@@ -353,13 +375,13 @@ class WebSocketProvide with ChangeNotifier{
     };
     
     String text = json.encode(objs).toString();
-    print(text);
-    print(778);
+    // print(text);
+    // print(778);
     channel.sink.add(text);
   }
   void incomeFriend(id){//进入朋友房间
   roomId = id;
-  getOnlineUserEvent(roomId);
+  // getOnlineUserEvent(roomId);
   
   }
 
@@ -370,6 +392,7 @@ class WebSocketProvide with ChangeNotifier{
   void onDone() {
     print('websocket断开了');
     toasts("聊天室连接已断开！");
+    cancelTimer();
     socketIsConnect = false;
     isSend = false;
     // closeWebSocket();

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

@@ -184,7 +184,7 @@ class OrderDetailState extends State<OrderDetail>
   Widget build(BuildContext context) {
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);

lib/internal/wode/page/order_master/order_detail.dart

@@ -138,7 +138,7 @@ class OrderDetailMasterState extends State<OrderDetailMaster>
   Widget build(BuildContext context) {
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);

lib/internal/wode/page/order_master/punchin.dart

@@ -256,7 +256,7 @@ class PunchinState extends State<Punchin> {
   Widget build(BuildContext context) {
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);

lib/internal/wode/page/personal_page.dart

@@ -67,7 +67,9 @@ class PersonalPageState extends State<PersonalPage>
 
   void setUser(UserInfoEntity user) {
     print(user);
-    provider.setUser(user);
+    provider.setUser(user); 
+    FlutterStars.SpUtil.putString('username', user.userName);
+    FlutterStars.SpUtil.putString('avatarUrl', user.avatarUrl);
   }
 
   ///选择图片

lib/internal/wode/page/setting_page.dart

@@ -405,7 +405,9 @@ class SettingPageState extends State<SettingPage>{
                           showAlert(context, "提示", "是否确定退出？", "确定", () {
                             User().clearUser();
                             FlutterStars.SpUtil.putBool('isInitLink', false);
+                            Provider.of<WebSocketProvide>(context,listen: false).cancelTimer();
                             Provider.of<WebSocketProvide>(context,listen: false).closeWebSocket();
+                            
                             // removeSocket();
                             _push.unbindAccount(account: f.SpUtil.getString(Constant.phone));
                             NavigatorUtils.push(context, AccountRouter.loginPage, clearStack: true);

lib/internal/wode/page/video/video_detail.dart

@@ -82,7 +82,7 @@ class VideoDetailState extends State<VideoDetail> {
   Widget build(BuildContext context) {
     double width = MediaQuery.of(context).size.width;
     double height = MediaQuery.of(context).size.height;
-    if(width < height){
+    if(width > height){
       // SystemChrome.setPreferredOrientations([
       //   DeviceOrientation.portraitUp,
       // ]);