Skip to content

Commit 7249190

Browse files
sumengsumeng
sumeng
authored and
sumeng
committed
Merge remote-tracking branch 'upstream/master'
2 parents caccf28 + 376caa5 commit 7249190

8 files changed

Lines changed: 272 additions & 227 deletions

File tree

‎Coding_iOS/Coding_iOS-Prefix.pch.example‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@
4848

4949
//友盟统计
5050
#define kUmeng_AppKey @""
51-
#define kUmeng_Event_Request @""
51+
#define kUmeng_Event_Request_Notification @"Request_Notification"
52+
#define kUmeng_Event_Request_RootList @"Request_RootList"
53+
#define kUmeng_Event_Request_Get @"Request_Get"
54+
#define kUmeng_Event_Request_ActionOfServer @"Request_ActionOfServer"
55+
#define kUmeng_Event_Request_ActionOfLocal @"Request_ActionOfLocal"
5256

5357
//信鸽推送
5458
#define kXGPush_Id 123456

‎Coding_iOS/Controllers/RootControllers/Project_RootViewController.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel
193193

194194
#pragma mark VC
195195
-(void)addItemClicked:(id)sender{
196+
[MobClick event:kUmeng_Event_Request_ActionOfLocal label:@"快捷创建"];
197+
196198
NSArray *menuItems = @[
197199
[MenuItem itemWithTitle:@"项目" iconName:@"pop_Project" index:0],
198200
[MenuItem itemWithTitle:@"任务" iconName:@"pop_Task" index:1],
@@ -208,6 +210,8 @@ -(void)addItemClicked:(id)sender{
208210
}
209211
@weakify(self);
210212
_myPopMenu.didSelectedItemCompletion = ^(MenuItem *selectedItem){
213+
[MobClick event:kUmeng_Event_Request_ActionOfLocal label:[NSString stringWithFormat:@"快捷创建_%ld", (long)selectedItem.index]];
214+
211215
@strongify(self);
212216
switch (selectedItem.index) {
213217
case 0:

‎Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ - (void)refreshBanner{
195195
}
196196

197197
- (void)goToBanner:(CodingBanner *)tapedBanner{
198+
[MobClick event:kUmeng_Event_Request_ActionOfLocal label:@"冒泡列表_点击Banner"];
199+
198200
[self analyseLinkStr:tapedBanner.link];
199201
}
200202

‎Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ - (void)beginButtonClicked:(id)sender{
189189
}
190190

191191
- (void)addOneAuthURL:(OTPAuthURL *)authURL{
192+
[MobClick event:kUmeng_Event_Request_ActionOfLocal label:@"2FA_扫描成功"];
193+
192194
BOOL alreadyHave = NO;
193195
for (OTPAuthURL *item in self.authURLs) {
194196
if ([authURL.name isEqualToString:item.name]) {

‎Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ - (BOOL)saveToKeychain {
227227
NSDictionary *query = [self keychainQuery];
228228
status = SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge CFDictionaryRef)attributes);
229229
}
230+
if (status == noErr) {
231+
[MobClick event:kUmeng_Event_Request_ActionOfLocal label:@"2FA_录入成功"];
232+
}
230233
return status == noErr;
231234
}
232235

‎Coding_iOS/Models/ProjectActivities.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ + (ProjectActivities *)proActivitiesWithPro:(Project *)project user:(User *)user
7171

7272
proActs.curUser = user;
7373
proActs.user_id = user.id;
74-
74+
proActs.type = @"user";
75+
7576
return proActs;
7677
}
7778

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ typedef NS_ENUM(NSUInteger, VerifyType){
8484
- (void)request_MRPRAccept:(MRPR *)curMRPR andBlock:(void (^)(id data, NSError *error))block;
8585
- (void)request_MRPRRefuse:(MRPR *)curMRPR andBlock:(void (^)(id data, NSError *error))block;
8686
- (void)request_MRPRCancel:(MRPR *)curMRPR andBlock:(void (^)(id data, NSError *error))block;
87-
- (void)request_FileLineChanges_WithPath:(NSString *)path params:(NSDictionary *)params andBlock:(void (^)(id data, NSError *error))block;
8887
- (void)request_CommitInfo_WithUserGK:(NSString *)userGK projectName:(NSString *)projectName commitId:(NSString *)commitId andBlock:(void (^)(CommitInfo *data, NSError *error))block;
8988
- (void)request_PostCommentWithPath:(NSString *)path params:(NSDictionary *)params andBlock:(void (^)(id data, NSError *error))block;
9089
- (void)request_DeleteLineNote:(NSNumber *)lineNoteId inProject:(NSString *)projectName ofUser:(NSString *)userGK andBlock:(void (^)(id data, NSError *error))block;
9190

9291
//File
9392
- (void)request_Folders:(ProjectFolders *)folders inProject:(Project *)project andBlock:(void (^)(id data, NSError *error))block;
94-
- (void)request_RefreshCountInFolders:(ProjectFolders *)folders inProject:(Project *)project andBlock:(void (^)(id data, NSError *error))block;
9593
- (void)request_FilesInFolder:(ProjectFolder *)folder andBlock:(void (^)(id data, NSError *error))block;
9694
- (void)request_DeleteFolder:(ProjectFolder *)folder andBlock:(void (^)(id data, NSError *error))block;
9795
- (void)request_RenameFolder:(ProjectFolder *)folder andBlock:(void (^)(id data, NSError *error))block;
@@ -119,7 +117,6 @@ typedef NS_ENUM(NSUInteger, VerifyType){
119117
- (void)request_EditTask:(Task *)task withTags:(NSMutableArray *)selectedTags andBlock:(void (^)(id data, NSError *error))block;
120118
- (void)request_ChangeTaskStatus:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
121119
- (void)request_TaskDetail:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
122-
- (void)request_CommentListOfTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
123120
- (void)request_ActivityListOfTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
124121
- (void)request_DoCommentToTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
125122
- (void)request_DeleteComment:(TaskComment *)comment ofTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
@@ -191,11 +188,6 @@ typedef NS_ENUM(NSUInteger, VerifyType){
191188
- (void)request_ReadMeOFProject:(Project *)project andBlock:(void (^)(id data, NSError *error))block;
192189

193190
//Image
194-
- (void)uploadUserIconImage:(UIImage *)image
195-
successBlock:(void (^)(NSString *imagePath))success
196-
failureBlock:(void (^)(NSError *error))failure
197-
progerssBlock:(void (^)(CGFloat progressValue))progress;
198-
199191
- (void)uploadTweetImage:(UIImage *)image
200192
doneBlock:(void (^)(NSString *imagePath, NSError *error))done
201193
progerssBlock:(void (^)(CGFloat progressValue))progress;

0 commit comments

Comments
 (0)