diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj
index 7dbdbb0..0599373 100644
--- a/Ash_AWord.xcodeproj/project.pbxproj
+++ b/Ash_AWord.xcodeproj/project.pbxproj
@@ -1714,7 +1714,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -1749,7 +1749,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
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 5bc3be5..7c79c8d 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2146,5 +2146,37 @@
landmarkType = "5">
+
+
+
+
+
+
+
+
diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist
index c92aab9..375aafc 100644
--- a/Ash_AWord/Info.plist
+++ b/Ash_AWord/Info.plist
@@ -23,7 +23,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0
+ 2.0
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Ash_AWord/ViewControllers/Main/NoteViewController.m b/Ash_AWord/ViewControllers/Main/NoteViewController.m
index 1c21c02..9952f7b 100644
--- a/Ash_AWord/ViewControllers/Main/NoteViewController.m
+++ b/Ash_AWord/ViewControllers/Main/NoteViewController.m
@@ -131,8 +131,8 @@
DLog(@"%@",viewModel);
UpdateViewModel* updateViewModel = (UpdateViewModel*)viewModel;
if ([updateViewModel success]) {
- [AWordDefault setLastUpdateTime:now];
- if (updateViewModel.update==NO) {
+ if (updateViewModel.needUpdate==1) {
+ [AWordDefault setLastUpdateTime:now];
UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil message:updateViewModel.version_info delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确认", nil];
[alertView show];
}
diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m
index e1448e8..c6d2610 100644
--- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m
+++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m
@@ -14,6 +14,7 @@
#import "UserViewModel.h"
#import "CommentViewModel.h"
#import "CommentTableViewCell.h"
+#import "PraiseUserListViewController.h"
@interface NoteCommentViewController ()
{
NoteTableViewCell* _headView;
@@ -51,6 +52,15 @@
_commentGoodListCellTableViewCell = [Ash_UIUtil instanceXibView:@"CommentGoodListCellTableViewCell"];
_commentGoodListCellTableViewCell.frame = CGRectMake(0, height, kScreenWidth, 80);
+
+ __weak NoteCommentViewController* weakSelf = self;
+ [_commentGoodListCellTableViewCell setShowPraiseList:^(void){
+ PraiseUserListViewController *praiseUserListViewController = [[PraiseUserListViewController alloc] init];
+ praiseUserListViewController.hidesBottomBarWhenPushed = YES;
+ praiseUserListViewController.recordId = weakSelf.text_image.messageId;
+ [weakSelf.navigationController pushViewController:praiseUserListViewController animated:YES];
+ }
+ ];
[tableHeadView addSubview:_commentGoodListCellTableViewCell];
self.tableView.tableHeaderView = tableHeadView;
@@ -72,7 +82,6 @@
_commentTextView = [Ash_UIUtil instanceXibView:@"CommentTextView"];
_commentTextView.frame = self.view.frame;
- __weak id weakSelf = self;
[_commentTextView setComentComplete:^(){
_isFirstLoad = YES;
[weakSelf headerBeginRefreshing];
diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib
index 05e9194..3c5a166 100644
--- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib
+++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib
@@ -34,7 +34,7 @@