调试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.m in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5F24EA72900024EB54 /* ViewController.m */; };
+		A9661B6124EA72900024EB54 /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9661B5F24EA72900024EB54 /* ViewController.mm */; };
 		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 */; };
@@ -203,6 +203,8 @@
 		A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F324EA83C90024EB54 /* libsqlite3.tbd */; };
 		A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; };
 		A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; };
+		A9662CE724ED29D00024EB54 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9662CE524ED29C90024EB54 /* oimcore.framework */; };
+		A9662CE824ED29D00024EB54 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9662CE524ED29C90024EB54 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; };
 /* End PBXBuildFile section */
 
@@ -213,6 +215,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				A9662CE824ED29D00024EB54 /* oimcore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -230,7 +233,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.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		A9661B5F24EA72900024EB54 /* ViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ViewController.mm; 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>"; };
@@ -631,6 +634,7 @@
 		A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnIMSDKiOS.h; sourceTree = "<group>"; };
 		A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSDKiOS.m; sourceTree = "<group>"; };
 		A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OffcnIMSDKiOS.entitlements; sourceTree = "<group>"; };
+		A9662CE524ED29C90024EB54 /* 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 */
 
@@ -643,6 +647,7 @@
 				A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */,
 				A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */,
 				A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */,
+				A9662CE724ED29D00024EB54 /* oimcore.framework in Frameworks */,
 				A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */,
 				B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */,
 			);
@@ -682,13 +687,14 @@
 			isa = PBXGroup;
 			children = (
 				A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */,
+				A9662CE524ED29C90024EB54 /* oimcore.framework */,
 				A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */,
 				A9661FC824EA7AD10024EB54 /* Common-(宏) */,
 				A9661F8124EA7AD10024EB54 /* Tools-(工具) */,
 				A9661B5C24EA72900024EB54 /* AppDelegate.h */,
 				A9661B5E24EA72900024EB54 /* AppDelegate.m */,
 				A9661B5D24EA72900024EB54 /* ViewController.h */,
-				A9661B5F24EA72900024EB54 /* ViewController.m */,
+				A9661B5F24EA72900024EB54 /* ViewController.mm */,
 				A9661B6224EA729A0024EB54 /* Main.storyboard */,
 				A9661B4F24EA64F20024EB54 /* Assets.xcassets */,
 				A9661B5124EA64F20024EB54 /* LaunchScreen.storyboard */,
@@ -1602,7 +1608,7 @@
 				A966217924EA80A60024EB54 /* UIImage+ZYJGIF.m in Sources */,
 				A9661FCE24EA7AD10024EB54 /* SDTool.m in Sources */,
 				A966218B24EA80A60024EB54 /* UIView+ZYJMJExtension.m in Sources */,
-				A9661B6124EA72900024EB54 /* ViewController.m in Sources */,
+				A9661B6124EA72900024EB54 /* ViewController.mm in Sources */,
 				A9661FDC24EA7AD10024EB54 /* UIView+bezierShape.m in Sources */,
 				A966215224EA80A60024EB54 /* ZYJZYJFMDatabase.m in Sources */,
 				A966217E24EA80A60024EB54 /* UIImage+ZYJMultiFormat.m in Sources */,

OffcnIMSDKiOS/ViewController.m → OffcnIMSDKiOS/ViewController.mm

@@ -9,9 +9,9 @@
 #import "ViewController.h"
 #import "OffcnIMSDKiOS.h"
 #import "OffcnNetworkExecutor.h"
-//#import <oimcore/oimcoreAdapter.h>
+#import <oimcore/oimcoreAdapter.h>
 
-@interface ViewController ()<UITextFieldDelegate>
+@interface ViewController ()<OIMCoreDelegate>
 
 @property (weak, nonatomic) IBOutlet UIButton *changeEnvironmentBtn;
 
@@ -20,6 +20,8 @@
 @property (strong, nonatomic) NSString *toId;
 @property (assign, nonatomic) OffcnSDKMsgType msg_type;
 @property (strong, nonatomic) NSMutableDictionary *dataDic;
+
+@property (strong, nonatomic) OIMCoreAdapter *adapter;
 @end
 
 @implementation ViewController
@@ -39,8 +41,28 @@
     [self.view endEditing:YES];
 }
 - (IBAction)connectAction:(UIButton *)sender {
+    NSString *param = @"{\"server_ip\":\"39.102.42.185\", \"server_port\":6000, \"user_id\":\"ce0819db8391f1e7258a71cc9e2c3235\",\"app_id\":\"offcn_live\", \"device_type\":\"android\", \"token\":\"fadbce3f4929b6bdee0617fee34e32ae\"}";
+    self.adapter = [OIMCoreAdapter sharedOIMCore];
+    self.adapter.delegate = self;
+    [self.adapter ConnectImServerWithParam:param];
+}
+-(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len{
+    
+}
+
+-(void)OnOImCoreEventWithCode:(int)code context:(const char *)context{
     
 }
+
+- (IBAction)disconnectAction:(UIButton *)sender {
+    [self.adapter DisConnectImServer];
+}
+- (IBAction)sendMegAction:(UIButton *)sender {
+    NSString *meg = @"qwe";
+    [self.adapter SendUserMessage:meg length:(int)meg.length type:kMsg_Type_Normal];
+}
+
+//发送本地通知
 - (IBAction)sendLocalNotiAction:(UIButton *)sender {
     
 }

OffcnIMSDKiOS/oimcore.framework/Headers/oim_types.h

+#ifndef __OFFCN_IM__TYPES_H__
+#define __OFFCN_IM__TYPES_H__
+
+#include <stdio.h>
+
+#ifdef _WIN32
+#define ZG_OIM_API_EXPORT __declspec(dllexport)
+#define ZG_OIM_API_IMPORT __declspec(dllimport)
+#else
+#define ZG_OIM_API_EXPORT __attribute__ ((visibility("default")))
+#define ZG_OIM_API_IMPORT 
+#endif
+
+#ifdef __cplusplus
+#define ZG_OIM_C_API_EXPORT extern "C" ZG_OIM_API_EXPORT
+#define ZG_OIM_C_API_IMPORT extern "C" ZG_OIM_API_IMPORT
+#else
+#define ZG_OIM_C_API_EXPORT ZG_OIM_API_EXPORT
+#define ZG_OIM_C_API_IMPORT ZG_OIM_API_IMPORT
+#endif
+
+#ifdef ZG_OIM_SDK_EXPORTS		//need define this micro,when build dll, undefine this micro when use this dll
+#define ZG_OIM_C_API ZG_OIM_C_API_EXPORT
+#else
+#define ZG_OIM_C_API ZG_OIM_C_API_IMPORT
+#endif
+
+namespace offcn
+{
+namespace im
+{
+	typedef enum
+	{
+		kMsg_Type_Normal,	//正常的聊天消息
+		kMsg_Type_Recv_Confirm,	//收到服务端发来的消息确认消息
+	}OImMsgType;
+
+	typedef enum
+	{
+		Z_CONN_IM_SRV_OK,
+		Z_CONN_IM_SRV_FAILED,
+		
+		Z_CONN_IM_SRV_BROKEN,
+		
+		Z_DISCONN_IM_SRV_OK,
+		
+	}OImEventCode;
+
+	class OImCoreObserver
+	{
+	public:
+		virtual void OnOImCoreEvent(int code, const char *context) = 0;
+		virtual void OnOImCoreMessage(const char *message, int len) = 0;
+	};
+}	
+}
+
+#endif

OffcnIMSDKiOS/oimcore.framework/Headers/oimcoreAdapter.h

+//
+//  OIMCore.h
+//
+//  Created by zxl on 2020/8/7.
+//  Copyright © 2020 zxl. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "oim_types.h"
+
+@protocol OIMCoreDelegate <NSObject>
+-(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len;
+-(void)OnOImCoreEventWithCode:(int)code context:(const char *_Nonnull)context;
+@end
+
+typedef NS_ENUM(NSInteger, OImMsgType) {
+    kMsg_Type_Normal,          //正常的聊天消息
+    kMsg_Type_Recv_Confirm,    //收到服务端发来的消息确认消息
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OIMCoreAdapter : NSObject
+@property(nonatomic, weak) id<OIMCoreDelegate> delegate;
+
++ (instancetype)sharedOIMCore;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+- (id)copy NS_UNAVAILABLE;
+- (id)mutableCopy NS_UNAVAILABLE;
+
+/**
+ *    连接服务器
+ *
+ *    @param     param                must contain server'ip and port in json format eg:{"server_ip": "xxxx", "server_port": 123}
+ */
+-(void)ConnectImServerWithParam:(NSString*)param;
+
+/**
+ *    与服务器断开连接
+ */
+-(void)DisConnectImServer;
+
+/**
+ * 发送消息
+ *
+ *    @param    message        message data, size less than 256 BYTES
+ *    @param    type        message's type
+ */
+-(void)SendUserMessage:(NSString*)message length:(int)len type:(OImMsgType)type;
+@end
+
+
+NS_ASSUME_NONNULL_END

Podfile

@@ -25,4 +25,6 @@ target 'OffcnIMSDKiOS' do
 #pod 'Sentry'
 
 #pod 'FLEX', :configurations => ['Debug']
+
+pod "Qiniu", "~> 7.4"
 end