Skip to content

Commit

Permalink
build version 3.9.19
Browse files Browse the repository at this point in the history
  • Loading branch information
yangsisi committed Nov 14, 2024
1 parent 56e5c88 commit d468df1
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2213,7 +2213,7 @@
"$(SRCROOT)/../Meiqia-SDK-files/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/**",
"$(PROJECT_DIR)/MeiqiaSDK/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/lib",
);
MARKETING_VERSION = 3.9.18;
MARKETING_VERSION = 3.9.19;
OTHER_LDFLAGS = "-all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.meiqia.sdk.test.demo;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2257,7 +2257,7 @@
"$(SRCROOT)/../Meiqia-SDK-files/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/**",
"$(PROJECT_DIR)/MeiqiaSDK/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/lib",
);
MARKETING_VERSION = 3.9.18;
MARKETING_VERSION = 3.9.19;
OTHER_LDFLAGS = "-all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.meiqia.sdk.test.demo;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
40 changes: 36 additions & 4 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo/DevelopViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ - (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.

if (@available(iOS 13.0, *)) {
self.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
}

sectionHeaders = @[
@"以下是开发者可能会用到的客服功能,请参考^.^",
@"以下是开源界面的不同的设置"
Expand Down Expand Up @@ -83,6 +87,7 @@ - (void)viewDidLoad {
@"切换 appKey 上线",
@"获取当前顾客的群发消息",
@"显示自定义id未读的消息数",
@"指定分配不再重新分配客服",
],
@[
@"自定义主题 1",
Expand Down Expand Up @@ -223,6 +228,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 19:
[self inputCustomizedIdGetUnreadMessageCount];
break;
case 20:
[self chooseIsNoReallocate];
break;
default:
break;
}
Expand Down Expand Up @@ -261,6 +269,23 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
}
}

- (void)chooseIsNoReallocate {
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"不再重新分配?" message:nil preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[self setIsNoReallocateOnline:NO];
}]];
[alert addAction:[UIAlertAction actionWithTitle:@"" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[self setIsNoReallocateOnline:YES];
}]];
[self presentViewController:alert animated:YES completion:nil];
}

- (void)setIsNoReallocateOnline:(BOOL)isReallocate {
MQChatViewManager *chatViewManager = [[MQChatViewManager alloc] init];
[chatViewManager setNoReallocate:isReallocate];
[chatViewManager pushMQChatViewControllerInViewController:self];
}

#pragma UITableViewDataSource
- (void)switchAppKey {
UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"已注册的 app key 列表" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:nil];
Expand Down Expand Up @@ -372,9 +397,16 @@ - (void)inputClientId {
* @param clientId 顾客id
*/
- (void)setClientOnlineWithClientId:(NSString *)clientId {
clientId = @"2eDTdfN0zDy7uWedvV4RZliXAVh";
MQChatViewManager *chatViewManager = [[MQChatViewManager alloc] init];
[chatViewManager setLoginMQClientId:clientId];
[chatViewManager.chatViewStyle setEnableOutgoingAvatar:false];
[chatViewManager.chatViewStyle setIncomingBubbleColor:[UIColor mq_colorWithHexString:@"#00CE7D"]];
[chatViewManager.chatViewStyle setIncomingMsgTextColor:[UIColor mq_colorWithHexString:@"#FF5C5E"]];
[chatViewManager.chatViewStyle setOutgoingBubbleColor:[UIColor mq_colorWithHexString:@"#FFB652"]];
[chatViewManager.chatViewStyle setOutgoingMsgTextColor:[UIColor mq_colorWithHexString:@"#17C7D1"]];
[chatViewManager.chatViewStyle setBackgroundColor:[UIColor mq_colorWithHexString:@"#303D42"]];
[chatViewManager.chatViewStyle setEventTextColor:[UIColor purpleColor]];
[chatViewManager presentMQChatViewControllerInViewController:self];
}

Expand All @@ -401,13 +433,13 @@ - (void)inputCustomizedId {
* @param customizedId 自定义id
*/
- (void)setClientOnlineWithCustomizedId:(NSString *)customizedId {
[MQManager initWithAppkey:@"" completion:^(NSString *clientId, NSError *error) {
if (!error) {
// [MQManager initWithAppkey:@"" completion:^(NSString *clientId, NSError *error) {
// if (!error) {
MQChatViewManager *chatViewManager = [[MQChatViewManager alloc] init];
[chatViewManager setLoginCustomizedId:customizedId];
[chatViewManager pushMQChatViewControllerInViewController:self];
}
}];
// }
// }];

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,12 @@
*/
- (void)didTapProductCard:(void (^)(NSString *productUrl))callBack;

/**
* 已分配客服的情况下,如果是指定分配,需不需要重新走指定分配规则
* 为 true 代表第二次 schedule 即使设置了 agent_token, group_token 跟当前客服不匹配也不转接
*/
- (void)setNoReallocate:(BOOL)isNoReallocate;

#endif


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@ - (void)setStatusBarStyle:(UIStatusBarStyle)statusBarStyle {
chatViewConfig.didSetStatusBarStyle = true;
}

- (void)setNoReallocate:(BOOL)isNoReallocate {
[MQManager setNoReallocate:isNoReallocate];
}

#ifdef INCLUDE_MEIQIA_SDK
- (void)enableSyncServerMessage:(BOOL)enable {
chatViewConfig.enableSyncServerMessage = enable;
Expand Down
8 changes: 7 additions & 1 deletion Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#import "MQPreChatData.h"


#define MQSDKVersion @"3.9.18"
#define MQSDKVersion @"3.9.19"
@protocol MQManagerDelegate <NSObject>

/**
Expand Down Expand Up @@ -749,4 +749,10 @@
*/
+ (void)setClientVisitInfoToService;

/**
* 已分配客服的情况下,如果是指定分配,需不需要重新走指定分配规则
* 为 true 代表第二次 schedule 即使设置了 agent_token, group_token 跟当前客服不匹配也不转接
*/
+ (void)setNoReallocate:(BOOL)isNoReallocate;

@end
Binary file modified Meiqia-SDK-files/MeiQiaSDK.framework/Info.plist
Binary file not shown.
Binary file modified Meiqia-SDK-files/MeiQiaSDK.framework/MeiQiaSDK
Binary file not shown.
4 changes: 2 additions & 2 deletions Meiqia.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

Pod::Spec.new do |s|
s.name = "Meiqia"
s.version = "3.9.18"
s.version = "3.9.19"
s.summary = "美洽官方 SDK for iOS"
s.description = "美洽官方的 iOS SDK"

s.homepage = "https://github.com/Meiqia/MeiqiaSDK-iOS"
s.license = 'MIT'
s.author = { "CassieSisi" => "[email protected]" }
s.source = { :git => "https://github.com/Meiqia/MeiqiaSDK-iOS.git", :tag => "v3.9.18" }
s.source = { :git => "https://github.com/Meiqia/MeiqiaSDK-iOS.git", :tag => "v3.9.19" }
s.social_media_url = "https://meiqia.com"
s.documentation_url = "https://github.com/Meiqia/MeiqiaSDK-iOS/wiki"
s.platform = :ios, '8.0'
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ edition: m2016
在 Podfile 中加入:

```
pod 'Meiqia', '~> 3.9.18'
pod 'Meiqia', '~> 3.9.19'
```
接着安装美洽 pod 即可:

Expand Down Expand Up @@ -913,6 +913,10 @@ VoiceConvert | N/A | AMR 和 WAV 语音格式的互转;没找到出处,哪

# 十一 更新日志

**v3.9.19 2024 年 11 月 14 日**
* 新增已分配客服情况下是否需要重新分配
* 新增域名动态替换

**v3.9.18 2024 年 10 月 14 日**
* 询前表单新增分配规则
* 机器人转人工获取自定义文案
Expand Down

0 comments on commit d468df1

Please sign in to comment.