Commit 8f1a02cd authored by Kevin Reynaldo's avatar Kevin Reynaldo
Browse files

• Updated version to 1.6.1

• Added setTapTalkSocketConnectionMode to TapTalk class
parent 8a1fce42
......@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.name = "TapTalk"
s.version = "1.6.0"
s.version = "1.6.1"
s.summary = "TapTalk.io is a complete in-app chat SDK and messaging API. TapTalk.io provides UI-based and code-based implementation & fully customizable."
s.homepage = "https://taptalk.io"
......
......@@ -2183,7 +2183,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = PA443D57Z2;
DYLIB_COMPATIBILITY_VERSION = 1;
......@@ -2205,7 +2205,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.6.1;
PRODUCT_BUNDLE_IDENTIFIER = io.TapTalk.TapTalk;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
......@@ -2219,7 +2219,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = PA443D57Z2;
......@@ -2242,7 +2242,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.6.1;
PRODUCT_BUNDLE_IDENTIFIER = io.TapTalk.TapTalk;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
......
......@@ -119,14 +119,14 @@
SDWebImageDownloader *imageDownloader = [SDWebImageDownloader sharedDownloader];
[imageDownloader downloadImageWithURL:imageURL options:0 progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
#ifdef DEBUG
NSLog(@"Image Download: %ld of %ld", (long)receivedSize, (long)expectedSize);
#endif
//#ifdef DEBUG
// NSLog(@"Image Download: %ld of %ld", (long)receivedSize, (long)expectedSize);
//#endif
} completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, BOOL finished) {
if (finished && image != nil) {
#ifdef DEBUG
NSLog(@"Image Download Completed");
#endif
//#ifdef DEBUG
// NSLog(@"Image Download Completed");
//#endif
// [imageCache storeImage:image forKey:urlString];
[imageCache storeImage:image forKey:urlString completion:^{
}];
......@@ -141,9 +141,9 @@
}
}
else {
#ifdef DEBUG
NSLog(@"Image Download Failed: %@", [error description]);
#endif
//#ifdef DEBUG
// NSLog(@"Image Download Failed: %@", [error description]);
//#endif
dispatch_async(dispatch_get_main_queue(), ^{
self.image = nil;
if ([self.delegate respondsToSelector:@selector(imageViewDidFinishLoadImage:)]) {
......
......@@ -1131,7 +1131,9 @@
}];
}
[self disconnect];
if ([[TapTalk sharedInstance] getTapTalkSocketConnectionMode] != TapTalkSocketConnectionModeAlwaysOn) {
[self disconnect];
}
}
- (void)saveUnsentMessageAndDisconnect {
......
......@@ -57,4 +57,14 @@ typedef NS_ENUM(NSInteger, TAPChatMessageType) {
TAPChatMessageTypeUnreadMessageIdentifier = 9002,
};
/*
enum TapTalkSocketConnectionMode
used change socket reconnection behavior
*/
typedef NS_ENUM(NSInteger, TapTalkSocketConnectionMode) {
TapTalkSocketConnectionModeDefault,
TapTalkSocketConnectionModeAlwaysOn,
TapTalkSocketConnectionModeConnectIfNeeded
};
#endif /* TAPTypes_h */
......@@ -328,4 +328,14 @@ FOUNDATION_EXPORT const unsigned char TapTalkVersionString[];
*/
- (TAPUserModel *_Nonnull)getTapTalkActiveUser;
/**
Modify TapTalk's socket connection mode
*/
- (void)setTapTalkSocketConnectionMode:(TapTalkSocketConnectionMode)tapTalkSocketConnectionMode;
/**
Obtain the currently active socket connection mode
*/
- (TapTalkSocketConnectionMode)getTapTalkSocketConnectionMode;
@end
......@@ -18,6 +18,7 @@
@interface TapTalk () <TAPNotificationManagerDelegate>
@property (nonatomic) TapTalkImplentationType implementationType;
@property (nonatomic) TapTalkSocketConnectionMode socketConnectionMode;
@property (nonatomic) BOOL isInitialized;
@property (nonatomic) BOOL isAutoConnectDisabled;
@property (nonatomic) BOOL isGooglePlacesAPIInitialize;
......@@ -271,7 +272,11 @@
if ([TAPChatManager sharedManager].activeUser != nil) {
//User active
BOOL isAutoConnectEnabled = [[TapTalk sharedInstance] isAutoConnectEnabled];
if (isAutoConnectEnabled) {
TapTalkSocketConnectionMode socketConnectionMode = [[TapTalk sharedInstance] getTapTalkSocketConnectionMode];
if (isAutoConnectEnabled &&
(socketConnectionMode == TapTalkSocketConnectionModeDefault ||
socketConnectionMode == TapTalkSocketConnectionModeAlwaysOn)
) {
[[TAPChatManager sharedManager] connect];
}
......@@ -732,4 +737,12 @@
return self.maxCaptionLength;
}
- (void)setTapTalkSocketConnectionMode:(TapTalkSocketConnectionMode)tapTalkSocketConnectionMode {
self.socketConnectionMode = tapTalkSocketConnectionMode;
}
- (TapTalkSocketConnectionMode)getTapTalkSocketConnectionMode {
return self.socketConnectionMode;
}
@end
......@@ -190,6 +190,14 @@
else {
[self.navigationController setNavigationBarHidden:NO animated:YES];
}
if ([[TapTalk sharedInstance] getTapTalkSocketConnectionMode] == TapTalkSocketConnectionModeConnectIfNeeded) {
[[TapTalk sharedInstance] connectWithSuccess:^{
} failure:^(NSError * _Nonnull error) {
}];
}
}
- (void)viewWillDisappear:(BOOL)animated {
......@@ -203,6 +211,12 @@
if ([self.lifecycleDelegate respondsToSelector:@selector(TapUIRoomListViewControllerViewWillDisappear)]) {
[self.lifecycleDelegate TapUIRoomListViewControllerViewWillDisappear];
}
if ([[TapTalk sharedInstance] getTapTalkSocketConnectionMode] == TapTalkSocketConnectionModeConnectIfNeeded) {
[[TapTalk sharedInstance] disconnectWithCompletionHandler:^{
}];
}
}
- (void)dealloc {
......
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