Skip to content

Commit

Permalink
Merge pull request #156 from IanLuo/develop
Browse files Browse the repository at this point in the history
修复如果在对话没有结束,连接正常的情况下,重新指定客服或者客服组没有效果的问题
  • Loading branch information
IanLuo authored Apr 10, 2017
2 parents 4439553 + 8ad85f6 commit bc3bc10
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Meiqia-SDK-Demo/Meiqia-SDK-Demo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.3.7</string>
<string>3.3.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Meiqia-SDK-Demo/Meiqia-SDK-DemoTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.3.7</string>
<string>3.3.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Meiqia-SDK-Demo/Meiqia-SDK-DemoUITests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.3.7</string>
<string>3.3.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Meiqia-SDK-Demo/Meiqia/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.3.7</string>
<string>3.3.8</string>
<key>CFBundleVersion</key>
<string>67</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#import "MQPreChatData.h"


#define MQSDKVersion @"3.3.7"
#define MQSDKVersion @"3.3.8"

@protocol MQManagerDelegate <NSObject>

Expand Down
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.3.7"
s.version = "3.3.8"
s.summary = "美洽官方 SDK for iOS"
s.description = "美洽官方的 iOS SDK"

s.homepage = "https://github.com/Meiqia/MeiqiaSDK-iOS"
s.license = 'MIT'
s.author = { "ijinmao" => "[email protected]" }
s.source = { :git => "https://github.com/Meiqia/MeiqiaSDK-iOS.git", :tag => "v3.3.7" }
s.source = { :git => "https://github.com/Meiqia/MeiqiaSDK-iOS.git", :tag => "v3.3.8" }
s.social_media_url = "https://meiqia.com"
s.documentation_url = "https://github.com/Meiqia/MeiqiaSDK-iOS/wiki"
s.platform = :ios, '7.0'
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ framework中的文件 | 说明
在 Podfile 中加入:

```
pod 'Meiqia', '~> 3.3.6'
pod 'Meiqia', '~> 3.3.8'
```

接着安装美洽 pod 即可:
Expand Down Expand Up @@ -867,6 +867,9 @@ VoiceConvert | N/A | AMR 和 WAV 语音格式的互转;没找到出处,哪

# 更新日志

**v3.3.8 2017 年 4 月 10 日**
* 修复如果在对话没有结束,连接正常的情况下,重新指定客服或者客服组没有效果的问题

**v3.3.7 2017 年 4 月 7 日**
* 修复当对话结束时,如果有自动邀请评价,并且没有设置结束对话语的时候,会导致结束失败。

Expand Down

0 comments on commit bc3bc10

Please sign in to comment.