build version 3.9.13

Meiqia · Feb 2, 2024 · 5bcb1fa · 5bcb1fa
1 parent 0dd5a3e
commit 5bcb1fa
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 12 deletions.
diff --git a/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj b/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj
@@ -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.12;
+				MARKETING_VERSION = 3.9.13;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = com.meiqia.sdk.test.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -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.12;
+				MARKETING_VERSION = 3.9.13;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = com.meiqia.sdk.test.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewController.m b/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewController.m
@@ -54,6 +54,7 @@ @interface MQChatViewController () <UITableViewDelegate, MQChatViewServiceDelega
 @interface MQChatViewController()
 
 @property (nonatomic, strong) id evaluateBarButtonItem;//保存隐藏的barButtonItem
+@property (nonatomic, strong) MQTabInputContentView *contentView;
 @property (nonatomic, strong) MQBottomBar *bottomBar;
 @property (nonatomic, strong) NSLayoutConstraint *constaintInputBarHeight;
 @property (nonatomic, strong) NSLayoutConstraint *constraintInputBarBottom;
@@ -62,6 +63,7 @@ @interface MQChatViewController()
 @property (nonatomic, strong) MQRecordView *recordView;
 @property (nonatomic, strong) MQRecorderView *displayRecordView;//只用来显示
 @property (nonatomic, assign) bool sendVideoMsgStatus;
+@property (nonatomic, assign) bool sendPhotoMsgStatus;
 
 @property (nonatomic, assign) BOOL isFirstScheduleClient;
 
@@ -179,8 +181,12 @@ - (void)presentUI {
             [MQChatViewConfig sharedConfig].preSendMessages = m;
         }
         // TODO: [MQServiceToViewInterface prepareForChat]也会初始化企业配置，这里会导致获取企业配置的接口调用两次,APP第一次初始化时会调3次
-        [MQServiceToViewInterface getEnterpriseConfigInfoWithCache:YES complete:^(MQEnterprise *enterprise, NSError *e) {
+        [MQServiceToViewInterface getEnterpriseConfigInfoWithCache:NO complete:^(MQEnterprise *enterprise, NSError *e) {
             weakSelf.sendVideoMsgStatus = enterprise.configInfo.videoMsgStatus;
+            // 配置 和 本地设置 都开的时候才能发送图片
+            weakSelf.sendPhotoMsgStatus = enterprise.configInfo.photoMsgStatus && [MQChatViewConfig sharedConfig].enableSendImageMessage;
+            // 添加操作按钮
+            [weakSelf.contentView setupButtons];
             weakSelf.isFirstScheduleClient = YES;
             [weakSelf.chatViewService setClientOnline];
         }];
@@ -617,7 +623,14 @@ -(void)sendImageWithSourceType:(UIImagePickerControllerSourceType)sourceType {
     [[NSOperationQueue mainQueue] addOperationWithBlock:^{
         UIImagePickerController *picker = [[UIImagePickerController alloc] init];
         picker.sourceType               = (int)sourceType;
-        picker.mediaTypes               = self.sendVideoMsgStatus ? @[@"public.movie",@"public.image"] : @[@"public.image"];
+        if (self.sendVideoMsgStatus && self.sendPhotoMsgStatus) {
+            picker.mediaTypes = @[@"public.movie",@"public.image"];
+        }else if (self.sendVideoMsgStatus) {
+            picker.mediaTypes = @[@"public.movie"];
+        }else {
+            picker.mediaTypes = @[@"public.image"];
+        }
+//        picker.mediaTypes               = self.sendVideoMsgStatus ? @[@"public.movie",@"public.image"] : @[@"public.image"];
         picker.videoQuality             = UIImagePickerControllerQualityTypeHigh;
         picker.delegate                 = (id)self;
         picker.allowsEditing            = [MQChatViewConfig sharedConfig].enablePhotoLibraryEdit;
@@ -1044,8 +1057,11 @@ - (void)inputContentView:(MQInputContentView *)inputContentView userObjectChange
         [self.bottomBar.buttonGroupBar addButton:recorderBtn];
     }
 
-    if ([MQChatViewConfig sharedConfig].enableSendImageMessage) {
+    // 可以发视频或者可以发图片才添加拍照按钮
+    if (self.sendVideoMsgStatus || self.sendPhotoMsgStatus) {
         [self.bottomBar.buttonGroupBar addButton:cameraBtn];
+    }
+    if (self.sendPhotoMsgStatus) {
         [self.bottomBar.buttonGroupBar addButton:imageRoll];
     }
 
@@ -1294,14 +1310,21 @@ - (MQEvaluationView *)evaluationView {
     return _evaluationView;
 }
 
+- (MQTabInputContentView *)contentView {
+    if (!_contentView) {
+        _contentView = [[MQTabInputContentView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, emojikeyboardHeight )];
+    }
+    return _contentView;
+}
+
 - (MQBottomBar *)bottomBar {
     if (!_bottomBar) {
-        MQTabInputContentView *contentView = [[MQTabInputContentView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, emojikeyboardHeight )];
+//        MQTabInputContentView *contentView = [[MQTabInputContentView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, emojikeyboardHeight )];
 
-        _bottomBar = [[MQBottomBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, kMQChatViewInputBarHeight) contentView: contentView];
+        _bottomBar = [[MQBottomBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, kMQChatViewInputBarHeight) contentView: self.contentView];
         _bottomBar.delegate = self;
         _bottomBar.contentViewDelegate = self;
-        [contentView setupButtons];
+//        [contentView setupButtons];
 
     }
     return _bottomBar;

diff --git a/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQEnterprise.h b/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQEnterprise.h
@@ -83,6 +83,8 @@ typedef enum : NSUInteger {
 
 @property (nonatomic, copy) NSString *queueTicketIntro; //排队引导留言的文案
 
+@property (nonatomic, readonly, assign) bool photoMsgStatus; //是否可以发送image类型消息
+
 @property (nonatomic, readonly, assign) bool videoMsgStatus; //是否可以发送video类型消息
 
 @property (nonatomic, readonly, assign) bool hideHistoryConvoStatus; //是否隐藏历史对话

diff --git a/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQManager.h b/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQManager.h
@@ -17,7 +17,7 @@
 #import "MQPreChatData.h"
 
 
-#define MQSDKVersion @"3.9.12"
+#define MQSDKVersion @"3.9.13"
 @protocol MQManagerDelegate <NSObject>
 
 /**

diff --git a/Meiqia-SDK-files/MeiQiaSDK.framework/Info.plist b/Meiqia-SDK-files/MeiQiaSDK.framework/Info.plist
diff --git a/Meiqia-SDK-files/MeiQiaSDK.framework/MeiQiaSDK b/Meiqia-SDK-files/MeiQiaSDK.framework/MeiQiaSDK
diff --git a/Meiqia.podspec b/Meiqia.podspec
@@ -9,14 +9,14 @@
 
 Pod::Spec.new do |s|
   s.name             = "Meiqia"
-  s.version          = "3.9.12"
+  s.version          = "3.9.13"
   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.12" }
+  s.source           = { :git => "https://github.com/Meiqia/MeiqiaSDK-iOS.git", :tag => "v3.9.13" }
   s.social_media_url = "https://meiqia.com"
   s.documentation_url = "https://github.com/Meiqia/MeiqiaSDK-iOS/wiki"
   s.platform     = :ios, '8.0'

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ edition: m2016
 在 Podfile 中加入：
 
 ```
-pod 'Meiqia', '~> 3.9.12'
+pod 'Meiqia', '~> 3.9.13'
 ```
 接着安装美洽 pod 即可：
 
@@ -913,6 +913,9 @@ VoiceConvert |  N/A | AMR 和 WAV 语音格式的互转；没找到出处，哪
 
 # 十一 更新日志
 
+**v3.9.13  2024 年 2 月 2 日**
+* 支持工作台控制发送图片消息按钮显示开关
+
 **v3.9.12  2024 年 1 月 24 日**
 * 优化顾客信息更新逻辑