From eec25c6814d172761f758ecbceadd0044e0170c6 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Nov 2014 11:08:58 +0800 Subject: [PATCH 1/2] add gitignore --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3c2d59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? +# +Pods/ + +.DS_Store +*/.DS_Store From 13215d130ecd7108c9f4f4cf06f1bbc51fda61cb Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Nov 2014 11:11:55 +0800 Subject: [PATCH 2/2] fix a typo --- TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.h | 2 +- TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.m | 2 +- TeamTalk/IOSDuoduo/Module/Messages/DDMessageModule.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.h b/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.h index d84dc6a..dfb1eab 100644 --- a/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.h +++ b/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.h @@ -61,7 +61,7 @@ typedef void(^DDGetLastestCommodityMessageCompletion)(DDMessageEntity* message); * @param sessionID sessionID * @param completion 完成获取最新的消息 */ -- (void)getLastestMessageForSessionID:(NSString*)sessionID completion:(DDDBGetLastestMessageCompletion)completion; +- (void)getLatestMessageForSessionID:(NSString*)sessionID completion:(DDDBGetLastestMessageCompletion)completion; /** * 在|databaseMessageQueue|执行查询操作，分页获取聊天记录 diff --git a/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.m b/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.m index b1ea549..2039f3c 100644 --- a/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.m +++ b/TeamTalk/IOSDuoduo/Module/DataBase/DDDatabaseUtil.m @@ -293,7 +293,7 @@ - (void)getLasetCommodityTypeImageForSession:(NSString*)sessionID completion:(DD }); } -- (void)getLastestMessageForSessionID:(NSString*)sessionID completion:(DDDBGetLastestMessageCompletion)completion +- (void)getLatestMessageForSessionID:(NSString*)sessionID completion:(DDDBGetLastestMessageCompletion)completion { dispatch_async(self.databaseMessageQueue, ^{ if ([_database tableExists:TABLE_MESSAGE]) diff --git a/TeamTalk/IOSDuoduo/Module/Messages/DDMessageModule.m b/TeamTalk/IOSDuoduo/Module/Messages/DDMessageModule.m index 1b1e605..ffa6ee9 100644 --- a/TeamTalk/IOSDuoduo/Module/Messages/DDMessageModule.m +++ b/TeamTalk/IOSDuoduo/Module/Messages/DDMessageModule.m @@ -87,7 +87,7 @@ - (void)getLastMessageForSessionID:(NSString*)sessionID completion:(GetLastestMe return; } //没有未读消息，读数据库 - [[DDDatabaseUtil instance] getLastestMessageForSessionID:sessionID completion:^(DDMessageEntity *message, NSError *error) { + [[DDDatabaseUtil instance] getLatestMessageForSessionID:sessionID completion:^(DDMessageEntity *message, NSError *error) { completion(message); }]; }