diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj
index adc26ed..d7a538e 100644
--- a/Ash_AWord.xcodeproj/project.pbxproj
+++ b/Ash_AWord.xcodeproj/project.pbxproj
@@ -3150,7 +3150,7 @@
);
GCC_PREFIX_HEADER = Ash_AWord/PrefixHeader.pch;
INFOPLIST_FILE = Ash_AWord/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -3182,7 +3182,7 @@
);
GCC_PREFIX_HEADER = Ash_AWord/PrefixHeader.pch;
INFOPLIST_FILE = Ash_AWord/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index f067091..83d1654 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -566,7 +566,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist
index 9e8590e..37a7cd2 100644
--- a/Ash_AWord/Info.plist
+++ b/Ash_AWord/Info.plist
@@ -70,7 +70,7 @@
CFBundleVersion
- 7
+ 8
LSRequiresIPhoneOS
NSLocationWhenInUseUsageDescription
diff --git a/Ash_AWord/Utility/Network/BaseViewModel.m b/Ash_AWord/Utility/Network/BaseViewModel.m
index b864c7e..1205777 100644
--- a/Ash_AWord/Utility/Network/BaseViewModel.m
+++ b/Ash_AWord/Utility/Network/BaseViewModel.m
@@ -7,7 +7,8 @@
//
#import "BaseViewModel.h"
-
+#import "AppDelegate.h"
+#import "MainViewController.h"
@implementation BaseViewModel
+ (NSDictionary *)JSONKeyPathsByPropertyKey {
return @{
@@ -23,8 +24,15 @@
self = [super initWithDictionary:dictionaryValue error:error];
if (self != nil)
{
- [AWordUser sharedInstance].notReadCommentNum = _notReadCommentNum;
- [AWordUser sharedInstance].myNewFollowerCount = _myNewFollowerCount;
+ if (_notReadCommentNum!=[AWordUser sharedInstance].notReadCommentNum || _myNewFollowerCount!=[AWordUser sharedInstance].myNewFollowerCount) {
+ [AWordUser sharedInstance].notReadCommentNum = _notReadCommentNum;
+ [AWordUser sharedInstance].myNewFollowerCount = _myNewFollowerCount;
+ [((AppDelegate*)[UIApplication sharedApplication].delegate).mainViewController setupUnreadMessageCount];
+ }else{
+ [AWordUser sharedInstance].notReadCommentNum = _notReadCommentNum;
+ [AWordUser sharedInstance].myNewFollowerCount = _myNewFollowerCount;
+ }
+
}
return self;
}
diff --git a/Ash_AWord/ViewControllers/Main/MainViewController.m b/Ash_AWord/ViewControllers/Main/MainViewController.m
index ae71275..1739114 100644
--- a/Ash_AWord/ViewControllers/Main/MainViewController.m
+++ b/Ash_AWord/ViewControllers/Main/MainViewController.m
@@ -15,6 +15,7 @@
#import "CallViewController.h"
#import "EMCDDeviceManager.h"
#import "AppDelegate.h"
+#import "UserViewModel.h"
@interface MainViewController ()
{
UINavigationController* _noteNav;
@@ -436,10 +437,21 @@ static NSString *kMessageType = @"MessageType";
}
if (!isShowPicker){
- [[EaseMob sharedInstance].callManager removeDelegate:self];
- CallViewController *callController = [[CallViewController alloc] initWithSession:callSession isIncoming:YES withName:@"" withAvatar:@""];
- callController.modalPresentationStyle = UIModalPresentationOverFullScreen;
- [self presentViewController:callController animated:NO completion:nil];
+
+ PropertyEntity* pro = [UserViewModel requireUserInfoWithTargetUid:callSession.sessionChatter];
+ [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
+ UserViewModel* userViewModel = (UserViewModel*)viewModel;
+ if ([userViewModel success]) {
+
+ [[EaseMob sharedInstance].callManager removeDelegate:self];
+ CallViewController *callController = [[CallViewController alloc] initWithSession:callSession isIncoming:YES withName:userViewModel.userInfo.name withAvatar:userViewModel.userInfo.figureurl];
+ callController.modalPresentationStyle = UIModalPresentationOverFullScreen;
+ [[AppDelegate visibleViewController].navigationController presentViewController:callController animated:NO completion:nil];
+ }
+ } failedBlock:nil];
+
+
+
}
} while (0);
diff --git a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m
index e2223df..671d9d1 100644
--- a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m
+++ b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m
@@ -129,6 +129,8 @@
}
return ;
}
+ _text_Voice = [(MessageViewModel*)viewModel text_voice];
+
[self initView];
[self loadData];
[self requirePraiseUser];