Skip to content

pidan / FuSiLive

Go to a project
Commit 0f4e428a by pierce
Options

fixed bugs: 

1、添加in app purchase 的设置
2、添加购买失败的msg
3、添加用户标识符的权限弹窗的弹出时间
parent 128392d5
Inline Side-by-side
Showing with 34 additions and 5 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Payment/Controller/FUSRechargeViewController.m
......@@ -452,7 +452,7 @@ NSString * const kEVENT_RECHARGE_OFFICIAL_PAGE_RETURN = @"officialrecharge_retur
[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
// 支付失败
[FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"储值失败"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"储值失败"] message:msg cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
}];
});
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Payment/Other/FUSPaymentManager.m
......@@ -78,16 +78,25 @@ NSString * const kFirstRechargeFinishNotification = @"kFirstRechargeFinishNotifi
case SKPaymentTransactionStateRestored: // 支付重置
default:
{
if (failure) failure([NSString fus_localString:@"储值失败"],-1);
if (transaction.error) {
NSString *msg = transaction.error.userInfo[@"NSLocalizedDescription"] ?: transaction.error.localizedDescription;
if (failure) failure(msg,-1);
} else {
if (failure) failure(@"Recharge Unkown failed",-1);
}
}
break;
}
} failure:^(SKPaymentTransaction *transaction, NSError *error) {
if (failure) failure(error.userInfo[@"NSLocalizedDescription"], (int)error.code);
NSString *msg = error.userInfo[@"NSLocalizedDescription"] ?: error.localizedDescription;
if (failure) failure(msg, (int)error.code);
}];
} failure:^(NSError *error) {
if (failure) failure(error.userInfo[@"NSLocalizedDescription"], (int)error.code);
NSString *msg = error.userInfo[@"NSLocalizedDescription"] ?: error.localizedDescription;
if (failure) failure(msg, (int)error.code);
}];
} failure:^(NSString *msg, int code) {
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -22,6 +22,7 @@
BEDC36642C09C53900505F76 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2CC82C09C53800505F76 /* AppDelegate.m */; };
BEDC6EEE2C09DAE800505F76 /* FZLanTingHei-B-GBK.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEDC65D22C09DAE700505F76 /* FZLanTingHei-B-GBK.ttf */; };
BEDC6F8C2C09DAE900505F76 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEDC668D2C09DAE700505F76 /* GoogleService-Info.plist */; };
BEDF6A2E2C805FC700F9529C /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDF6A2D2C805FC700F9529C /* StoreKit.framework */; };
CC4EC839F0D05ECFFB160A5F /* Pods_FuSiLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */; };
/* End PBXBuildFile section */
......@@ -69,6 +70,7 @@
BEDC65D22C09DAE700505F76 /* FZLanTingHei-B-GBK.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "FZLanTingHei-B-GBK.ttf"; sourceTree = "<group>"; };
BEDC668D2C09DAE700505F76 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
BEDF6A2C2C7F67CC00F9529C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
BEDF6A2D2C805FC700F9529C /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FuSiLive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
......@@ -79,6 +81,7 @@
files = (
CC4EC839F0D05ECFFB160A5F /* Pods_FuSiLive.framework in Frameworks */,
BED65B152C5B74E400668116 /* FUSShowRoomModule.framework in Frameworks */,
BEDF6A2E2C805FC700F9529C /* StoreKit.framework in Frameworks */,
BED3D2C12C58DC7A0028E28F /* FUSChatCenterModule.framework in Frameworks */,
BED3D0342C58C5100028E28F /* FUSUserCenterModule.framework in Frameworks */,
);
......@@ -153,6 +156,7 @@
E865A4F96715685D14F828C8 /* Frameworks */ = {
isa = PBXGroup;
children = (
BEDF6A2D2C805FC700F9529C /* StoreKit.framework */,
BED65B122C5B74E400668116 /* FUSShowRoomBundle.bundle */,
BED65B132C5B74E400668116 /* FUSShowRoomModule.framework */,
BED3D2BE2C58DC7A0028E28F /* FUSChatCenterBundle.bundle */,
......
FuSiLive/AppDelegate.m
......@@ -46,7 +46,6 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
// 通过 个推平台 分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用
[GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions];
[FUSEventTrack fus_initial];
[FIRApp configure];
[FIRAnalytics setAnalyticsCollectionEnabled:YES];
......
FuSiLive/Info.plist
......@@ -118,6 +118,8 @@
<string>保存APP內你需要的圖片或視頻，到相冊的功能，需要访问您的相册</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>聊天分享圖片和視頻、反饋舉報、設置頭像等功能，需要访问您的相册</string>
<key>NSUserTrackingUsageDescription</key>
<string>此標識符將用於向您推薦個性化廣告</string>
<key>UIAppFonts</key>
<array>
<string>FZCustom01.ttf</string>
......
FuSiLive/Resources/LocalizationString/en.lproj/InfoPlist.strings
......@@ -19,3 +19,5 @@
"NSPhotoLibraryUsageDescription" = "We need to access your Album. To save the photos or videos you want to save to your Album.";
"NSPhotoLibraryAddUsageDescription" = "Functions such as sharing photos and videos in chat, reporting feedback, setting avatars, etc. require access to your photo album";
"NSUserTrackingUsageDescription" = "This identifier will be used to recommend personalized ads to you";
FuSiLive/Resources/LocalizationString/ja.lproj/InfoPlist.strings
......@@ -20,3 +20,5 @@
"NSPhotoLibraryAddUsageDescription" = "チャット、写真やビデオの共有、フィードバックの報告、アバターの設定、その他の機能にはフォト アルバムへのアクセスが必要です。";
"NSUserTrackingUsageDescription" = "この識別子は、パーソナライズされた広告を推奨するために使用されます";
FuSiLive/Resources/LocalizationString/vi.lproj/InfoPlist.strings
......@@ -19,3 +19,5 @@
"NSPhotoLibraryUsageDescription" = "Chức năng lưu ảnh hoặc video bạn cần trong APP vào album ảnh yêu cầu quyền truy cập vào album ảnh của bạn";
"NSPhotoLibraryAddUsageDescription" = "Trò chuyện, chia sẻ hình ảnh và video, báo cáo phản hồi, đặt hình đại diện và các chức năng khác yêu cầu quyền truy cập vào album ảnh của bạn";
"NSUserTrackingUsageDescription" = "Số nhận dạng này sẽ được sử dụng để đề xuất quảng cáo được cá nhân hóa cho bạn";
FuSiLive/Resources/LocalizationString/zh-Hans.lproj/InfoPlist.strings
......@@ -20,4 +20,6 @@
"NSPhotoLibraryAddUsageDescription" = "聊天分享圖片和視頻、反饋舉報、設置頭像等功能，需要访问您的相册";
"NSUserTrackingUsageDescription" = "此標識符將用於向您推薦個性化廣告";
FuSiLive/Resources/LocalizationString/zh-Hant.lproj/InfoPlist.strings
......@@ -20,3 +20,5 @@
"NSPhotoLibraryAddUsageDescription" = "聊天分享圖片和視頻、反饋舉報、設置頭像等功能，需要访问您的相册";
"NSUserTrackingUsageDescription" = "此標識符將用於向您推薦個性化廣告";
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -521,6 +521,7 @@
#pragma mark - UIApplicationDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
[FUSEventTrack fus_initial];
// 标记是否在一个生命周期内
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSUserUDKeys.fus_IS_FIRST_ENTER_APP_CURRENT];
// 在应用启动时开始监听网络状态，因为我们现在所有接口都需要上传网络状态，之前是在登录成功那里开始监听。这就导致了有一些接口的网络状态监听不到：added by pidan
......@@ -531,7 +532,11 @@
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSUserUDKeys.fus_FIRST_LAUNCH_NETWORK_ALLOW];
[self checkAppStatus];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[FUSEventTrack fus_initial];
});
}
}];
[self fus_startAPPPages];
......
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