wushenghua/Ash_AWord
1
0
Fork 0
mirror of https://github.com/wu736139669/Ash_AWord.git synced 2026-08-05 05:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改部分bug

Browse Source
This commit is contained in:
wu736139669
2015-06-30 10:05:47 +08:00
parent 2e2e948368
commit 14159a109f
6 changed files with 117 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ash_AWord.xcodeproj/project.pbxproj
+2 -2
View File
@@ -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)",
Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+85 -5
View File
@@ -566,7 +566,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
@@ -579,6 +579,22 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m"
timestampString = "457322452.78287"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "149"
endingLineNumber = "149"
landmarkName = "-setupUnreadMessageCount"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -586,12 +602,76 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m"
timestampString = "457251081.335297"
timestampString = "457322452.78287"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "148"
endingLineNumber = "148"
landmarkName = "-setupUnreadMessageCount"
startingLineNumber = "287"
endingLineNumber = "287"
landmarkName = "-showNotificationWithMessage:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/AppDelegate.m"
timestampString = "457254554.420598"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "38"
endingLineNumber = "38"
landmarkName = "-application:didFinishLaunchingWithOptions:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/AppDelegate.m"
timestampString = "457254554.420598"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "138"
endingLineNumber = "138"
landmarkName = "-didReceiveRemoteNotification:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/AppDelegate.m"
timestampString = "457254554.420598"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "163"
endingLineNumber = "163"
landmarkName = "-application:handleOpenURL:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m"
timestampString = "457322452.78287"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "466"
endingLineNumber = "466"
landmarkName = "-callOutWithChatter:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
Ash_AWord/Info.plist
+1 -1
View File
@@ -70,7 +70,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>7</string>
<string>8</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationWhenInUseUsageDescription</key>
Ash_AWord/Utility/Network/BaseViewModel.m
+11 -3
View File
@@ -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;
}
Ash_AWord/ViewControllers/Main/MainViewController.m
+16 -4
View File
@@ -15,6 +15,7 @@
#import "CallViewController.h"
#import "EMCDDeviceManager.h"
#import "AppDelegate.h"
#import "UserViewModel.h"
@interface MainViewController ()<UIAlertViewDelegate, IChatManagerDelegate, EMCallManagerDelegate>
{
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);
Ash_AWord/ViewControllers/Message/MessageCommentViewController.m
+2
View File
@@ -129,6 +129,8 @@
}
return ;
}
_text_Voice = [(MessageViewModel*)viewModel text_voice];
[self initView];
[self loadData];
[self requirePraiseUser];