oimcore

OffcnIMSDKiOS.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		A9661B5324EA64F20024EB54 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9661B5124EA64F20024EB54 /* LaunchScreen.storyboard */; };
 		A9661B5624EA64F20024EB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5524EA64F20024EB54 /* main.m */; };
 		A9661B6024EA72900024EB54 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5E24EA72900024EB54 /* AppDelegate.m */; };
-		A9661B6124EA72900024EB54 /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5F24EA72900024EB54 /* ViewController.mm */; };
+		A9661B6124EA72900024EB54 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5F24EA72900024EB54 /* ViewController.m */; };
 		A9661B6424EA729A0024EB54 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9661B6224EA729A0024EB54 /* Main.storyboard */; };
 		A9661FCD24EA7AD10024EB54 /* CJLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661F8324EA7AD10024EB54 /* CJLoadingView.m */; };
 		A9661FCE24EA7AD10024EB54 /* SDTool.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661F8424EA7AD10024EB54 /* SDTool.m */; };
@@ -204,7 +204,7 @@
 		A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; };
 		A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; };
 		A9D1B31824EFAD8C000F4662 /* OffcnUploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */; };
-		A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */; };
+		A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.mm */; };
 		A9D1B32224F50973000F4662 /* OffcnIMModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32124F50973000F4662 /* OffcnIMModel.m */; };
 		A9D1B32E24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */; };
 		A9D1B33E24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B33D24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m */; };
@@ -270,8 +270,8 @@
 		A9D1B64124FE765F000F4662 /* ZYJQNIP.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B5FC24FE765F000F4662 /* ZYJQNIP.m */; };
 		A9D1B64224FE765F000F4662 /* ZYJQNSystemTool.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B60224FE765F000F4662 /* ZYJQNSystemTool.m */; };
 		A9D1B64524FE7D1F000F4662 /* AppDelegate+OffcnIMPush.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B64424FE7D1F000F4662 /* AppDelegate+OffcnIMPush.m */; };
-		A9D1BB942507833B000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1BB9225078333000F4662 /* oimcore.framework */; };
-		A9D1BB952507833B000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1BB9225078333000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		A9D1C641250F1246000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1C63F250F123D000F4662 /* oimcore.framework */; };
+		A9D1C642250F1246000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1C63F250F123D000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; };
 /* End PBXBuildFile section */
 
@@ -282,7 +282,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				A9D1BB952507833B000F4662 /* oimcore.framework in Embed Frameworks */,
+				A9D1C642250F1246000F4662 /* oimcore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -300,7 +300,7 @@
 		A9661B5C24EA72900024EB54 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		A9661B5D24EA72900024EB54 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		A9661B5E24EA72900024EB54 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		A9661B5F24EA72900024EB54 /* ViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ViewController.mm; sourceTree = "<group>"; };
+		A9661B5F24EA72900024EB54 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		A9661B6324EA729A0024EB54 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		A9661F8324EA7AD10024EB54 /* CJLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJLoadingView.m; sourceTree = "<group>"; };
 		A9661F8424EA7AD10024EB54 /* SDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDTool.m; sourceTree = "<group>"; };
@@ -704,7 +704,7 @@
 		A9D1B31624EFAD8C000F4662 /* OffcnUploadManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnUploadManager.h; sourceTree = "<group>"; };
 		A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnUploadManager.m; sourceTree = "<group>"; };
 		A9D1B31924F34C25000F4662 /* OffcnIMSocketManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnIMSocketManager.h; sourceTree = "<group>"; };
-		A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSocketManager.m; sourceTree = "<group>"; };
+		A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OffcnIMSocketManager.mm; sourceTree = "<group>"; };
 		A9D1B32024F50973000F4662 /* OffcnIMModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnIMModel.h; sourceTree = "<group>"; };
 		A9D1B32124F50973000F4662 /* OffcnIMModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnIMModel.m; sourceTree = "<group>"; };
 		A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnZYJTestDataStorageView.m; sourceTree = "<group>"; };
@@ -844,7 +844,7 @@
 		A9D1B60524FE765F000F4662 /* ZYJQNUploadInfoReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZYJQNUploadInfoReporter.h; sourceTree = "<group>"; };
 		A9D1B64324FE7D1F000F4662 /* AppDelegate+OffcnIMPush.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+OffcnIMPush.h"; sourceTree = "<group>"; };
 		A9D1B64424FE7D1F000F4662 /* AppDelegate+OffcnIMPush.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+OffcnIMPush.m"; sourceTree = "<group>"; };
-		A9D1BB9225078333000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
+		A9D1C63F250F123D000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
 		D7DCDED1DEE7F99F223D5C73 /* Pods-OffcnIMSDKiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OffcnIMSDKiOS.release.xcconfig"; path = "Target Support Files/Pods-OffcnIMSDKiOS/Pods-OffcnIMSDKiOS.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -857,7 +857,7 @@
 				A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */,
 				A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */,
 				A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */,
-				A9D1BB942507833B000F4662 /* oimcore.framework in Frameworks */,
+				A9D1C641250F1246000F4662 /* oimcore.framework in Frameworks */,
 				A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */,
 				B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */,
 			);
@@ -896,7 +896,7 @@
 		A9661B4224EA64EE0024EB54 /* OffcnIMSDKiOS */ = {
 			isa = PBXGroup;
 			children = (
-				A9D1BB9225078333000F4662 /* oimcore.framework */,
+				A9D1C63F250F123D000F4662 /* oimcore.framework */,
 				A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */,
 				A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */,
 				A9661FC824EA7AD10024EB54 /* Common-(宏) */,
@@ -904,7 +904,7 @@
 				A9661B5C24EA72900024EB54 /* AppDelegate.h */,
 				A9661B5E24EA72900024EB54 /* AppDelegate.m */,
 				A9661B5D24EA72900024EB54 /* ViewController.h */,
-				A9661B5F24EA72900024EB54 /* ViewController.mm */,
+				A9661B5F24EA72900024EB54 /* ViewController.m */,
 				A9D1B33C24FE3BE6000F4662 /* OffcnIMSqliteTestVC.h */,
 				A9D1B33D24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m */,
 				A9D1B32D24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.h */,
@@ -1649,7 +1649,7 @@
 				A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */,
 				A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */,
 				A9D1B31924F34C25000F4662 /* OffcnIMSocketManager.h */,
-				A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */,
+				A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.mm */,
 				A9D1B32024F50973000F4662 /* OffcnIMModel.h */,
 				A9D1B32124F50973000F4662 /* OffcnIMModel.m */,
 				A9661FEE24EA80A50024EB54 /* OffcnIMZYJFMDBHandler.h */,
@@ -1996,7 +1996,7 @@
 				A9D1B61B24FE765F000F4662 /* ZYJQNInetAddress.m in Sources */,
 				A966218B24EA80A60024EB54 /* UIView+ZYJMJExtension.m in Sources */,
 				A9D1B32224F50973000F4662 /* OffcnIMModel.m in Sources */,
-				A9661B6124EA72900024EB54 /* ViewController.mm in Sources */,
+				A9661B6124EA72900024EB54 /* ViewController.m in Sources */,
 				A9D1B63424FE765F000F4662 /* ZYJQNALAssetFile.m in Sources */,
 				A9661FDC24EA7AD10024EB54 /* UIView+bezierShape.m in Sources */,
 				A966215224EA80A60024EB54 /* ZYJZYJFMDatabase.m in Sources */,
@@ -2062,7 +2062,7 @@
 				A966215424EA80A60024EB54 /* ZYJZYJFMResultSet.m in Sources */,
 				A966219D24EA80A60024EB54 /* NSMutableDictionary+ZYJOSS.m in Sources */,
 				A9D1B60F24FE765F000F4662 /* NSURLRequest+ZYJQNRequest.m in Sources */,
-				A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.m in Sources */,
+				A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.mm in Sources */,
 				A96621A424EA80A60024EB54 /* ZYJOSSNetworkingRequestDelegate.m in Sources */,
 				A966216E24EA80A60024EB54 /* ZYJReachStateUnloaded.m in Sources */,
 				A966218624EA80A60024EB54 /* NSData+ZYJImageContentType.m in Sources */,
@@ -2321,6 +2321,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/OffcnIMSDKiOS",
 				);
+				GCC_INPUT_FILETYPE = automatic;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/OffcnIMSDKiOS",
@@ -2357,6 +2358,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/OffcnIMSDKiOS",
 				);
+				GCC_INPUT_FILETYPE = automatic;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/OffcnIMSDKiOS",

OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSocketManager.h

-//
+//
@@ -12,10 +12,11 @@
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSUInteger, OffcnIMConnectStatus) {
-    OffcnIMConnectStatusSuccess,    //连接成功
+    OffcnIMConnectStatusSuccess,        //连接成功
     OffcnIMConnectStatusFail,           //连接失败
     OffcnIMConnectStatusBreak,          //连接断开
     OffcnIMConnectStatusDisConnectOK,   //手动断开成功
+    OffcnIMConnectStatusKickout,        //互挤
 };
 
 //收到消息回调

OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSocketManager.m → OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSocketManager.mm

-//
+//
@@ -165,30 +165,41 @@ static OffcnIMSocketManager *socketManager;
     }
 }
 
-//Z_CONN_IM_SRV_OK,连接成功
-//Z_CONN_IM_SRV_FAILED,连接失败
-//Z_CONN_IM_SRV_BROKEN,连接断开
-//Z_DISCONN_IM_SRV_OK,手动断开成功
--(void)OnOImCoreEventWithCode:(int)code context:(const char *)context{
+//typedef enum
+//{
+//    Z_CONN_IM_SRV_OK,
+//    Z_CONN_IM_SRV_FAILED,
+//
+//    Z_CONN_IM_SRV_BROKEN,
+//
+//    Z_DISCONN_IM_SRV_OK,
+//
+//    Z_CONN_IM_KICK_OUT,    //±ªÃfl ≤ª–Ë“™÷ÿ¡¨
+//
+//}OImEventCode;
+-(void)OnOImCoreEventWithCode:(OImEventCode)code context:(const char *_Nonnull)context{
     //连接状态
-    if (code == 1 || code == 2) {
+    if (code == Z_CONN_IM_SRV_FAILED || code == Z_CONN_IM_SRV_BROKEN || code == Z_CONN_IM_KICK_OUT) {
         [self.adapter DisConnectImServer];
     }
     
     if (self.connectStatus) {
         NSString *message = [NSString stringWithUTF8String:context];
-        if (code == 0) {
+        if (code == Z_CONN_IM_SRV_OK) {
             self.IMConnectStatus = OffcnIMConnectStatusSuccess;
             self.connectStatus(OffcnIMConnectStatusSuccess,message);
-        }else if (code == 1){
+        }else if (code == Z_CONN_IM_SRV_FAILED){
             self.IMConnectStatus = OffcnIMConnectStatusFail;
             self.connectStatus(OffcnIMConnectStatusFail,message);
-        }else if (code == 2){
+        }else if (code == Z_CONN_IM_SRV_BROKEN){
             self.IMConnectStatus = OffcnIMConnectStatusBreak;
             self.connectStatus(OffcnIMConnectStatusBreak,message);
-        }else if (code == 3){
+        }else if (code == Z_DISCONN_IM_SRV_OK){
             self.IMConnectStatus = OffcnIMConnectStatusDisConnectOK;
             self.connectStatus(OffcnIMConnectStatusDisConnectOK,message);
+        }else if (code == Z_CONN_IM_KICK_OUT){
+            self.IMConnectStatus = OffcnIMConnectStatusKickout;
+            self.connectStatus(OffcnIMConnectStatusKickout,message);
         }
     }
 }

OffcnIMSDKiOS/ViewController.mm → OffcnIMSDKiOS/ViewController.m

@@ -108,6 +108,8 @@
             errorMessage = @"连接失败，请重新连接";
         }else if (status == OffcnIMConnectStatusBreak){
             errorMessage = @"连接断开，请重新连接";
+        }else if (status == OffcnIMConnectStatusKickout){
+            errorMessage = @"被挤掉";
         }
         [weakSelf tipMessageWithTitle:@"收到连接状态" message:errorMessage];
     };

OffcnIMSDKiOS/oimcore.framework/Headers/oim_types.h

@@ -43,13 +43,15 @@ namespace im
 		Z_CONN_IM_SRV_BROKEN,
 		
 		Z_DISCONN_IM_SRV_OK,
+
+		Z_CONN_IM_KICK_OUT,	//被踢 不需要重连
 		
 	}OImEventCode;
 
 	class OImCoreObserver
 	{
 	public:
-		virtual void OnOImCoreEvent(int code, const char *context) = 0;
+		virtual void OnOImCoreEvent(OImEventCode code, const char *context) = 0;
 		virtual void OnOImCoreMessage(const char *message, int len) = 0;
 	};
 }	

OffcnIMSDKiOS/oimcore.framework/Headers/oimcoreAdapter.h

@@ -7,16 +7,15 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "oim_types.h"
+
+using namespace offcn::im;
 
 @protocol OIMCoreDelegate <NSObject>
 -(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len;
--(void)OnOImCoreEventWithCode:(int)code context:(const char *_Nonnull)context;
+-(void)OnOImCoreEventWithCode:(OImEventCode)code context:(const char *_Nonnull)context;
 @end
 
-typedef NS_ENUM(NSInteger, OImMsgType) {
-    kMsg_Type_Normal,          //正常的聊天消息
-    kMsg_Type_Recv_Confirm,    //收到服务端发来的消息确认消息
-};
 
 NS_ASSUME_NONNULL_BEGIN