Skip to content
This repository has been archived by the owner on Oct 9, 2021. It is now read-only.

Commit

Permalink
Release SealTalk Demo version 1.3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
RongRobot committed Jan 25, 2019
1 parent c272e3b commit 4cb1e16
Show file tree
Hide file tree
Showing 339 changed files with 667 additions and 69 deletions.
43 changes: 8 additions & 35 deletions ios-rongimdemo/RCloudMessage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
1D3A232C212D540A009514F1 /* RongSticker.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1D3A2327212D5409009514F1 /* RongSticker.strings */; };
1D3A232D212D540A009514F1 /* RongSticker.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1D3A232A212D5409009514F1 /* RongSticker.bundle */; };
1D3A232E212D540A009514F1 /* RongSticker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3A232B212D5409009514F1 /* RongSticker.framework */; };
270EE2A321EF59BA001DFDED /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 270EE2A121EF59BA001DFDED /* JrmfInfo.strings */; };
2724CCD71FF34411006FFC86 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2724CCD61FF34411006FFC86 /* Contacts.framework */; };
27AADC261DDC4DB800E1AE31 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27AADC251DDC4DB800E1AE31 /* AddressBook.framework */; };
27AADC271DDC4DCE00E1AE31 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C3310B1A0C729600E31B9A /* QuartzCore.framework */; };
Expand All @@ -60,8 +61,6 @@
27D6FF9F1DFE4D2C00053F69 /* RCDSettingUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 27D6FF9E1DFE4D2C00053F69 /* RCDSettingUserDefaults.m */; };
2E29FF3C1DC1BE8400AF2DF0 /* AlipaySDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E29FF3A1DC1BE8400AF2DF0 /* AlipaySDK.bundle */; };
2E29FF3D1DC1BE8400AF2DF0 /* AlipaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E29FF3B1DC1BE8400AF2DF0 /* AlipaySDK.framework */; };
2E6B9A1A1E127BF7006EA6B4 /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */; };
2E6B9A1E1E127C0C006EA6B4 /* JrmfInfo.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */; };
2E7A36E11E03A876005231BE /* JResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2E7A36DB1E03A876005231BE /* JResource.bundle */; };
2E7A36E21E03A876005231BE /* jrmf.cer in Resources */ = {isa = PBXBuildFile; fileRef = 2E7A36DC1E03A876005231BE /* jrmf.cer */; };
2E7A36E41E03A876005231BE /* JrmfWalletKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */; };
Expand Down Expand Up @@ -453,6 +452,8 @@
1D3A2329212D5409009514F1 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/RongSticker.strings; sourceTree = "<group>"; };
1D3A232A212D5409009514F1 /* RongSticker.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = RongSticker.bundle; sourceTree = "<group>"; };
1D3A232B212D5409009514F1 /* RongSticker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RongSticker.framework; sourceTree = "<group>"; };
270EE2A221EF59BA001DFDED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/JrmfInfo.strings; sourceTree = "<group>"; };
270EE2A421EF59C3001DFDED /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/JrmfInfo.strings"; sourceTree = "<group>"; };
2724CCD61FF34411006FFC86 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
27AADC251DDC4DB800E1AE31 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
27BCC76D1EA45EA000198BD8 /* RongContactCard.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RongContactCard.framework; path = framework/RongContactCard.framework; sourceTree = SOURCE_ROOT; };
Expand All @@ -469,8 +470,6 @@
27D6FF9E1DFE4D2C00053F69 /* RCDSettingUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCDSettingUserDefaults.m; sourceTree = SOURCE_ROOT; };
2E29FF3A1DC1BE8400AF2DF0 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = "<group>"; };
2E29FF3B1DC1BE8400AF2DF0 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = "<group>"; };
2E6B9A191E127BF7006EA6B4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = JrmfInfo.strings; sourceTree = "<group>"; };
2E6B9A1D1E127C0C006EA6B4 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = JrmfInfo.strings; sourceTree = "<group>"; };
2E7A36DB1E03A876005231BE /* JResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = JResource.bundle; sourceTree = "<group>"; };
2E7A36DC1E03A876005231BE /* jrmf.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = jrmf.cer; sourceTree = "<group>"; };
2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JrmfWalletKit.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1214,14 +1213,13 @@
2E29FF2E1DC1BE7300AF2DF0 /* JrmfIMLib */ = {
isa = PBXGroup;
children = (
2E6B9A171E127BF7006EA6B4 /* en.lproj */,
270EE2A121EF59BA001DFDED /* JrmfInfo.strings */,
2E7A36DB1E03A876005231BE /* JResource.bundle */,
2E7A36DC1E03A876005231BE /* jrmf.cer */,
7755B4BB2106CE9F000C2DA8 /* JrmfPacketKit.framework */,
2E7A36DE1E03A876005231BE /* JrmfWalletKit.framework */,
771BB16121B155B40066AE4A /* JYangToolKit.framework */,
2E7A36E01E03A876005231BE /* WalletResource.bundle */,
2E6B9A1B1E127C0C006EA6B4 /* zh-Hans.lproj */,
);
name = JrmfIMLib;
path = framework/JrmfIMLib;
Expand All @@ -1237,23 +1235,6 @@
path = framework/AlipaySDK;
sourceTree = SOURCE_ROOT;
};
2E6B9A171E127BF7006EA6B4 /* en.lproj */ = {
isa = PBXGroup;
children = (
2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */,
);
path = en.lproj;
sourceTree = "<group>";
};
2E6B9A1B1E127C0C006EA6B4 /* zh-Hans.lproj */ = {
isa = PBXGroup;
children = (
2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */,
);
name = "zh-Hans.lproj";
path = "framework/JrmfIMLib/zh-Hans.lproj";
sourceTree = SOURCE_ROOT;
};
46A831B81AC014B2001A533F /* FindPsw */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2508,8 +2489,6 @@
F894EC391DF7E47600EFD084 /* BQMM.bundle in Resources */,
2E29FF3C1DC1BE8400AF2DF0 /* AlipaySDK.bundle in Resources */,
27C42EED1DE30637003E2306 /* RongCloudiFly.bundle in Resources */,
2E6B9A1E1E127C0C006EA6B4 /* JrmfInfo.strings in Resources */,
2E6B9A1A1E127BF7006EA6B4 /* JrmfInfo.strings in Resources */,
2E7A36E11E03A876005231BE /* JResource.bundle in Resources */,
77F56BF620874DEE00D080F7 /* RCColor.plist in Resources */,
8C55EB511B2A8CE5004285F4 /* Emoji.plist in Resources */,
Expand All @@ -2518,6 +2497,7 @@
2E7A36E21E03A876005231BE /* jrmf.cer in Resources */,
A6CF8A351BD4CB6E00F3EA1A /* RCConfig.plist in Resources */,
E4BFAE251A121839007165B1 /* Images.xcassets in Resources */,
270EE2A321EF59BA001DFDED /* JrmfInfo.strings in Resources */,
510624851AD63A9E00348452 /* RongCloudKit.strings in Resources */,
2E7A36E61E03A876005231BE /* WalletResource.bundle in Resources */,
1D3A232D212D540A009514F1 /* RongSticker.bundle in Resources */,
Expand Down Expand Up @@ -2859,18 +2839,11 @@
name = RongSticker.strings;
sourceTree = "<group>";
};
2E6B9A181E127BF7006EA6B4 /* JrmfInfo.strings */ = {
isa = PBXVariantGroup;
children = (
2E6B9A191E127BF7006EA6B4 /* en */,
);
name = JrmfInfo.strings;
sourceTree = "<group>";
};
2E6B9A1C1E127C0C006EA6B4 /* JrmfInfo.strings */ = {
270EE2A121EF59BA001DFDED /* JrmfInfo.strings */ = {
isa = PBXVariantGroup;
children = (
2E6B9A1D1E127C0C006EA6B4 /* zh-Hans */,
270EE2A221EF59BA001DFDED /* en */,
270EE2A421EF59C3001DFDED /* zh-Hans */,
);
name = JrmfInfo.strings;
sourceTree = "<group>";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
<AdditionalOption
key = "NSZombieEnabled"
value = "YES"
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
Expand Down
6 changes: 3 additions & 3 deletions ios-rongimdemo/RCloudMessage/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.9.9 Dev</string>
<string>2.9.10 Dev</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -42,7 +42,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>201901091923</string>
<string>201901251505</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand All @@ -63,7 +63,7 @@
<key>NSPhotoLibraryAddUsageDescription</key>
<string>访问相册</string>
<key>SealTalk Version</key>
<string>1.3.9</string>
<string>1.3.10</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
Expand Down
19 changes: 19 additions & 0 deletions ios-rongimdemo/autobuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,25 @@ sed -i "" -e '/CFBundleShortVersionString/{n;s/Stable/'"$RELEASE_FLAG"'/; }' ./
sed -i "" -e '/CFBundleShortVersionString/{n;s/Dev/'"$RELEASE_FLAG"'/; }' ./融云\ Demo\ WatchKit\ Extension/Info.plist
sed -i "" -e '/CFBundleVersion/{n;s/[0-9]*[0-9]/'"$CUR_TIME"'/; }' ./融云\ Demo\ WatchKit\ Extension/Info.plist

echo "Copy 3rd framework start."
if [ -d "../ios-3rd-vendor/jrmf/AlipaySDK" ]; then
rm -rf ./framework/AlipaySDK
cp -rf ../ios-3rd-vendor/jrmf/AlipaySDK ./framework/
fi
if [ -d "../ios-3rd-vendor/jrmf/JrmfIMLib" ]; then
rm -rf ./framework/JrmfIMLib
cp -rf ../ios-3rd-vendor/jrmf/JrmfIMLib ./framework/
fi
if [ -d "../ios-3rd-vendor/ifly" ]; then
rm -rf ./framework/ifly
cp -rf ../ios-3rd-vendor/ifly ./framework/
fi
if [ -d "../ios-3rd-vendor/bqmm" ]; then
rm -rf ./framework/bqmm
cp -rf ../ios-3rd-vendor/bqmm ./framework/
fi
echo "Copy 3rd framework end."

PROJECT_NAME="RCloudMessage.xcodeproj"
targetName="SealTalk"
TARGET_DECIVE="iphoneos"
Expand Down
4 changes: 2 additions & 2 deletions ios-rongimdemo/framework/Blink.framework/Blink
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*!
@header BlinkEngine.h
@author BailingCloud
@version 2.0.3_20181119185428_dev_meeting_dev_seal_eae0965
@version 2.0.3_20190123180221_dev_meeting_dev_seal_9bcdf80
@Copyright © 2018年 BailingCloud. All rights reserved.
*/

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <CoreMedia/CoreMedia.h>

#define SDKCompileInfo @"2.0.3_20181119185401_dev_meeting_dev_seal_eae0965"
#define SDKCompileInfo @"2.0.3_20190123180143_dev_meeting_dev_seal_9bcdf80"

//宏定义说明, 设置视频聊天参数时的Key值, 详见SetVideoParameters:方法
#define kAudioOnly @"AudioOnly"
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
132 changes: 132 additions & 0 deletions ios-rongimdemo/framework/PTT/RongPTTKit.framework/Headers/RCPTT.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
//
// RCPTT.h
// RongPTTKit
//
// Created by Sin on 16/12/29.
// Copyright © 2016年 RongCloud. All rights reserved.
//

#import <RongIMKit/RongIMKit.h>
#import <RongPTTLib/RongPTTLib.h>
#import <UIKit/UIKit.h>

/*
通知的object为@{@"action":isEnd?@"end":@"start"}
*/

FOUNDATION_EXPORT NSString *const RCPTTSessionStatusChangeNotification;

@class RCPTT;

/**
RCPTTKit的代理,注:所有的代理方法全部是在异步线程中,不在主线程
*/
@protocol RCPTTKitDelegate <NSObject>

/**
ptt会话开始
@param ptt ptt
@param session 当前ptt会话对象
*/
- (void)ptt:(RCPTT *)ptt sessionDidStart:(RCPTTSession *)session;

/**
ptt会话的参与者发生变化
@param ptt ptt
@param userIds 当前ptt的所有参与者
@param session 当前ptt会话对象
*/
- (void)ptt:(RCPTT *)ptt participantsDidChange:(NSArray *)userIds inPTTSession:(RCPTTSession *)session;

/**
麦克风持有者发生变化
@param ptt ptt
@param userId 当前麦克风持有者id,如果没有人持有麦克风,那么为@"null"
@param session 当前ptt会话对象
*/
- (void)ptt:(RCPTT *)ptt micHolderDidChange:(NSString *)userId inPTTSession:(RCPTTSession *)session;

/**
ptt会话结束
@param ptt ptt
@param session 当前ptt会话对象
*/
- (void)ptt:(RCPTT *)ptt sessionDidTerminate:(RCPTTSession *)session;

/**
说话的时间限制到了
@param ptt ptt
@param session 当前ptt会话对象
*/
- (void)ptt:(RCPTT *)ptt speakTimeDidExpire:(RCPTTSession *)session;

@end

/**
PTT功能核心单例类
*/
@interface RCPTT : NSObject

/**
单例方法
@return RCPTT单例对象
*/
+ (instancetype)sharedRCPTT;

#pragma mark - UI
/**
当前登录用户的id
*/
@property(nonatomic, copy) NSString *currentUserId;

/**
RCPTTStatusView的背景色
*/
@property(nonatomic, strong) UIColor *statusViewColor;

/**
RCPTTTalkViewController上面头像所在view的颜色
*/
@property(nonatomic, strong) UIColor *headerViewColor;

#pragma mark - -

@property(nonatomic, weak) id<RCPTTKitDelegate> delegate;

@property(nonatomic, assign, readonly) RCConversationType conversationType;

@property(nonatomic, copy, readonly) NSString *targetId;

@property(nonatomic, assign, readonly) BOOL isInSession;

@property(nonatomic, strong, readonly) RCPTTSession *currentSession;

@property(nonatomic, strong, readonly) RCPTTSession *lastSession;

- (void)joinSession:(RCConversationType)conversationType
targetId:(NSString *)targetId
success:(void (^)(NSArray *participants))successBlock
error:(void (^)(void))errorBlock;

- (void)leaveSession:(RCConversationType)conversationType
targetId:(NSString *)targetId
success:(void (^)(void))successBlock
error:(void (^)(void))errorBlock;

- (void)startSpeak:(RCConversationType)conversationType
targetId:(NSString *)targetId
success:(void (^)(long))successBlock
error:(void (^)(RCPTTErrorCode))errorBlock;

- (void)stopSpeak:(RCConversationType)conversationType
targetId:(NSString *)targetId
success:(void (^)(void))successBlock
error:(void (^)(RCPTTErrorCode))errorBlock;

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//
// RCPTTBeginMessageCell.h
// RongPTTKit
//
// Created by Sin on 17/1/16.
// Copyright © 2017年 RongCloud. All rights reserved.
//

#import <RongIMKit/RongIMKit.h>
#import <RongPTTLib/RongPTTLib.h>

@interface RCPTTBeginMessageCell : RCMessageCell
/*!
文本内容的Label
*/
@property(strong, nonatomic) UILabel *textLabel;

/*!
背景View
*/
@property(nonatomic, strong) UIImageView *bubbleBackgroundView;

/*!
根据消息内容获取显示的尺寸
@param message 消息内容
@return 显示的View尺寸
*/
+ (CGSize)getBubbleBackgroundViewSize:(RCPTTBeginMessage *)message;
@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// RCPTTCommonDefine.h
// RongPTTKit
//
// Created by Sin on 16/12/27.
// Copyright © 2016年 RongCloud. All rights reserved.
//

#ifndef RCPTTCommonDefine_h
#define RCPTTCommonDefine_h

#import <UIKit/UIKit.h>

// RCPTTStatusView状态需要发生改变的时候会post该通知
static NSString *RCPTTStatusViewStatusChangeNotification = @"RCPTTStatusViewStatusChangeNotification";

typedef NS_ENUM(NSUInteger, RCPTTStatus) { RCPTTStatusTalking };

#endif /* RCPTTCommonDefine_h */
Loading

0 comments on commit 4cb1e16

Please sign in to comment.