Commit 6b092d8e by zhangyunjie

1.1.0.0

parent 5c7a3514
......@@ -220,6 +220,7 @@
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
F37992DE11E2CA65AC380198 /* [CP] Embed Pods Frameworks */,
CEFE0C75DED1495329683945 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -355,6 +356,28 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
CEFE0C75DED1495329683945 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OffcnIMSDKiOS_Example/Pods-OffcnIMSDKiOS_Example-resources.sh",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/OffcnIMSDKiOSIcon.bundle",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJExpressionKeyboard.bundle",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Resources/ZYJTZImagePickerController.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/OffcnIMSDKiOSIcon.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJExpressionKeyboard.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZYJTZImagePickerController.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OffcnIMSDKiOS_Example/Pods-OffcnIMSDKiOS_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F37992DE11E2CA65AC380198 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
......@@ -362,13 +385,17 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OffcnIMSDKiOS_Example/Pods-OffcnIMSDKiOS_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework",
"${BUILT_PRODUCTS_DIR}/LMJDropdownMenu/LMJDropdownMenu.framework",
"${PODS_ROOT}/../../OffcnIMSDKiOS/Frameworks/oimcore.framework",
"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LMJDropdownMenu.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/oimcore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
......
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'OffcnIMSDKiOS'
s.version = '1.0.0.23'
s.version = '1.1.0.0'
s.summary = 'OffcnIMSDKiOS.'
s.description = <<-DESC
......@@ -37,10 +37,12 @@ TODO: Add long description of the pod here.
#libraries: 该pod依赖的系统library
s.libraries = 'c++','sqlite3','xml2','resolv'
# s.resource = 'OffcnIMSDKiOS/Resources/*.bundle'
s.resource = 'OffcnIMSDKiOS/Resources/*.bundle'
s.user_target_xcconfig = {'OTHER_LDFLAGS' => '-ObjC'}
#dependency : 该pod依赖的pod
#dependency : 该pod依赖的
s.dependency 'YYKit', '1.0.9'
s.dependency 'IQKeyboardManager', '5.0.8'
end
//
// OffcnIMChatInfoViewController.h
// classonline
//
// Created by HX on 2020/10/14.
// Copyright © 2020 offcn. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "OffcnIMModel.h"
NS_ASSUME_NONNULL_BEGIN
//自己发送消息通知
#define kSendMsgNotification @"kSendMsgNotification"
#define kResultKey @"kResultKey"
#define kObjcKey @"kObjcKey"
//页面显示消失
#define kPageShowNotification @"kPageShowNotification"
@class OffcnIMContactInfoModel;
@interface OffcnIMChatInfoViewController : UIViewController
//联系人model
@property (nonatomic, strong) OffcnIMUserList_listModel *contactInfoModel;
//滑动到底部
- (void)scrollTableToFoot:(BOOL)animated;
@end
NS_ASSUME_NONNULL_END
//
// OffcnIMChatListViewController.h
// classonline
//
// Created by HX on 2020/10/14.
// Copyright © 2020 offcn. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "OffcnIMModel.h"
NS_ASSUME_NONNULL_BEGIN
//消息总数回调
typedef void(^OffcnIMTotal_unread_number)(NSInteger num);
@interface OffcnIMChatListViewController : UIViewController
@property (nonatomic, assign) BOOL isNeedSearch;//是否需要搜索功能
@property (nonatomic, assign) BOOL isNeedFitTabBarHeight;//是否需要适配TabBar的高度
@property (nonatomic, assign) BOOL isShowNoWifiTip;//显示没网提示
//联系人列表---(key:user_id,value:OffcnIMUserList_listModel)
@property (nonatomic, strong) NSMutableDictionary<NSString *,OffcnIMUserList_listModel *> *addressListDic;
@property (nonatomic, copy) OffcnIMTotal_unread_number total_unread_number;//消息总数回调
//清空数据
-(void)clearData;
@end
NS_ASSUME_NONNULL_END
......@@ -158,5 +158,27 @@ NS_ASSUME_NONNULL_BEGIN
@end
@class OffcnIMUserList_list_classesModel;
@interface OffcnIMUserList_listModel : NSObject
@property (nonatomic, assign) NSInteger cell_type;//1:群发消息,2:单发消息
@property (nonatomic, copy) NSString *key;
@property (nonatomic, copy) NSString *avatar;
@property (nonatomic, copy) NSString *avatar_color;
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *remark;
@property (nonatomic, copy) NSString *sortChar;
@property (nonatomic, copy) NSString *sso_user_id;
@property (nonatomic, copy) NSString *type;
@property (nonatomic, copy) NSString *user_id;
@property (nonatomic, copy) NSString *username;
@property (nonatomic, strong) OffcnIMUserList_list_classesModel *classes;
@end
@interface OffcnIMUserList_list_classesModel : NSObject
@property (nonatomic, copy) NSString *count;
@property (nonatomic, strong) NSMutableArray *name;
@end
NS_ASSUME_NONNULL_END
......@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
#import "OffcnIMModel.h"
static const NSString *OffcnIMSDKiOSVersion = @"1.0.0.23";
static const NSString *OffcnIMSDKiOSVersion = @"1.1.0.0";
typedef NS_ENUM(NSUInteger, OffcnIMSDKReachabilityStatus) {
OffcnIMSDKReachabilityStatusNotReachable = 0,
......
......@@ -11,6 +11,11 @@
NS_ASSUME_NONNULL_BEGIN
//收到消息通知
#define kRevMsgNotification @"kRevMsgNotification"
//收到消息状态通知
#define kRevMsgStateNotification @"kRevMsgStateNotification"
typedef NS_ENUM(NSUInteger, OffcnIMConnectStatus) {
OffcnIMConnectStatusInitializing = 201029, //连接初始化中
......@@ -50,6 +55,7 @@ typedef void(^OffcnIMReceiveConnectStatus)(OffcnIMConnectStatus status,NSString
@property (nonatomic, weak) id<OffcnIMSocketDelegate> delegate;
@property (nonatomic, copy) NSString *avatar;//发送消息的用户头像
@property (nonatomic, copy) NSString *msg_fromId;//发送消息的用户id
@property (nonatomic, copy) NSString *token;//发送消息的用户token
......
{"id":"com.sina.emotions2015-04","version":8,"display_only":1,"emoticons":[{"chs":"[\u7f8a\u5e74\u5927\u5409]","cht":"[\u7f8a\u5e74\u5927\u5409]","en":"[]","png":"yangniandaji_mobile.png","type":0},{"chs":"[\u70b8\u9e21\u5564\u9152]","cht":"[\u70b8\u96de\u5564\u9152]","en":"[]","png":"zhajibeer_mobile.png","type":0},{"chs":"[\u6316\u9f3b]","cht":"[\u6316\u9f3b]","en":"[]","png":"wabi_mobile.png","type":0},{"chs":"[\u53d1\u7ea2\u5305]","cht":"[\u53d1\u7ea2\u5305]","en":"[]","png":"fahongbao_mobile.png","type":0},{"chs":"[\u8272]","cht":"[\u8272]","en":"[]","png":"huanglianse_mobile.png","type":0},{"chs":"[\u7761]","cht":"[\u7761]","en":"[]","png":"huanglianshuijiao_mobile.png","type":0},{"chs":"[\u767d\u773c]","cht":"[\u767d\u773c]","en":"[]","png":"landelini_mobile.png","type":0},{"chs":"[\u9a6c\u5230\u6210\u529f]","cht":"[\u99ac\u5230\u6210\u529f]","en":"[]","png":"madaochenggong_mobile.png","type":0},{"chs":"[\u5e26\u7740\u5fae\u535a\u53bb\u65c5\u884c]","cht":"[\u5e26\u7740\u5fae\u535a\u53bb\u65c5\u884c]","en":"[]","png":"eventtravel_mobile.png","type":0},{"chs":"[\u7231\u7ea2\u5305]","cht":"[\u611b\u7d05\u5305]","en":"[]","png":"aihongbao_mobile.png","type":0},{"chs":"[\u5fae\u7b11]","cht":"[\u5fae\u7b11]","en":"[]","png":"huanglianweixiao_mobile.png","type":0},{"chs":"[\u7ed9\u529b]","cht":"[\u7ed9\u529b]","en":"[]","png":"geiliv2_mobile.png","type":0},{"chs":"[\u54c8\u6b20]","cht":"[\u54c8\u6b20]","en":"[]","png":"haqianv2_mobile.png","type":0},{"chs":"[\u8721\u70db]","cht":"[\u8721\u70db]","en":"[]","png":"lazhuv2_mobile.png","type":0},{"chs":"[\u56f0]","cht":"[\u56f0]","en":"[]","png":"kunv2_mobile.png","type":0},{"chs":"[\u8bdd\u7b52]","cht":"[\u8a71\u7b52]","en":"[]","png":"huatongv2_mobile.png","type":0},{"chs":"[\u6012\u9a82]","cht":"[\u6012\u99e1]","en":"[]","png":"numav2_mobile.png","type":0},{"chs":"[\u86cb\u7cd5]","cht":"[\u86cb\u7cd5]","en":"[]","png":"cakev2_mobile.png","type":0},{"chs":"[NO]","cht":"[NO]","en":"[]","png":"buyao_mobile.png","type":0},{"chs":"[\u62cd\u7167]","cht":"[\u62cd\u7167]","en":"[]","png":"lxhpz_mobile.png","type":0}]}
\ No newline at end of file
{"id":"com.sina.emotions2015-05","version":5,"display_only":1,"emoticons":[{"chs":"[\u7f9e\u7f9e\u54d2\u751c\u99a8]","cht":"[\u7f9e\u7f9e\u54d2\u751c\u99a8]","en":"[]","png":"bbhltianxinxxd_mobile.png","type":0},{"chs":"[\u840c\u795e\u5965\u8389]","cht":"[\u840c\u795e\u5965\u8389]","en":"[]","png":"bbhlaolims_mobile.png","type":0},{"chs":"[\u6211\u60f3\u9759\u9759]","cht":"[\u6211\u60f3\u9759\u9759]","en":"[]","png":"bbhlwoxiangjingjing_mobile.png","type":0},{"chs":"[\u54c6\u5566A\u68a6\u5fae\u7b11]","cht":"[\u54c6\u5566A\u68a6\u5fae\u7b11]","en":"[]","png":"jqmweixiao_mobile.png","type":0},{"chs":"[\u4f34\u6211\u540c\u884c]","cht":"[\u4f34\u6211\u540c\u884c]","en":"[]","png":"jqmbwtxing_mobile.png","type":0},{"chs":"[\u751c\u99a8\u5403\u8d27]","cht":"[\u751c\u99a8\u5403\u8d27]","en":"[]","png":"bbhlchihuo_mobile.png","type":0}]}
\ No newline at end of file
{"id":"com.sina.emotions2015-06","version":13,"display_only":1,"emoticons":[{"chs":"[\u9759\u9999\u5fae\u7b11]","cht":"[\u9759\u9999\u5fae\u7b11]","en":"[]","png":"jiqimaojingxiang_mobile.png","type":0},{"chs":"[\u5927\u96c4\u5fae\u7b11]","cht":"[\u5927\u96c4\u5fae\u7b11]","en":"[]","png":"jiqimaodaxiong_mobile.png","type":0},{"chs":"[\u80d6\u864e\u5fae\u7b11]","cht":"[\u80d6\u864e\u5fae\u7b11]","en":"[]","png":"jiqimaopanghu_mobile.png","type":0},{"chs":"[\u5c0f\u592b\u5fae\u7b11]","cht":"[\u5c0f\u592b\u5fae\u7b11]","en":"[]","png":"jiqimaoxiaofu_mobile.png","type":0},{"chs":"[\u751c\u99a8\u4e0d\u60f3\u957f\u5927]","cht":"[\u751c\u99a8\u4e0d\u60f3\u957f\u5927]","en":"[]","png":"bbhltianxinbuxiangzhangda_mobile.png","type":0},{"chs":"[\u6c42\u62b1\u62b1]","cht":"[\u6c42\u62b1\u62b1]","en":"[]","png":"bbhlqiubaobao_mobile.png","type":0},{"chs":"[\u54c6\u5566A\u68a6\u6c57]","cht":"[\u54c6\u5566A\u5922\u6c57]","en":"[]","png":"dorahan_mobile.png","type":0},{"chs":"[\u54c6\u5566A\u68a6\u82b1\u5fc3]","cht":"[\u54c6\u5566A\u5922\u82b1\u5fc3]","en":"[]","png":"dorahaose_mobile.png","type":0},{"chs":"[\u54c6\u5566A\u68a6\u5403\u60ca]","cht":"[\u54c6\u5566A\u5922\u5403\u9a5a]","en":"[]","png":"dorachijing_mobile.png","type":0},{"chs":"[\u54c6\u5566A\u68a6\u5bb3\u6015]","cht":"[\u54c6\u5566A\u5922\u5bb3\u6015]","en":"[]","png":"dorahaipa_mobile.png","type":0},{"chs":"[\u770b\u8dcc]","cht":"[\u770b\u8dcc]","en":"[]","png":"kandiev2_mobile.png","type":0},{"chs":"[\u770b\u6da8]","cht":"[\u770b\u6f32]","en":"[]","png":"kanzhangv2_mobile.png","type":0},{"chs":"[\u7236\u4eb2\u8282]","cht":"[\u7236\u89aa\u7bc0]","en":"[]","png":"fuqinjie2015_mobile.png","type":0},{"chs":"[\u751c\u99a8\u54ed\u54ed]","cht":"[\u751c\u99a8\u54ed\u54ed]","en":"[]","png":"bbhltianxinkk_mobile.png","type":0},{"chs":"[\u5c0a\u4e0a\u4e48\u4e48\u54d2]","cht":"[\u5c0a\u4e0a\u4e48\u4e48\u54d2]","en":"[]","png":"hqgzunshangv1_mobile.png","type":0},{"chs":"[\u751c\u99a8\u7231\u4f60\u54df]","cht":"[\u751c\u99a8\u7231\u4f60\u54df]","en":"[]","png":"bbhltianxinlove_mobile.png","type":0}]}
\ No newline at end of file
{"id":"com.sina.emotions2015-07","version":10,"display_only":1,"emoticons":[{"chs":"[\u751c\u99a8\u70ed\u70ed]","cht":"[\u751c\u99a8\u71b1\u71b1]","en":"[]","png":"bbhltianxinhot_mobile.png","type":0},{"chs":"[\u6700\u7f8e\u6740\u9621\u964c]","cht":"[\u6700\u7f8e\u6bba\u9621\u964c]","en":"[]","png":"huaqiangusqm_mobile.png","type":0},{"chs":"[\u751c\u99a8\u5c34\u5c2c]","cht":"[\u751c\u99a8\u5c37\u5c2c]","en":"[]","png":"bbhltianxingg_mobile.png","type":0},{"chs":"[\u8bfa\u4e00\u7c97\u6765\u55e8]","cht":"[\u8bfa\u4e00\u7c97\u6765\u55e8]","en":"[]","png":"bbqnchulaihai_mobile.png","type":0},{"chs":"[\u751c\u99a8\u989c\u503c\u9ad8]","cht":"[\u751c\u99a8\u989c\u503c\u9ad8]","en":"[]","png":"bbhlyanzhigao_mobile.png","type":0},{"chs":"[\u5eb7\u5eb7\u4fdd\u4f51]","cht":"[\u5eb7\u5eb7\u4fdd\u4f51]","en":"[]","png":"bbqnkkbaoyou_mobile.png","type":0},{"chs":"[\u5c0f\u9aa8\u6700\u840c\u4e86]","cht":"[\u5c0f\u9aa8\u6700\u840c\u4e86]","en":"[]","png":"huaqianguxiaogu_mobile.png","type":0},{"chs":"[\u751c\u99a8\u7ffb\u767d\u773c]","cht":"[\u751c\u99a8\u7ffb\u767d\u773c]","en":"[]","png":"bbhltxfanbaiyan_mobile.png","type":0},{"chs":"[\u840c\u5a03\u5927\u7ae3]","cht":"[\u840c\u5a03\u5927\u7ae3]","en":"[]","png":"bbqnmengwadajun_mobile.png","type":0},{"chs":"[\u771f\u5fc3\u82f1\u96c4\u5f20\u6770]","cht":"[\u771f\u5fc3\u82f1\u96c4\u5f35\u5091]","en":"[]","png":"zxyxwanzi_mobile.png","type":0},{"chs":"[\u7cd6\u5b9d\u60ca\u5446\u4e86]","cht":"[\u7cd6\u5bf6\u9a5a\u5446\u4e86]","en":"[]","png":"hqgtangbao_mobile.png","type":0},{"chs":"[\u590f\u5929\u516c\u4e3b]","cht":"[\u590f\u5929\u516c\u4e3b]","en":"[]","png":"bbqnxiatian_mobile.png","type":0},{"chs":"[\u751c\u99a8\u5f97\u745f]","cht":"[\u751c\u99a8\u5f97\u745f]","en":"[]","png":"bbhltianxindese_mobile.png","type":0}]}
\ No newline at end of file
{"id":"com.sina.emotions2015-08","version":5,"display_only":1,"emoticons":[{"chs":"[\u771f\u5fc3\u82f1\u96c4\u9648\u5b66\u51ac]","cht":"[\u771f\u5fc3\u82f1\u96c4\u9673\u5b78\u51ac]","en":"[]","png":"zxyxchenxuedong_mobile.png","type":0},{"chs":"[\u75f4\u60c5\u8f69\u8f69]","cht":"[\u75f4\u60c5\u8f69\u8f69]","en":"[]","png":"bbqnxuanxuan_mobile.png","type":0},{"chs":"[\u4e03\u5915\u5feb\u4e50]","cht":"[\u4e03\u5915\u5feb\u6a02]","en":"[]","png":"qixi2015_mobile.png","type":0},{"chs":"[\u771f\u5fc3\u82f1\u96c4\u4f5f\u5927\u4e3a]","cht":"[\u771f\u5fc3\u82f1\u96c4\u4f5f\u5927\u70ba]","en":"[]","png":"zxyxtongdawei_mobile.png","type":0},{"chs":"[\u4f60\u7684\u5bab\u94c3]","cht":"[\u4f60\u7684\u5bae\u9234]","en":"[hqggongling02_mobile]","png":"hqggongling02_mobile.png","type":0}]}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment