Skip to content

Commit 8d27f73

Browse files
xhzengAIBxhzengAIB
committed
添加自定义参数
1 parent c9dacfc commit 8d27f73

10 files changed

Lines changed: 40 additions & 10 deletions

File tree

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
E47E737A1AA19FB800CF7C0B /* XHAlbumLikesCommentsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E47E73791AA19FB800CF7C0B /* XHAlbumLikesCommentsView.m */; };
5555
E47E737C1AA1A37600CF7C0B /* Album_likes_comments_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E47E737B1AA1A37600CF7C0B /* Album_likes_comments_background@2x.png */; };
5656
E47E737E1AA1A7A800CF7C0B /* Album_like_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E47E737D1AA1A7A800CF7C0B /* Album_like_icon@2x.png */; };
57+
E4A581311BA801D600BA55F6 /* customAvatarDefault@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E4A581301BA801D600BA55F6 /* customAvatarDefault@2x.png */; };
5758
E4A79B621B6B5319006B806F /* MessageDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70A6A1741B669FB9005C2D21 /* MessageDisplayKit.framework */; };
5859
E4B290091A888A5100CAC4C8 /* XHAlbumOperationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E4B290081A888A5100CAC4C8 /* XHAlbumOperationView.m */; };
5960
E4CC32281A8B552500D536E3 /* XHCustomCellDemoMessageTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E4CC32271A8B552500D536E3 /* XHCustomCellDemoMessageTableViewController.m */; };
@@ -423,6 +424,7 @@
423424
E47E73791AA19FB800CF7C0B /* XHAlbumLikesCommentsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHAlbumLikesCommentsView.m; sourceTree = "<group>"; };
424425
E47E737B1AA1A37600CF7C0B /* Album_likes_comments_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Album_likes_comments_background@2x.png"; sourceTree = "<group>"; };
425426
E47E737D1AA1A7A800CF7C0B /* Album_like_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Album_like_icon@2x.png"; sourceTree = "<group>"; };
427+
E4A581301BA801D600BA55F6 /* customAvatarDefault@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "customAvatarDefault@2x.png"; sourceTree = "<group>"; };
426428
E4B290071A888A5100CAC4C8 /* XHAlbumOperationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHAlbumOperationView.h; sourceTree = "<group>"; };
427429
E4B290081A888A5100CAC4C8 /* XHAlbumOperationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XHAlbumOperationView.m; sourceTree = "<group>"; };
428430
E4CC32261A8B552500D536E3 /* XHCustomCellDemoMessageTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XHCustomCellDemoMessageTableViewController.h; sourceTree = "<group>"; };
@@ -931,6 +933,7 @@
931933
F7D24DF61A4D0EB20015764B /* ExampleResources */ = {
932934
isa = PBXGroup;
933935
children = (
936+
E4A581301BA801D600BA55F6 /* customAvatarDefault@2x.png */,
934937
E4EE99F41B975FAA00866998 /* CellBlueSelected@2x.png */,
935938
E4EE99F51B975FAA00866998 /* CellGraySelected@2x.png */,
936939
E4EE99F61B975FAA00866998 /* CellNotSelected@2x.png */,
@@ -1940,6 +1943,7 @@
19401943
F7D24EC31A4D0EB30015764B /* VoiceSearchFeedback008@2x.png in Resources */,
19411944
E4EE9A411B975FAB00866998 /* sharemore_wxtalk@2x.png in Resources */,
19421945
F7D24F3F1A4D0EB30015764B /* emotion6.gif in Resources */,
1946+
E4A581311BA801D600BA55F6 /* customAvatarDefault@2x.png in Resources */,
19431947
70A6A1EC1B66A05D005C2D21 /* keyboard@2x.png in Resources */,
19441948
F7D24F4A1A4D0EB30015764B /* dgame0.png in Resources */,
19451949
70A6A1FB1B66A05D005C2D21 /* ReceiverVoiceNodePlaying@2x.png in Resources */,

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Controllers/XHMessageRootViewController/XHMessageRootViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
268268
} else {
269269
cell.textLabel.text = (indexPath.row % 2) ? @"曾宪华" : @"杨仁捷";
270270
cell.detailTextLabel.text = self.dataSource[indexPath.row];
271-
cell.imageView.image = [UIImage imageNamed:@"avatar"];
271+
cell.imageView.image = [UIImage imageNamed:@"customAvatarDefault"];
272272
}
273273
}
274274

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/ExampleResources/customAvatarDefault@2x.png‎

12.7 KB
Loading

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHConfigurationHelper.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ extern NSString *kXHMessageInputViewKeyboardHLImageNameKey;
2020
extern NSString *kXHMessageInputViewEmotionNormalImageNameKey;
2121
extern NSString *kXHMessageInputViewEmotionHLImageNameKey;
2222
extern NSString *kXHMessageInputViewBackgroundImageNameKey;
23+
extern NSString *kXHMessageInputViewBackgroundColorKey;
24+
extern NSString *kXHMessageInputViewBorderColorKey;
25+
extern NSString *kXHMessageInputViewBorderWidthKey;
26+
extern NSString *kXHMessageInputViewCornerRadiusKey;
27+
extern NSString *kXHMessageInputViewPlaceHolderTextColorKey;
28+
extern NSString *kXHMessageInputViewPlaceHolderKey;
29+
extern NSString *kXHMessageInputViewTextColorKey;
30+
2331

2432
// (Message Table Style Key)
2533
extern NSString *kXHMessageTablePlaceholderImageNameKey;

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/Headers/XHShareMenuItem.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
*/
2424
@property (nonatomic, copy) NSString *title;
2525

26+
@property (nonatomic, strong) UIColor *titleColor;
27+
28+
@property (nonatomic, strong) UIFont *titleFont;
29+
2630
/**
2731
* 根据正常图片和标题初始化一个Model对象
2832
*
@@ -34,4 +38,8 @@
3438
- (instancetype)initWithNormalIconImage:(UIImage *)normalIconImage
3539
title:(NSString *)title;
3640

41+
- (instancetype)initWithNormalIconImage:(UIImage *)normalIconImage
42+
title:(NSString *)title
43+
titleColor:(UIColor *)titleColor
44+
titleFont:(UIFont *)titleFont;
3745
@end

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/MessageDisplayKit‎

18 KB
Binary file not shown.

‎Example/MessageDisplayKitWeChatExample/MessageDisplayKitWeChatExample/Vendor/MessageDisplayKit/MessageDisplayKit.framework/_CodeSignature/CodeResources‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
</data>
147147
<key>Headers/XHConfigurationHelper.h</key>
148148
<data>
149-
qLy70wfJHYpTJKIvbrlssK8gcfc=
149+
gYxyEDIS1a6uCwTVF8n2z09cxow=
150150
</data>
151151
<key>Headers/XHDisplayEmotionViewController.h</key>
152152
<data>
@@ -270,7 +270,7 @@
270270
</data>
271271
<key>Headers/XHShareMenuItem.h</key>
272272
<data>
273-
BuG4H473yYDZw6fIhwBeXMB+H1o=
273+
7vVw6L0a2LxoCHKm1In4Z5TyXlI=
274274
</data>
275275
<key>Headers/XHShareMenuView.h</key>
276276
<data>
@@ -691,7 +691,7 @@
691691
</data>
692692
<key>Headers/XHConfigurationHelper.h</key>
693693
<data>
694-
qLy70wfJHYpTJKIvbrlssK8gcfc=
694+
gYxyEDIS1a6uCwTVF8n2z09cxow=
695695
</data>
696696
<key>Headers/XHDisplayEmotionViewController.h</key>
697697
<data>
@@ -815,7 +815,7 @@
815815
</data>
816816
<key>Headers/XHShareMenuItem.h</key>
817817
<data>
818-
BuG4H473yYDZw6fIhwBeXMB+H1o=
818+
7vVw6L0a2LxoCHKm1In4Z5TyXlI=
819819
</data>
820820
<key>Headers/XHShareMenuView.h</key>
821821
<data>

‎MessageDisplayKit/Classes/Common/XHConfigurationHelper.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ extern NSString *kXHMessageInputViewKeyboardHLImageNameKey;
2020
extern NSString *kXHMessageInputViewEmotionNormalImageNameKey;
2121
extern NSString *kXHMessageInputViewEmotionHLImageNameKey;
2222
extern NSString *kXHMessageInputViewBackgroundImageNameKey;
23+
extern NSString *kXHMessageInputViewBackgroundColorKey;
2324
extern NSString *kXHMessageInputViewBorderColorKey;
2425
extern NSString *kXHMessageInputViewBorderWidthKey;
2526
extern NSString *kXHMessageInputViewCornerRadiusKey;

‎MessageDisplayKit/Classes/Common/XHConfigurationHelper.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
NSString *kXHMessageInputViewEmotionNormalImageNameKey = @"com.HUAJIE.MDK.XHMessageInputViewEmotionNormalImageNameKey";
2121
NSString *kXHMessageInputViewEmotionHLImageNameKey = @"com.HUAJIE.MDK.XHMessageInputViewEmotionHLImageNameKey";
2222
NSString *kXHMessageInputViewBackgroundImageNameKey = @"com.HUAJIE.MDK.XHMessageInputViewBackgroundImageNameKey";
23+
NSString *kXHMessageInputViewBackgroundColorKey = @"com.HUAJIE.MDK.XHMessageInputViewBackgroundColorKey";
2324
NSString *kXHMessageInputViewBorderColorKey = @"com.HUAJIE.MDK.XHMessageInputViewBorderColorKey";
2425
NSString *kXHMessageInputViewBorderWidthKey = @"com.HUAJIE.MDK.XHMessageInputViewBorderWidthKey";
2526
NSString *kXHMessageInputViewCornerRadiusKey = @"com.HUAJIE.MDK.XHMessageInputViewCornerRadiusKey";

‎MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,13 @@ - (void)setupMessageInputViewBarWithStyle:(XHMessageInputViewStyle)style {
408408
// 配置不同iOS SDK版本的样式
409409
switch (style) {
410410
case XHMessageInputViewStyleFlat: {
411-
NSString *inputViewBackgroundImageName = [[XHConfigurationHelper appearance].messageInputViewStyle objectForKey:kXHMessageInputViewBackgroundImageNameKey];
412-
if (!inputViewBackgroundImageName) {
413-
inputViewBackgroundImageName = @"input-bar-flat";
411+
UIColor *inputBackgroundColor = [XHConfigurationHelper appearance].messageInputViewStyle[kXHMessageInputViewBackgroundColorKey];
412+
NSString *inputViewBackgroundImageName = nil;
413+
if (!inputBackgroundColor) {
414+
inputViewBackgroundImageName = [[XHConfigurationHelper appearance].messageInputViewStyle objectForKey:kXHMessageInputViewBackgroundImageNameKey];
415+
if (!inputViewBackgroundImageName) {
416+
inputViewBackgroundImageName = @"input-bar-flat";
417+
}
414418
}
415419

416420
UIColor *borderColor = [[XHConfigurationHelper appearance].messageInputViewStyle objectForKey:kXHMessageInputViewBorderColorKey];
@@ -431,8 +435,12 @@ - (void)setupMessageInputViewBarWithStyle:(XHMessageInputViewStyle)style {
431435
_inputTextView.layer.borderColor = borderColor.CGColor;
432436
_inputTextView.layer.borderWidth = borderWidth;
433437
_inputTextView.layer.cornerRadius = cornerRadius;
434-
self.image = [[UIImage imageNamed:inputViewBackgroundImageName] resizableImageWithCapInsets:UIEdgeInsetsMake(2.0f, 0.0f, 0.0f, 0.0f)
435-
resizingMode:UIImageResizingModeTile];
438+
if (inputBackgroundColor) {
439+
self.backgroundColor = inputBackgroundColor;
440+
} else {
441+
self.image = [[UIImage imageNamed:inputViewBackgroundImageName] resizableImageWithCapInsets:UIEdgeInsetsMake(2.0f, 0.0f, 0.0f, 0.0f)
442+
resizingMode:UIImageResizingModeTile];
443+
}
436444
break;
437445
}
438446
default:

0 commit comments

Comments
 (0)