fixed

xinjiayu · Dec 5, 2020 · f40d491 · f40d491
1 parent 56f97c2
commit f40d491
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/client/ios/Coffchat/Coffchat/CIMSdk/IMLoginManager.swift b/client/ios/Coffchat/Coffchat/CIMSdk/IMLoginManager.swift
@@ -159,11 +159,11 @@ extension IMLoginManager {
 
     func onDisconnect(_ err: Error?) {
         // 只通知1次
-        // if isLogin || loginStep == .Linking {
-        _onUpdateLoginStep(step: .LoseConnection)
-        // } else {
-        //    loginStep = .LoseConnection
-        // }
+        if isLogin || loginStep == .Linking {
+            _onUpdateLoginStep(step: .LoseConnection)
+        } else {
+            loginStep = .LoseConnection
+        }
         isLogin = false
     }
 
@@ -226,6 +226,7 @@ extension IMLoginManager {
                 }
             } else {
                 // 更新登录进度
+                client.disconnect()
                 _onUpdateLoginStep(step: .LoginFailed)
             }
 

diff --git a/client/ios/Coffchat/Coffchat/UI/Chat/Views/IMConversationSettingsViewController.swift b/client/ios/Coffchat/Coffchat/UI/Chat/Views/IMConversationSettingsViewController.swift
@@ -50,6 +50,7 @@ class IMConversationSettingsViewController: UIViewController, UITableViewDelegat
         settingTabView.estimatedRowHeight = 0
         settingTabView.estimatedSectionHeaderHeight = 0
         settingTabView.estimatedSectionFooterHeight = 0
+        // 头视图显示UICollectionView
         settingTabView.tableHeaderView = collectionView
 
         title = "会话详情"

diff --git a/client/ios/Coffchat/Coffchat/UI/Login/LoginViewController.xib b/client/ios/Coffchat/Coffchat/UI/Login/LoginViewController.xib
@@ -49,7 +49,7 @@
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="10.0.107.244" borderStyle="roundedRect" placeholder="Server" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Sdp-rg-Lxg">
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="192.168.1.3" borderStyle="roundedRect" placeholder="Server" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Sdp-rg-Lxg">
                             <rect key="frame" x="0.0" y="165" width="200" height="34"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="200" id="Tnh-H3-mrP"/>

diff --git a/server/src/internal/gate/tcpserver/conn_tcp.go b/server/src/internal/gate/tcpserver/conn_tcp.go
@@ -98,6 +98,8 @@ func (tcp *TcpConn) OnClose() {
 	}
 
 	tcp.isLogin = false
+
+	logger.Sugar.Info("connection be closed,address=", tcp.Conn.RemoteAddr().String())
 }
 
 //OnRead implements the CImConn OnRead method.
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,8 @@ func (tcp *TcpConn) OnClose() { @@
     	}
     	tcp.isLogin = false
+    	logger.Sugar.Info("connection be closed,address=", tcp.Conn.RemoteAddr().String())
     }
     //OnRead implements the CImConn OnRead method.
@@ Expand Down @@