bug fix

WhoCall/Src/Telephony/WCAddressBook.m

@@ -71,7 +71,8 @@ - (void)reload:(ABAddressBookRef)addressBook
             for (CFIndex idxNumber = 0; idxNumber < ABMultiValueGetCount(phoneNumbers); idxNumber++) {
                 NSString *phoneNumber = (__bridge_transfer NSString *)ABMultiValueCopyValueAtIndex(phoneNumbers, idxNumber);
                 phoneNumber = [phoneNumber normalizedPhoneNumber];
-                self.allPhoneNumbers[phoneNumber] = personName;
+                if(personName!=nil && phoneNumber!=nil)
+                    self.allPhoneNumbers[phoneNumber] = personName;
             }
 
             CFRelease(phoneNumbers);

WhoCall/Src/Telephony/WCCall.h

@@ -11,6 +11,7 @@
 
 // private API
 typedef NS_ENUM(short, CTCallStatus) {
+    kCTCallStatusConnected = 1,
     kCTCallStatusCallIn = 4,
     kCTCallStatusHungUp = 5
 };

WhoCall/Src/Telephony/WCCallCenter.m

@@ -7,6 +7,7 @@
 //
 
 #import "WCCallCenter.h"
+@import AudioToolbox;
 
 // encrypted string's
 #define ENCSTR_kCTCallStatusChangeNotification  [@"n0AHD2SfoSA0LKE1p0AbLJ5aMH5iqTyznJAuqTyiot==" wcDecryptString]
@@ -138,6 +139,9 @@ static void callHandler(CFNotificationCenterRef center,
     NSDictionary *info = (__bridge NSDictionary *)(userInfo);
     CTCall *call = (CTCall *)info[ENCSTR_kCTCall];
     CTCallStatus status = (CTCallStatus)[info[ENCSTR_kCTCallStatus] shortValue];
+    if (status == kCTCallStatusConnected) {
+        AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+    }
 
     WCCallCenter *wcCenter = (__bridge WCCallCenter*)observer;
     [wcCenter handleCall:call withStatus:status];

WhoCall/Src/Telephony/WCCallInspector.m

@@ -153,6 +153,11 @@ - (void)notifyMessage:(NSString *)text forPhoneNumber:(NSString *)phoneNumber {
 }
 
 - (void)notifyMessage:(NSString *)text afterDealy:(NSTimeInterval)delay forPhoneNumber:(NSString *)phoneNumber {
+    UILocalNotification *notification=[[UILocalNotification alloc] init];
+    if (notification!=nil) {
+        notification.alertBody=[NSString stringWithFormat:@"%@-%@",text,phoneNumber];
+        [[UIApplication sharedApplication] presentLocalNotificationNow:notification];
+    }
     // 循环提醒，直到电话号码不匹配（来电挂断）
     dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC));
     dispatch_after(popTime, dispatch_get_main_queue(), ^(void){

WhoCall/Src/Telephony/WCPhoneLocator.m

@@ -80,8 +80,8 @@ - (NSString *)locationForPhoneNumber:(NSString *)phoneNumber
                 // 国内长途，首位是1、2则区号为两位，否则区号为3位
                 NSString *areacode;
                 if (   phoneNumber.length > 3
-                    && [phoneNumber characterAtIndex:1] == '1'
-                    && [phoneNumber characterAtIndex:1] == '2') {
+                    && ([phoneNumber characterAtIndex:1] == '1'
+                    || [phoneNumber characterAtIndex:1] == '2')) {
                     areacode = [phoneNumber substringWithRange:NSMakeRange(1, 2)];
                 } else if (phoneNumber.length > 4) {
                     areacode = [phoneNumber substringWithRange:NSMakeRange(1, 3)];

WhoCall/Src/WCAppDelegate.h

@@ -8,6 +8,18 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef MMPDLog
+#ifdef DEBUG
+#define MMPDLog(format, ...) NSLog((@"%s [Line %d] " format), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#else
+#define MMPDLog(...) do { } while (0)
+#endif
+#endif
+
+#ifndef MMPALog
+#define MMPALog(format, ...) NSLog((@"%s [Line %d] " format), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
 @interface WCAppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;