This commit is contained in:
Sunnyyoung 2018-01-09 18:20:37 +08:00
parent cd43c17a08
commit 8942723431
5 changed files with 8 additions and 8 deletions

View File

@ -1,7 +1,7 @@
PODS: PODS:
- GCDWebServer (3.4.1): - GCDWebServer (3.4.2):
- GCDWebServer/Core (= 3.4.1) - GCDWebServer/Core (= 3.4.2)
- GCDWebServer/Core (3.4.1) - GCDWebServer/Core (3.4.2)
- JRSwizzle (1.0) - JRSwizzle (1.0)
- YYModel (1.0.4) - YYModel (1.0.4)
@ -11,7 +11,7 @@ DEPENDENCIES:
- YYModel - YYModel
SPEC CHECKSUMS: SPEC CHECKSUMS:
GCDWebServer: 1db60034fe0e78a4a8524bd6c7cd97cd3c589870 GCDWebServer: 8d67ee9f634b4bb91eb4b8aee440318a5fc6debd
JRSwizzle: dd5ead5d913a0f29e7f558200165849f006bb1e3 JRSwizzle: dd5ead5d913a0f29e7f558200165849f006bb1e3
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30

View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BuildMachineOSBuild</key> <key>BuildMachineOSBuild</key>
<string>17C88</string> <string>17C205</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>

View File

@ -46,7 +46,7 @@
NSArray<WCContactData *> *results = ({ NSArray<WCContactData *> *results = ({
NSMutableArray<WCContactData *> *results = [NSMutableArray array]; NSMutableArray<WCContactData *> *results = [NSMutableArray array];
for (WCContactData *contact in contacts) { for (WCContactData *contact in contacts) {
BOOL isFriend = contact.m_uiFriendScene != 0; BOOL isOfficialAccount = (contact.m_uiCertificationFlag >> 0x3 & 0x1) == 1;
BOOL containsNickName = [contact.m_nsNickName.lowercaseString containsString:keyword]; BOOL containsNickName = [contact.m_nsNickName.lowercaseString containsString:keyword];
BOOL containsUsername = [contact.m_nsUsrName.lowercaseString containsString:keyword]; BOOL containsUsername = [contact.m_nsUsrName.lowercaseString containsString:keyword];
BOOL containsAliasName = [contact.m_nsAliasName.lowercaseString containsString:keyword]; BOOL containsAliasName = [contact.m_nsAliasName.lowercaseString containsString:keyword];
@ -54,7 +54,7 @@
BOOL containsNickNamePinyin = [contact.m_nsFullPY.lowercaseString containsString:keyword]; BOOL containsNickNamePinyin = [contact.m_nsFullPY.lowercaseString containsString:keyword];
BOOL containsRemarkPinyin = [contact.m_nsRemarkPYFull.lowercaseString containsString:keyword]; BOOL containsRemarkPinyin = [contact.m_nsRemarkPYFull.lowercaseString containsString:keyword];
BOOL matchRemarkShortPinyin = [contact.m_nsRemarkPYShort.lowercaseString isEqualToString:keyword]; BOOL matchRemarkShortPinyin = [contact.m_nsRemarkPYShort.lowercaseString isEqualToString:keyword];
if (isFriend && (containsNickName || containsUsername || containsAliasName || containsRemark || containsNickNamePinyin || containsRemarkPinyin || matchRemarkShortPinyin)) { if (!isOfficialAccount && (containsNickName || containsUsername || containsAliasName || containsRemark || containsNickNamePinyin || containsRemarkPinyin || matchRemarkShortPinyin)) {
[results addObject:contact]; [results addObject:contact];
} }
} }

View File

@ -43,7 +43,7 @@
@interface WCContactData : NSObject @interface WCContactData : NSObject
@property(nonatomic) unsigned int m_uiFriendScene; @property(nonatomic) unsigned int m_uiCertificationFlag;
@property(retain, nonatomic) NSString *m_nsNickName; @property(retain, nonatomic) NSString *m_nsNickName;
@property(retain, nonatomic) NSString *m_nsUsrName; @property(retain, nonatomic) NSString *m_nsUsrName;
@property(retain, nonatomic) NSString *m_nsAliasName; @property(retain, nonatomic) NSString *m_nsAliasName;