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 82d65d9..cf2aa48 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -328,6 +328,7 @@
continueAfterRunningActions = "No"
symbolName = "-[NoteViewController loadData]"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
timestampString = "449747725.438284"
startingColumnNumber = "9223372036854775807"
@@ -342,6 +343,7 @@
continueAfterRunningActions = "No"
symbolName = "__30-[NoteViewController loadData]_block_invoke"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
timestampString = "449747725.438437"
startingColumnNumber = "9223372036854775807"
@@ -566,6 +568,7 @@
continueAfterRunningActions = "No"
symbolName = "__73-[LoginViewController loginWithOpenId:withName:withGender:withFigureUrl:]_block_invoke"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Login/LoginViewController.m"
timestampString = "450602465.012589"
startingColumnNumber = "9223372036854775807"
@@ -580,6 +583,7 @@
continueAfterRunningActions = "No"
symbolName = "__73-[LoginViewController loginWithOpenId:withName:withGender:withFigureUrl:]_block_invoke"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Login/LoginViewController.m"
timestampString = "450602465.012886"
startingColumnNumber = "9223372036854775807"
@@ -594,6 +598,7 @@
continueAfterRunningActions = "No"
symbolName = "__73-[LoginViewController loginWithOpenId:withName:withGender:withFigureUrl:]_block_invoke163"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Login/LoginViewController.m"
timestampString = "450602465.013064"
startingColumnNumber = "9223372036854775807"
@@ -642,6 +647,7 @@
continueAfterRunningActions = "No"
symbolName = "-[LoginViewController loginWithOpenId:withName:withGender:withFigureUrl:]"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Login/LoginViewController.m"
timestampString = "450602465.020671"
startingColumnNumber = "9223372036854775807"
@@ -656,6 +662,7 @@
continueAfterRunningActions = "No"
symbolName = "__73-[LoginViewController loginWithOpenId:withName:withGender:withFigureUrl:]_block_invoke"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Login/LoginViewController.m"
timestampString = "450602465.021061"
startingColumnNumber = "9223372036854775807"
@@ -864,6 +871,7 @@
continueAfterRunningActions = "No"
symbolName = "-[MessagePublishViewController publish]"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m"
timestampString = "450621202.660591"
startingColumnNumber = "9223372036854775807"
@@ -878,6 +886,7 @@
continueAfterRunningActions = "No"
symbolName = "__39-[MessagePublishViewController publish]_block_invoke"
moduleName = "Ash_AWord"
+ usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m"
timestampString = "450621202.660913"
startingColumnNumber = "9223372036854775807"
@@ -1305,5 +1314,21 @@
landmarkType = "5">
+
+
+
+
diff --git a/Ash_AWord/AppDelegate.m b/Ash_AWord/AppDelegate.m
index 14475d4..7dbd089 100644
--- a/Ash_AWord/AppDelegate.m
+++ b/Ash_AWord/AppDelegate.m
@@ -91,8 +91,8 @@
{
// [WXApi registerApp:kWXAppId];
[UMSocialData setAppKey:kUmengAppkey];
- [UMSocialWechatHandler setWXAppId:kWXAppId appSecret:kWXAppSecret url:@"http://www.xiaoyu.com"];
- [UMSocialQQHandler setQQWithAppId:kQQAppId appKey:kQQAppSecret url:@"http://www.xiaoyu.com"];
+ [UMSocialWechatHandler setWXAppId:kWXAppId appSecret:kWXAppSecret url:@"http://121.43.150.13/QuestionServer/home.html"];
+ [UMSocialQQHandler setQQWithAppId:kQQAppId appKey:kQQAppSecret url:@"http://121.43.150.13/QuestionServer/home.html"];
[UMSocialSinaHandler openSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
[MobClick startWithAppkey:kUmengAppkey reportPolicy:REALTIME channelId:@"App Store"];
diff --git a/Ash_AWord/Config/Common.h b/Ash_AWord/Config/Common.h
index 56eaf20..9393149 100644
--- a/Ash_AWord/Config/Common.h
+++ b/Ash_AWord/Config/Common.h
@@ -87,6 +87,8 @@
#define kUmen_sinalogin @"sinalogin"
#define kUmen_note @"note"
#define kUmen_addnote @"addnote"
+#define kUmen_message @"message"
+#define kUmen_addmessage @"addmessage"
#define kUmen_logout @"logout"
/**
* 调整图片的宽度
diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist
index 7a54975..09aa447 100644
--- a/Ash_AWord/Info.plist
+++ b/Ash_AWord/Info.plist
@@ -62,7 +62,7 @@
CFBundleVersion
- 2
+ 4
LSRequiresIPhoneOS
UILaunchStoryboardName
diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m
index eb2d3a6..61fca32 100644
--- a/Ash_AWord/ViewControllers/Login/LoginViewController.m
+++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m
@@ -51,7 +51,7 @@
- (IBAction)qqLoginBtnClick:(id)sender
{
- [MobClick event:kUmen_qqlogin attributes:nil];
+ [MobClick event:kUmen_qqlogin];
UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToQQ];
@@ -78,7 +78,7 @@
}
- (IBAction)sianLoginBtnClick:(id)sender {
- [MobClick event:kUmen_sinalogin attributes:nil];
+ [MobClick event:kUmen_sinalogin];
UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToSina];
@@ -110,7 +110,7 @@
- (IBAction)weixinLoginBtnClick:(id)sender
{
- [MobClick event:kUmen_wxlogin attributes:nil];
+ [MobClick event:kUmen_wxlogin];
UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToWechatSession];
diff --git a/Ash_AWord/ViewControllers/Main/MainViewController.m b/Ash_AWord/ViewControllers/Main/MainViewController.m
index d118c89..4639267 100644
--- a/Ash_AWord/ViewControllers/Main/MainViewController.m
+++ b/Ash_AWord/ViewControllers/Main/MainViewController.m
@@ -34,7 +34,6 @@
}
self.viewControllers = @[_noteNav, _messageNav, _myNav];
-// self.viewControllers = @[_noteNav, _myNav];
}
return self;
diff --git a/Ash_AWord/ViewControllers/Main/MessageViewController.m b/Ash_AWord/ViewControllers/Main/MessageViewController.m
index 8bcb0f5..18fd29f 100644
--- a/Ash_AWord/ViewControllers/Main/MessageViewController.m
+++ b/Ash_AWord/ViewControllers/Main/MessageViewController.m
@@ -66,7 +66,7 @@
}
-(void)loadData
{
- [MobClick event:kUmen_note attributes:nil];
+ [MobClick event:kUmen_message];
PropertyEntity* pro = [MessageViewModel requireWithOrder_by:Order_by_Time withPage:_page withPage_size:20];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
diff --git a/Ash_AWord/ViewControllers/Main/NoteViewController.m b/Ash_AWord/ViewControllers/Main/NoteViewController.m
index 9d843dd..0ecab5b 100644
--- a/Ash_AWord/ViewControllers/Main/NoteViewController.m
+++ b/Ash_AWord/ViewControllers/Main/NoteViewController.m
@@ -82,7 +82,7 @@
}
-(void)loadData
{
- [MobClick event:kUmen_note attributes:nil];
+ [MobClick event:kUmen_note];
PropertyEntity* pro = [NoteViewModel requireWithOrder_by:Order_by_Time withPage:_page withPage_size:20];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
diff --git a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m
index dd88929..8d41894 100644
--- a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m
+++ b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m
@@ -71,7 +71,7 @@
-(void)publish
{
if (_contentTextView.text.length>0 && _avPlay.duration>0) {
- [MobClick event:kUmen_addnote attributes:nil];
+ [MobClick event:kUmen_addmessage];
NSData *audioData = [NSData dataWithContentsOfFile:_fileUrl];
if (audioData == nil) {
diff --git a/Ash_AWord/ViewControllers/My/MyMessageViewController.m b/Ash_AWord/ViewControllers/My/MyMessageViewController.m
index 598b2e1..b60521b 100644
--- a/Ash_AWord/ViewControllers/My/MyMessageViewController.m
+++ b/Ash_AWord/ViewControllers/My/MyMessageViewController.m
@@ -54,7 +54,7 @@
}
-(void)loadData
{
- [MobClick event:kUmen_note attributes:nil];
+ [MobClick event:kUmen_message];
PropertyEntity* pro = [MessageViewModel requireWithOrder_by:Order_by_Time withPage:_page withPage_size:20];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m
index db7afbe..9592bf1 100644
--- a/Ash_AWord/ViewControllers/My/SetUpViewController.m
+++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m
@@ -153,7 +153,7 @@
-(void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
{
if (buttonIndex == 1 &&alertView.tag == 101) {
- [MobClick event:kUmen_logout attributes:nil];
+ [MobClick event:kUmen_logout];
[AWordUser sharedInstance].isLogin = NO;
[AWordUser sharedInstance].uid = @"";
diff --git a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m
index 479ced7..fb14600 100644
--- a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m
+++ b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m
@@ -41,7 +41,7 @@
-(void)publish
{
if (_contentTextView.text.length>0 && _publishImage) {
- [MobClick event:kUmen_addnote attributes:nil];
+ [MobClick event:kUmen_addnote];
[MBProgressHUD hudWithView:self.view label:@"发布中"];
PropertyEntity* notePublishViewModel = [NotePublishViewModel requireAddNote:_contentTextView.text withImage:_publishImage];
diff --git a/Pods/EGOCache/EGOCache.h b/Pods/EGOCache/EGOCache.h
index 51f18de..ed66183 100755
--- a/Pods/EGOCache/EGOCache.h
+++ b/Pods/EGOCache/EGOCache.h
@@ -45,44 +45,44 @@
+ (nonnull instancetype)globalCache;
// Opitionally create a different EGOCache instance with it's own cache directory
-- (nonnull instancetype)initWithCacheDirectory:(NSString __nonnull*)cacheDirectory;
+- (nonnull instancetype)initWithCacheDirectory:(NSString * __nonnull )cacheDirectory;
- (void)clearCache;
-- (void)removeCacheForKey:(NSString __nonnull*)key;
+- (void)removeCacheForKey:(NSString * __nonnull )key;
-- (BOOL)hasCacheForKey:(NSString __nonnull*)key;
+- (BOOL)hasCacheForKey:(NSString * __nonnull )key;
-- (NSData* __nullable)dataForKey:(NSString __nonnull*)key;
-- (void)setData:(NSData __nonnull*)data forKey:(NSString __nonnull*)key;
-- (void)setData:(NSData __nonnull*)data forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (NSData* __nullable)dataForKey:(NSString * __nonnull )key;
+- (void)setData:(NSData * __nonnull )data forKey:(NSString * __nonnull )key;
+- (void)setData:(NSData * __nonnull )data forKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-- (NSString* __nullable)stringForKey:(NSString __nonnull*)key;
-- (void)setString:(NSString __nonnull*)aString forKey:(NSString __nonnull*)key;
-- (void)setString:(NSString __nonnull*)aString forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (NSString* __nullable)stringForKey:(NSString * __nonnull )key;
+- (void)setString:(NSString * __nonnull )aString forKey:(NSString * __nonnull )key;
+- (void)setString:(NSString * __nonnull )aString forKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-- (NSDate* __nullable)dateForKey:(NSString __nonnull*)key;
-- (NSArray __nonnull*)allKeys;
+- (NSDate* __nullable)dateForKey:(NSString * __nonnull )key;
+- (NSArray * __nonnull )allKeys;
#if TARGET_OS_IPHONE
-- (UIImage* __nullable)imageForKey:(NSString __nonnull*)key;
-- (void)setImage:(UIImage __nonnull*)anImage forKey:(NSString __nonnull*)key;
-- (void)setImage:(UIImage __nonnull*)anImage forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (UIImage* __nullable)imageForKey:(NSString * __nonnull )key;
+- (void)setImage:(UIImage * __nonnull )anImage forKey:(NSString * __nonnull )key;
+- (void)setImage:(UIImage * __nonnull )anImage forKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
#else
- (NSImage* __nullable)imageForKey:(NSString __nonnull*)key;
- (void)setImage:(NSImage __nonnull*)anImage forKey:(NSString __nonnull*)key;
- (void)setImage:(NSImage __nonnull*)anImage forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
#endif
-- (NSData* __nullable)plistForKey:(NSString __nonnull*)key;
-- (void)setPlist:(nonnull id)plistObject forKey:(NSString __nonnull*)key;
-- (void)setPlist:(nonnull id)plistObject forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (NSData* __nullable)plistForKey:(NSString * __nonnull )key;
+- (void)setPlist:(nonnull id)plistObject forKey:(NSString * __nonnull )key;
+- (void)setPlist:(nonnull id)plistObject forKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-- (void)copyFilePath:(NSString __nonnull*)filePath asKey:(NSString __nonnull*)key;
-- (void)copyFilePath:(NSString __nonnull*)filePath asKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (void)copyFilePath:(NSString * __nonnull )filePath asKey:(NSString * __nonnull )key;
+- (void)copyFilePath:(NSString * __nonnull )filePath asKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
-- (nullable id)objectForKey:(NSString __nonnull*)key;
-- (void)setObject:(nonnull id)anObject forKey:(NSString __nonnull*)key;
-- (void)setObject:(nonnull id)anObject forKey:(NSString __nonnull*)key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
+- (nullable id)objectForKey:(NSString * __nonnull )key;
+- (void)setObject:(nonnull id)anObject forKey:(NSString * __nonnull )key;
+- (void)setObject:(nonnull id)anObject forKey:(NSString * __nonnull )key withTimeoutInterval:(NSTimeInterval)timeoutInterval;
@property(nonatomic) NSTimeInterval defaultTimeoutInterval; // Default is 1 day
@end
\ No newline at end of file