Skip to content

Commit

Permalink
Merge pull request #169 from xulianpeng/master
Browse files Browse the repository at this point in the history
3.4.3上线
  • Loading branch information
xulianpeng authored Oct 31, 2017
2 parents bda3c50 + 1ff0f3a commit 3046e98
Show file tree
Hide file tree
Showing 41 changed files with 1,403 additions and 293 deletions.
52 changes: 37 additions & 15 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
/* Begin PBXBuildFile section */
63558F821EEE7B3E00B12545 /* FEZ.png in Resources */ = {isa = PBXBuildFile; fileRef = 63558F811EEE7B3E00B12545 /* FEZ.png */; };
8904283D1F668A5B003B7F2D /* MQInputToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8904283C1F668A5B003B7F2D /* MQInputToolView.m */; };
895936CC1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 895936CB1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.m */; };
895936CF1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 895936CE1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.m */; };
898D16851FA1BBB8001127B5 /* MQToolUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 898D16841FA1BBB8001127B5 /* MQToolUtil.m */; };
CC330EC91C317E2D0088E648 /* ijinmaoAvatar.png in Resources */ = {isa = PBXBuildFile; fileRef = CC330EC81C317E2D0088E648 /* ijinmaoAvatar.png */; };
CCE9D10B1C1812F6004E862E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE9D10A1C1812F6004E862E /* main.m */; };
CCE9D10E1C1812F6004E862E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE9D10D1C1812F6004E862E /* AppDelegate.m */; };
Expand Down Expand Up @@ -486,6 +489,12 @@
63558F811EEE7B3E00B12545 /* FEZ.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FEZ.png; sourceTree = "<group>"; };
8904283B1F668A5B003B7F2D /* MQInputToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQInputToolView.h; sourceTree = "<group>"; };
8904283C1F668A5B003B7F2D /* MQInputToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQInputToolView.m; sourceTree = "<group>"; };
895936CA1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MQBotMenuWebViewBubbleAnswerCell.h; sourceTree = "<group>"; };
895936CB1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MQBotMenuWebViewBubbleAnswerCell.m; sourceTree = "<group>"; };
895936CD1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MQBotMenuWebViewBubbleAnswerCellModel.h; sourceTree = "<group>"; };
895936CE1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MQBotMenuWebViewBubbleAnswerCellModel.m; sourceTree = "<group>"; };
898D16831FA1BBB8001127B5 /* MQToolUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MQToolUtil.h; sourceTree = "<group>"; };
898D16841FA1BBB8001127B5 /* MQToolUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MQToolUtil.m; sourceTree = "<group>"; };
CC330EC81C317E2D0088E648 /* ijinmaoAvatar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ijinmaoAvatar.png; sourceTree = "<group>"; };
CCE9D1061C1812F6004E862E /* Meiqia-SDK-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Meiqia-SDK-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
CCE9D10A1C1812F6004E862E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1143,6 +1152,7 @@
E4B958191DE5A80000BECBB5 /* CellModel */ = {
isa = PBXGroup;
children = (
E4B958221DE5A80000BECBB5 /* MQCellModelProtocol.h */,
E4B9581A1DE5A80000BECBB5 /* MQBotAnswerCellModel.h */,
E4B9581B1DE5A80000BECBB5 /* MQBotAnswerCellModel.m */,
E4B9581C1DE5A80000BECBB5 /* MQBotMenuAnswerCellModel.h */,
Expand All @@ -1151,7 +1161,8 @@
E4B9581F1DE5A80000BECBB5 /* MQBotMenuCellModel.m */,
E4B958201DE5A80000BECBB5 /* MQBotWebViewBubbleAnswerCellModel.h */,
E4B958211DE5A80000BECBB5 /* MQBotWebViewBubbleAnswerCellModel.m */,
E4B958221DE5A80000BECBB5 /* MQCellModelProtocol.h */,
895936CD1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.h */,
895936CE1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.m */,
E4B958231DE5A80000BECBB5 /* MQEvaluationResultCellModel.h */,
E4B958241DE5A80000BECBB5 /* MQEvaluationResultCellModel.m */,
E4B958251DE5A80000BECBB5 /* MQEventCellModel.h */,
Expand Down Expand Up @@ -1187,6 +1198,8 @@
E4B9583D1DE5A80000BECBB5 /* MQBotMenuCell.m */,
E4B9583E1DE5A80000BECBB5 /* MQBotWebViewBubbleAnswerCell.h */,
E4B9583F1DE5A80000BECBB5 /* MQBotWebViewBubbleAnswerCell.m */,
895936CA1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.h */,
895936CB1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.m */,
E4B958401DE5A80000BECBB5 /* MQChatBaseCell.h */,
E4B958411DE5A80000BECBB5 /* MQChatBaseCell.m */,
E4B958421DE5A80000BECBB5 /* MQEvaluationCell.h */,
Expand Down Expand Up @@ -1243,6 +1256,8 @@
E4B9586F1DE5A80100BECBB5 /* MQStringSizeUtil.m */,
E4B958701DE5A80100BECBB5 /* MQWindowUtil.h */,
E4B958711DE5A80100BECBB5 /* MQWindowUtil.m */,
898D16831FA1BBB8001127B5 /* MQToolUtil.h */,
898D16841FA1BBB8001127B5 /* MQToolUtil.m */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -1409,7 +1424,6 @@
E4B958B01DE5A80100BECBB5 /* Views */ = {
isa = PBXGroup;
children = (
E4B958B11DE5A80100BECBB5 /* DMFilterView */,
E4B958B21DE5A80100BECBB5 /* MCKeyboardController */,
E4B958B51DE5A80100BECBB5 /* MQChatTableView.h */,
E4B958B61DE5A80100BECBB5 /* MQChatTableView.m */,
Expand All @@ -1424,13 +1438,6 @@
path = Views;
sourceTree = "<group>";
};
E4B958B11DE5A80100BECBB5 /* DMFilterView */ = {
isa = PBXGroup;
children = (
);
path = DMFilterView;
sourceTree = "<group>";
};
E4B958B21DE5A80100BECBB5 /* MCKeyboardController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1880,7 +1887,7 @@
attributes = {
CLASSPREFIX = MQ;
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = Meiqia;
TargetAttributes = {
CCE9D1051C1812F6004E862E = {
Expand All @@ -1897,7 +1904,7 @@
};
E45472CC1DE412F800948ECD = {
CreatedOnToolsVersion = 8.1;
DevelopmentTeam = T9YSHM8D7E;
DevelopmentTeam = H22N8T6DAX;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -2000,6 +2007,7 @@
E4B9591B1DE5A80100BECBB5 /* MQPreChatFormViewModel.m in Sources */,
E46FBA131E5A92AD00BF76DD /* MQRefresh.m in Sources */,
E4B9591F1DE5A80100BECBB5 /* MQBotMenuMessage.m in Sources */,
895936CF1F7A5670000841AF /* MQBotMenuWebViewBubbleAnswerCellModel.m in Sources */,
E4B959651DE5A80100BECBB5 /* MEIQIA_MLAudioMeterObserver.m in Sources */,
E4B9596B1DE5A80100BECBB5 /* MQKeyboardController.m in Sources */,
E4B959451DE5A80100BECBB5 /* MQTextMessageCell.m in Sources */,
Expand Down Expand Up @@ -2070,6 +2078,7 @@
E4B959251DE5A80100BECBB5 /* MQImageMessage.m in Sources */,
E4B9595C1DE5A80100BECBB5 /* MEIQIA_FBLCDFontView.m in Sources */,
E4B959021DE5A80100BECBB5 /* MQServiceToViewInterface.m in Sources */,
898D16851FA1BBB8001127B5 /* MQToolUtil.m in Sources */,
E4B959191DE5A80100BECBB5 /* MQPreChatCells.m in Sources */,
E4B9591A1DE5A80100BECBB5 /* MQPreChatFormListViewController.m in Sources */,
E4B959081DE5A80100BECBB5 /* NSArray+MQFunctional.m in Sources */,
Expand All @@ -2096,6 +2105,7 @@
E4B959791DE5A80100BECBB5 /* MQWebViewController.m in Sources */,
E4B9597C1DE5A80100BECBB5 /* MQMessageFormViewManager.m in Sources */,
E4B959781DE5A80100BECBB5 /* MQEmbededWebView.m in Sources */,
895936CC1F7A4EA2000841AF /* MQBotMenuWebViewBubbleAnswerCell.m in Sources */,
E4B9594C1DE5A80100BECBB5 /* MQChatAudioRecorder.m in Sources */,
E4B959221DE5A80100BECBB5 /* MQEventMessage.m in Sources */,
E4B9594D1DE5A80100BECBB5 /* MQChatDeviceUtil.m in Sources */,
Expand Down Expand Up @@ -2312,14 +2322,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -2358,14 +2374,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -2522,10 +2544,10 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 68;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = T9YSHM8D7E;
DEVELOPMENT_TEAM = H22N8T6DAX;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 68;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -2559,10 +2581,10 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CURRENT_PROJECT_VERSION = 68;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = T9YSHM8D7E;
DEVELOPMENT_TEAM = H22N8T6DAX;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 68;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
version = "1.8">
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
Expand Down Expand Up @@ -70,6 +70,7 @@
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,16 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"images" : [
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "landscape",
"idiom" : "iphone",
Expand All @@ -16,14 +8,6 @@
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "667h",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
Expand Down
2 changes: 2 additions & 0 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo/DevelopViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ - (void)setClientOnlineWithCustomizedId:(NSString *)customizedId {
[chatViewManager pushMQChatViewControllerInViewController:self];
}
}];


}

/**
Expand Down
4 changes: 2 additions & 2 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.4.2</string>
<string>3.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>68</string>
<string>69</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
7 changes: 7 additions & 0 deletions Meiqia-SDK-Demo/Meiqia-SDK-Demo/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,13 @@ - (void)didTapBasicFunctionBtn:(UIButton *)button {
// [chatViewManager.chatViewStyle setEnableOutgoingAvatar:NO];
// [chatViewManager.chatViewStyle setEnableRoundAvatar:
// [chatViewManager setClientInfo:@{@"name" : @"123"} override:YES];

// MQChatViewStyle *aStyle = [chatViewManager chatViewStyle];
// [aStyle setNavBackButtonImage:[UIImage imageNamed:@"meiqia-icon"]];
// UIButton *bt = [UIButton buttonWithType:UIButtonTypeCustom];
// [bt setImage:[UIImage imageNamed:@"meiqia-icon"] forState:UIControlStateNormal];
// [aStyle setNavBarRightButton:bt];

// [chatViewManager setChatWelcomeText:@"asfafsaaaaasgastag?"];
[chatViewManager pushMQChatViewControllerInViewController:self];
// [chatViewManager setLoginCustomizedId:@"10"];
Expand Down
4 changes: 2 additions & 2 deletions Meiqia-SDK-Demo/Meiqia-SDK-DemoTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.4.2</string>
<string>3.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>68</string>
<string>69</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Meiqia-SDK-Demo/Meiqia-SDK-DemoUITests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.4.2</string>
<string>3.4.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>68</string>
<string>69</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Meiqia-SDK-Demo/Meiqia/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.4.2</string>
<string>3.4.3</string>
<key>CFBundleVersion</key>
<string>68</string>
<string>69</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,14 @@ - (void)setPullRefreshColor:(UIColor *)pullRefreshColor {
}

- (void)setChatWelcomeText:(NSString *)welcomText {

if (!welcomText) {
return;
}
NSString *str = [welcomText stringByReplacingOccurrencesOfString:@" " withString:@""];
if (str.length <= 0){
return;
}
chatViewConfig.chatWelcomeText = [welcomText copy];
}

Expand Down
Loading

0 comments on commit 3046e98

Please sign in to comment.