From daa73645b67588eb557211f17b848f3848d41bd5 Mon Sep 17 00:00:00 2001 From: j d <1277492822@qq.com> Date: Mon, 10 Sep 2018 17:11:22 +0800 Subject: [PATCH 1/2] fix case sensitive --- .../Meiqia-SDK-Demo.xcodeproj/project.pbxproj | 16 ++++++++-------- .../Controllers/MQChatViewService.m | 2 +- .../Controllers/PreChatForm/MQPreChatCells.h | 2 +- .../PreChatForm/MQPreChatFormViewModel.h | 2 +- .../PreChatForm/MQPreChatFormViewModel.m | 2 +- .../PreChatForm/MQPreChatSubmitViewController.h | 2 +- .../MessageModels/MQFileDownloadMessage.m | 2 +- .../Vendors/VoiceConvert/amrwapper/wav.mm | 2 +- .../Controllers/MQMessageFormViewService.h | 2 +- .../MeiQiaSDK.framework/Headers/MQTicket.h | 2 +- .../MQServiceToViewInterface.h | 2 +- .../MQServiceToViewInterface.m | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj b/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj index 300e5e1c..c177e47e 100644 --- a/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj +++ b/Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 5545979D21466A9A00B602D1 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5545979B21466A9900B602D1 /* libopencore-amrwb.a */; }; + 5545979E21466A9A00B602D1 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5545979C21466A9A00B602D1 /* libopencore-amrnb.a */; }; 8964BC55204EAA8A00EB9473 /* MeiQiaSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8964BAFD204EAA8900EB9473 /* MeiQiaSDK.framework */; }; 8964BC56204EAA8A00EB9473 /* MQServiceToViewInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB00204EAA8900EB9473 /* MQServiceToViewInterface.m */; }; 8964BC57204EAA8A00EB9473 /* MQMessageFormConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB03204EAA8900EB9473 /* MQMessageFormConfig.m */; }; @@ -34,8 +36,6 @@ 8964BC6D204EAA8A00EB9473 /* XlpEmojiCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB3E204EAA8900EB9473 /* XlpEmojiCell.m */; }; 8964BC6E204EAA8A00EB9473 /* MEIQIA_CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB43204EAA8900EB9473 /* MEIQIA_CustomIOSAlertView.m */; }; 8964BC6F204EAA8A00EB9473 /* MEIQIA_AmrRecordWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB4A204EAA8900EB9473 /* MEIQIA_AmrRecordWriter.m */; }; - 8964BC70204EAA8A00EB9473 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8964BB55204EAA8900EB9473 /* libopencore-amrwb.a */; }; - 8964BC71204EAA8A00EB9473 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8964BB56204EAA8900EB9473 /* libopencore-amrnb.a */; }; 8964BC72204EAA8A00EB9473 /* MEIQIA_CafRecordWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB57204EAA8900EB9473 /* MEIQIA_CafRecordWriter.m */; }; 8964BC73204EAA8A00EB9473 /* MEIQIA_MLAudioMeterObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB58204EAA8900EB9473 /* MEIQIA_MLAudioMeterObserver.m */; }; 8964BC74204EAA8A00EB9473 /* MEIQIA_MLAudioRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8964BB59204EAA8900EB9473 /* MEIQIA_MLAudioRecorder.m */; }; @@ -212,6 +212,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 5545979B21466A9900B602D1 /* libopencore-amrwb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrwb.a"; path = "../../../../../../../Meiqia-SDK-files/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/lib/libopencore-amrwb.a"; sourceTree = ""; }; + 5545979C21466A9A00B602D1 /* libopencore-amrnb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrnb.a"; path = "../../../../../../../Meiqia-SDK-files/MQChatViewController/Vendors/MLAudioRecorder/amr_en_de/lib/libopencore-amrnb.a"; sourceTree = ""; }; 8964BAFD204EAA8900EB9473 /* MeiQiaSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MeiQiaSDK.framework; sourceTree = ""; }; 8964BAFF204EAA8900EB9473 /* MQServiceToViewInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQServiceToViewInterface.h; sourceTree = ""; }; 8964BB00204EAA8900EB9473 /* MQServiceToViewInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQServiceToViewInterface.m; sourceTree = ""; }; @@ -274,8 +276,6 @@ 8964BB50204EAA8900EB9473 /* dec_if.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dec_if.h; sourceTree = ""; }; 8964BB52204EAA8900EB9473 /* interf_dec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interf_dec.h; sourceTree = ""; }; 8964BB53204EAA8900EB9473 /* interf_enc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interf_enc.h; sourceTree = ""; }; - 8964BB55204EAA8900EB9473 /* libopencore-amrwb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopencore-amrwb.a"; sourceTree = ""; }; - 8964BB56204EAA8900EB9473 /* libopencore-amrnb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopencore-amrnb.a"; sourceTree = ""; }; 8964BB57204EAA8900EB9473 /* MEIQIA_CafRecordWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEIQIA_CafRecordWriter.m; sourceTree = ""; }; 8964BB58204EAA8900EB9473 /* MEIQIA_MLAudioMeterObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEIQIA_MLAudioMeterObserver.m; sourceTree = ""; }; 8964BB59204EAA8900EB9473 /* MEIQIA_MLAudioRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEIQIA_MLAudioRecorder.m; sourceTree = ""; }; @@ -543,16 +543,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8964BC71204EAA8A00EB9473 /* libopencore-amrnb.a in Frameworks */, E41DDDA61DD18DE0000B3083 /* libz.tbd in Frameworks */, E44A5EA51D5AF47D000481E8 /* Accelerate.framework in Frameworks */, E45CA12D1CCA33EF000B8917 /* libsqlite3.tbd in Frameworks */, CCE9D1481C18139E004E862E /* MobileCoreServices.framework in Frameworks */, CCE9D1461C181399004E862E /* SystemConfiguration.framework in Frameworks */, CCE9D1441C181393004E862E /* CoreTelephony.framework in Frameworks */, - 8964BC70204EAA8A00EB9473 /* libopencore-amrwb.a in Frameworks */, CCE9D1421C18138C004E862E /* AVFoundation.framework in Frameworks */, + 5545979E21466A9A00B602D1 /* libopencore-amrnb.a in Frameworks */, CCE9D1401C181385004E862E /* libicucore.tbd in Frameworks */, + 5545979D21466A9A00B602D1 /* libopencore-amrwb.a in Frameworks */, 8964BC55204EAA8A00EB9473 /* MeiQiaSDK.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -874,8 +874,8 @@ 8964BB54204EAA8900EB9473 /* lib */ = { isa = PBXGroup; children = ( - 8964BB55204EAA8900EB9473 /* libopencore-amrwb.a */, - 8964BB56204EAA8900EB9473 /* libopencore-amrnb.a */, + 5545979C21466A9A00B602D1 /* libopencore-amrnb.a */, + 5545979B21466A9900B602D1 /* libopencore-amrwb.a */, ); path = lib; sourceTree = ""; diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewService.m b/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewService.m index 0b2e2121..68b5b81a 100755 --- a/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewService.m +++ b/Meiqia-SDK-files/MQChatViewController/Controllers/MQChatViewService.m @@ -30,7 +30,7 @@ #import "MQBundleUtil.h" #import "MQFileDownloadCellModel.h" #import "MQServiceToViewInterface.h" -#import +#import #import "MQBotMenuAnswerCellModel.h" #import "MQWebViewBubbleCellModel.h" #import "MQBotWebViewBubbleAnswerCellModel.h" diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatCells.h b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatCells.h index cd4cf1c4..9fb19be8 100644 --- a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatCells.h +++ b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatCells.h @@ -9,7 +9,7 @@ #import #import "UIView+MQLayout.h" #import "NSArray+MQFunctional.h" -#import +#import #define TextFieldLimit 100 diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.h b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.h index ce051370..a3053cee 100644 --- a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.h +++ b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.h @@ -8,7 +8,7 @@ #import //#import -#import +#import @interface MQPreChatFormViewModel : NSObject diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.m b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.m index 864bc4e2..3670a533 100644 --- a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.m +++ b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatFormViewModel.m @@ -8,7 +8,7 @@ #import "MQPreChatFormViewModel.h" #import "MQChatViewConfig.h" -#import +#import #import "MQServiceToViewInterface.h" #import "NSArray+MQFunctional.h" #import "MQChatViewConfig.h" diff --git a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatSubmitViewController.h b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatSubmitViewController.h index 09edaa85..8d4efa70 100644 --- a/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatSubmitViewController.h +++ b/Meiqia-SDK-files/MQChatViewController/Controllers/PreChatForm/MQPreChatSubmitViewController.h @@ -7,7 +7,7 @@ // #import -#import +#import #import "MQChatViewConfig.h" @interface MQPreChatSubmitViewController : UITableViewController diff --git a/Meiqia-SDK-files/MQChatViewController/MessageModels/MQFileDownloadMessage.m b/Meiqia-SDK-files/MQChatViewController/MessageModels/MQFileDownloadMessage.m index 89a5939f..7a806bb7 100644 --- a/Meiqia-SDK-files/MQChatViewController/MessageModels/MQFileDownloadMessage.m +++ b/Meiqia-SDK-files/MQChatViewController/MessageModels/MQFileDownloadMessage.m @@ -8,7 +8,7 @@ #import "MQFileDownloadMessage.h" //#import -#import +#import @implementation MQFileDownloadMessage - (id)initWithDictionary:(NSDictionary *)dictionary { diff --git a/Meiqia-SDK-files/MQChatViewController/Vendors/VoiceConvert/amrwapper/wav.mm b/Meiqia-SDK-files/MQChatViewController/Vendors/VoiceConvert/amrwapper/wav.mm index d0685ad0..681293c7 100755 --- a/Meiqia-SDK-files/MQChatViewController/Vendors/VoiceConvert/amrwapper/wav.mm +++ b/Meiqia-SDK-files/MQChatViewController/Vendors/VoiceConvert/amrwapper/wav.mm @@ -16,7 +16,7 @@ * ------------------------------------------------------------------- */ -#import +#import #include "wav.h" void WavWriter::writeString(const char *str) { diff --git a/Meiqia-SDK-files/MQMessageForm/Controllers/MQMessageFormViewService.h b/Meiqia-SDK-files/MQMessageForm/Controllers/MQMessageFormViewService.h index a5b1237a..3793b895 100644 --- a/Meiqia-SDK-files/MQMessageForm/Controllers/MQMessageFormViewService.h +++ b/Meiqia-SDK-files/MQMessageForm/Controllers/MQMessageFormViewService.h @@ -7,7 +7,7 @@ // #import -#import +#import @interface MQMessageFormViewService : NSObject diff --git a/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQTicket.h b/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQTicket.h index 6b624de9..725c5370 100644 --- a/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQTicket.h +++ b/Meiqia-SDK-files/MeiQiaSDK.framework/Headers/MQTicket.h @@ -6,7 +6,7 @@ // Copyright © 2016年 MeiQia Inc. All rights reserved. // -#import +#import @interface MQTickerClientInfo : MQModel diff --git a/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.h b/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.h index 1cfd8d87..5ceaa7f2 100644 --- a/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.h +++ b/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.h @@ -18,7 +18,7 @@ #import "MQBotAnswerMessage.h" #import "MQBotMenuMessage.h" #import "MQChatViewConfig.h" -#import +#import #import "MQFileDownloadMessage.h" #import "MQRichTextMessage.h" #import "MQBotRichTextMessage.h" diff --git a/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.m b/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.m index 5949f4d6..fe7b737c 100644 --- a/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.m +++ b/Meiqia-SDK-files/MeiqiaSDKViewInterface/MQServiceToViewInterface.m @@ -7,7 +7,7 @@ // #import "MQServiceToViewInterface.h" -#import +#import #import "MQBundleUtil.h" #import "MQChatFileUtil.h" #import "NSArray+MQFunctional.h" From f7b7751f9a0fdf0c2a7553a901a851be6a762c7a Mon Sep 17 00:00:00 2001 From: j d <1277492822@qq.com> Date: Mon, 10 Sep 2018 18:43:57 +0800 Subject: [PATCH 2/2] fix demo case sensitive --- Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m b/Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m index 770b0b66..bfb3b07c 100644 --- a/Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m +++ b/Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m @@ -10,7 +10,7 @@ #import "MQChatViewManager.h" #import "MQChatDeviceUtil.h" #import "DevelopViewController.h" -#import +#import #import "NSArray+MQFunctional.h" #import "MQBundleUtil.h" #import "MQAssetUtil.h"