Skip to content

pidan / FuSiLive

Go to a project
Commit 6eaa2be5 by ludi
Options

Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

parents b81167c6 05ef0e38
Inline Side-by-side
Showing with 13 additions and 31 deletions
DevelopmentPods/FUSCommon/FUSCommon.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "FUSCommon" s.name = "FUSCommon"
s.version = "1.0.0" s.version = "1.0.1"
s.license = { s.license = {
:type => 'MIT', :type => 'MIT',
:text => <<-LICENSE :text => <<-LICENSE
......
FuSiLive/AppDelegate.m
...@@ -143,27 +143,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7"; ...@@ -143,27 +143,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
return YES; return YES;
} }
/// 用户点击推送 进入APP获取到的信息
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
// 将收到的APNs信息传给个推统计
[GeTuiSdk handleRemoteNotification:userInfo];
UIAlertController *vc = [UIAlertController alertControllerWithTitle:@"推送信息" message:userInfo.description preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *action = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
}];
[vc addAction:action];
[self.window.rootViewController presentViewController:vc animated:YES completion:nil];
completionHandler(UIBackgroundFetchResultNewData);
}
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
// iOS 10: App在前台获取到通知
- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {
NSLog(@"willPresentNotification：%@", notification.request.content.userInfo);
}
// iOS 10: 点击通知进入App时触发，在该方法内统计有效用户点击数 // iOS 10: 点击通知进入App时触发，在该方法内统计有效用户点击数
- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler { - (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler {
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
} else { } else {
// 正式服 // 正式服
//TODO:环信证书: added By Pidan //TODO:环信证书: added By Pidan
mainOptions.apnsCertName = @"FusiClub_AppStore_APNs.p12"; //生产环境推送证书名称 mainOptions.apnsCertName = @"FusiClub_AppStore_APNs"; //生产环境推送证书名称
// mainOptions.apnsCertName = @"ft_chat_iOS_for_test_apns.p12"; //生产环境推送证书名称 // mainOptions.apnsCertName = @"ft_chat_iOS_for_test_apns.p12"; //生产环境推送证书名称
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMUserService.m
...@@ -145,16 +145,17 @@ ...@@ -145,16 +145,17 @@
- (void)loginWithAccount:(NSString *)account passWord:(NSString *)passWord success:(void(^)(void))success failure:(void(^)(NSString *errorMsg))failure - (void)loginWithAccount:(NSString *)account passWord:(NSString *)passWord success:(void(^)(void))success failure:(void(^)(NSString *errorMsg))failure
{ {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[EMClient sharedClient] loginWithUsername:account password:passWord completion:^(NSString *aUsername, EMError *aError) { [[EMClient sharedClient] loginWithUsername:account password:passWord completion:^(NSString *aUsername, EMError *aError) {
if (!aError || aError.code == 200) { if (!aError || aError.code == 200) {
[[NSNotificationCenter defaultCenter] postNotificationName:@"refresh_hyLogin_state" object:nil];
if (success) success(); if (success) success();
}else{ }else{
if (failure) failure(aError.errorDescription); if (failure) failure(aError.errorDescription);
[self uploadEaseMobLoginFailLogWithAccount:account passWord:passWord errorObj:aError]; [self uploadEaseMobLoginFailLogWithAccount:account passWord:passWord errorObj:aError];
} }
}]; }];
});
} }
- (void)fus_autoLoginWithAccount:(NSString *)account - (void)fus_autoLoginWithAccount:(NSString *)account
...@@ -166,6 +167,7 @@ ...@@ -166,6 +167,7 @@
[self loginWithAccount:account passWord:_myUserPwd success:^{ [self loginWithAccount:account passWord:_myUserPwd success:^{
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[[NSNotificationCenter defaultCenter] postNotificationName:@"refresh_hyLogin_state" object:nil];
if (self.imLoginSucceedHandler) { if (self.imLoginSucceedHandler) {
self.imLoginSucceedHandler(); self.imLoginSucceedHandler();
self.imLoginSucceedHandler = nil; self.imLoginSucceedHandler = nil;
......
Podfile.lock
...@@ -73,7 +73,7 @@ PODS: ...@@ -73,7 +73,7 @@ PODS:
- FMDB (2.6.2): - FMDB (2.6.2):
- FMDB/standard (= 2.6.2) - FMDB/standard (= 2.6.2)
- FMDB/standard (2.6.2) - FMDB/standard (2.6.2)
- FUSCommon (1.0.0): - FUSCommon (1.0.1):
- AliyunOSSiOS - AliyunOSSiOS
- Bifrost - Bifrost
- FirebaseAnalytics (= 8.4.0) - FirebaseAnalytics (= 8.4.0)
...@@ -379,7 +379,7 @@ SPEC CHECKSUMS: ...@@ -379,7 +379,7 @@ SPEC CHECKSUMS:
FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e33dade81aa6ab79fe5240e9e66128cb7fc7b6a8 FUSCommon: f029dfa43debefb7676898002b662bcb91d401f7
FUSFoundation: 6cee9884547c6ba002fd5104d1412a691fa5c30b FUSFoundation: 6cee9884547c6ba002fd5104d1412a691fa5c30b
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Local Podspecs/FUSCommon.podspec.json
{ {
"name": "FUSCommon", "name": "FUSCommon",
"version": "1.0.0", "version": "1.0.1",
"license": { "license": {
"type": "MIT", "type": "MIT",
"text": " FUSCommon. All Rights Reserved.\n" "text": " FUSCommon. All Rights Reserved.\n"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"swift_versions": "5.0", "swift_versions": "5.0",
"source": { "source": {
"git": "./", "git": "./",
"tag": "1.0.0" "tag": "1.0.1"
}, },
"pod_target_xcconfig": { "pod_target_xcconfig": {
"VALID_ARCHS": "arm64", "VALID_ARCHS": "arm64",
......
Pods/Manifest.lock
...@@ -73,7 +73,7 @@ PODS: ...@@ -73,7 +73,7 @@ PODS:
- FMDB (2.6.2): - FMDB (2.6.2):
- FMDB/standard (= 2.6.2) - FMDB/standard (= 2.6.2)
- FMDB/standard (2.6.2) - FMDB/standard (2.6.2)
- FUSCommon (1.0.0): - FUSCommon (1.0.1):
- AliyunOSSiOS - AliyunOSSiOS
- Bifrost - Bifrost
- FirebaseAnalytics (= 8.4.0) - FirebaseAnalytics (= 8.4.0)
...@@ -379,7 +379,7 @@ SPEC CHECKSUMS: ...@@ -379,7 +379,7 @@ SPEC CHECKSUMS:
FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e33dade81aa6ab79fe5240e9e66128cb7fc7b6a8 FUSCommon: f029dfa43debefb7676898002b662bcb91d401f7
FUSFoundation: 6cee9884547c6ba002fd5104d1412a691fa5c30b FUSFoundation: 6cee9884547c6ba002fd5104d1412a691fa5c30b
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Target Support Files/FUSCommon/FUSCommon-Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.0</string> <string>1.0.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Pods/Target Support Files/FUSCommon/ResourceBundle-FUSCommonBundle-FUSCommon-Info.plist
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.0</string> <string>1.0.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment