Skip to content

Commit 364949f

Browse files
wanghenghengwanghengheng
committed
删掉友盟推送相关的代码
1 parent 29ca507 commit 364949f

File tree

6 files changed

+0
-237
lines changed

6 files changed

+0
-237
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@
258258
4E996C071ABBF56A00C704F1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E996BFF1ABBF56A00C704F1 /* [email protected] */; };
259259
4E996C081ABBF56A00C704F1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E996C001ABBF56A00C704F1 /* [email protected] */; };
260260
4E996C091ABBF56A00C704F1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E996C011ABBF56A00C704F1 /* [email protected] */; };
261-
4EA679031A11F18A001A0324 /* libUMessage_Sdk_1.1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EA679011A11F18A001A0324 /* libUMessage_Sdk_1.1.0.a */; };
262261
4EA6790A1A1461C3001A0324 /* ProjectFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA679091A1461C3001A0324 /* ProjectFile.m */; };
263262
4EA6790D1A1461DC001A0324 /* ProjectFolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA6790C1A1461DC001A0324 /* ProjectFolder.m */; };
264263
4EA679131A1466A6001A0324 /* ProjectFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA679121A1466A6001A0324 /* ProjectFiles.m */; };
@@ -1117,8 +1116,6 @@
11171116
4E996BFF1ABBF56A00C704F1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
11181117
4E996C001ABBF56A00C704F1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
11191118
4E996C011ABBF56A00C704F1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1120-
4EA679011A11F18A001A0324 /* libUMessage_Sdk_1.1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libUMessage_Sdk_1.1.0.a; sourceTree = "<group>"; };
1121-
4EA679021A11F18A001A0324 /* UMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMessage.h; sourceTree = "<group>"; };
11221119
4EA679081A1461C3001A0324 /* ProjectFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectFile.h; sourceTree = "<group>"; };
11231120
4EA679091A1461C3001A0324 /* ProjectFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectFile.m; sourceTree = "<group>"; };
11241121
4EA6790B1A1461DC001A0324 /* ProjectFolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectFolder.h; sourceTree = "<group>"; };
@@ -1873,7 +1870,6 @@
18731870
8E47701A198770E700997D05 /* CoreData.framework in Frameworks */,
18741871
8E477018198770E700997D05 /* UIKit.framework in Frameworks */,
18751872
8E477014198770E700997D05 /* Foundation.framework in Frameworks */,
1876-
4EA679031A11F18A001A0324 /* libUMessage_Sdk_1.1.0.a in Frameworks */,
18771873
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */,
18781874
4EF818241B09D8D8005F974B /* WebP.framework in Frameworks */,
18791875
8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */,
@@ -2261,15 +2257,6 @@
22612257
path = userInfo;
22622258
sourceTree = "<group>";
22632259
};
2264-
4EA679001A11F18A001A0324 /* UMessage_Sdk_1.1.0 */ = {
2265-
isa = PBXGroup;
2266-
children = (
2267-
4EA679011A11F18A001A0324 /* libUMessage_Sdk_1.1.0.a */,
2268-
4EA679021A11F18A001A0324 /* UMessage.h */,
2269-
);
2270-
path = UMessage_Sdk_1.1.0;
2271-
sourceTree = "<group>";
2272-
};
22732260
4EA7F1381A6D192B00A046BD /* SDWebImage */ = {
22742261
isa = PBXGroup;
22752262
children = (
@@ -3353,7 +3340,6 @@
33533340
4E8765581A22E5B40090CFB9 /* SWTableViewCell */,
33543341
4E6BA2A91A1EE6AF005FD721 /* AFNetworking */,
33553342
4E91139D1A1C426000AC9431 /* ASProgressPopUpView */,
3356-
4EA679001A11F18A001A0324 /* UMessage_Sdk_1.1.0 */,
33573343
8E97CEBC1A0CB7E3006F9AD7 /* SMPageControl */,
33583344
8E97CE421A0A2DF8006F9AD7 /* AGEmojiKeyboard */,
33593345
8E59F0DC1A0098BA009A905F /* SVPullToRefresh */,
@@ -4625,7 +4611,6 @@
46254611
LIBRARY_SEARCH_PATHS = (
46264612
"$(inherited)",
46274613
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMENG",
4628-
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMessage_Sdk_1.1.0",
46294614
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
46304615
);
46314616
PRODUCT_NAME = Coding_iOS;
@@ -4659,7 +4644,6 @@
46594644
LIBRARY_SEARCH_PATHS = (
46604645
"$(inherited)",
46614646
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMENG",
4662-
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMessage_Sdk_1.1.0",
46634647
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
46644648
);
46654649
PRODUCT_NAME = Coding_iOS;

‎Coding_iOS/AppDelegate.m‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#import "AFNetworkActivityIndicatorManager.h"
2020
#import "Login.h"
2121
#import "UnReadManager.h"
22-
#import "UMessage.h"
2322
#import "XGPush.h"
2423
#import "EaseStartView.h"
2524
#import "BaseNavigationController.h"
@@ -98,12 +97,6 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
9897
// UMENG 统计
9998
[MobClick startWithAppkey:kUmeng_AppKey reportPolicy:BATCH channelId:nil];
10099

101-
// UMENG 推送
102-
//set AppKey and LaunchOptions
103-
[UMessage startWithAppkey:kUmeng_AppKey_Push launchOptions:launchOptions];
104-
[UMessage setBadgeClear:NO];
105-
[UMessage setLogEnabled:NO];
106-
107100
// 信鸽推送
108101
[XGPush startApp:kXGPush_Id appKey:kXGPush_Key];
109102
[Login setXGAccountWithCurUser];
@@ -168,9 +161,6 @@ - (void)applicationWillTerminate:(UIApplication *)application
168161
#pragma mark - Umeng Message
169162
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
170163
{
171-
[UMessage registerDeviceToken:deviceToken];
172-
[Login addUmengAliasWithCurUser:[Login isLogin]];
173-
174164
NSString * deviceTokenStr = [XGPush registerDevice:deviceToken];
175165
DebugLog(@"deviceTokenStr : %@", deviceTokenStr);
176166
}

‎Coding_iOS/Models/Login.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
+ (void)setPreUserEmail:(NSString *)emailStr;
2323
+ (NSString *)preUserEmail;
2424
+ (User *)curLoginUser;
25-
+ (void)addUmengAliasWithCurUser:(BOOL)add;
2625
+ (void)setXGAccountWithCurUser;
2726
+ (User *)userWithGlobaykeyOrEmail:(NSString *)textStr;
2827
+ (NSMutableDictionary *)readLoginDataList;

‎Coding_iOS/Models/Login.m‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
#import "Login.h"
10-
#import "UMessage.h"
1110
#import "XGPush.h"
1211
#import "AppDelegate.h"
1312

@@ -76,7 +75,6 @@ + (void)doLogin:(NSDictionary *)loginData{
7675
[defaults setObject:loginData forKey:kLoginUserDict];
7776
curLoginUser = [NSObject objectOfClass:@"User" fromJSON:loginData];
7877
[defaults synchronize];
79-
[Login addUmengAliasWithCurUser:YES];
8078
[Login setXGAccountWithCurUser];
8179

8280
[self saveLoginData:loginData];
@@ -127,16 +125,6 @@ + (User *)userWithGlobaykeyOrEmail:(NSString *)textStr{
127125
return nil;
128126
}
129127

130-
+ (void)addUmengAliasWithCurUser:(BOOL)add{
131-
User *user = [Login curLoginUser];
132-
if (user && user.global_key.length > 0) {
133-
NSString *global_key = user.global_key;
134-
//移除友盟推送的Alias
135-
[UMessage removeAlias:global_key type:kUmeng_MessageAliasTypeCoding response:^(id responseObject, NSError *error) {
136-
DebugLog(@"removeAlias--------responseObject:%@-------error:%@", responseObject, error.description);
137-
}];
138-
}
139-
}
140128
+ (void)setXGAccountWithCurUser{
141129
if ([self isLogin]) {
142130
User *user = [Login curLoginUser];
@@ -155,7 +143,6 @@ + (void)doLogout{
155143
[UIApplication sharedApplication].applicationIconBadgeNumber = 0;
156144
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
157145

158-
[Login addUmengAliasWithCurUser:NO];
159146
[defaults setObject:[NSNumber numberWithBool:NO] forKey:kLoginStatus];
160147
[defaults synchronize];
161148
[Login setXGAccountWithCurUser];

‎Coding_iOS/Vendor/UMessage_Sdk_1.1.0/UMessage.h‎

Lines changed: 0 additions & 197 deletions
This file was deleted.

‎Coding_iOS/Vendor/UMessage_Sdk_1.1.0/libUMessage_Sdk_1.1.0.a‎

-1.59 MB
Binary file not shown.

0 commit comments

Comments
 (0)