Skip to content

pidan / FuSiLive

Go to a project
Commit c7f6be70 by ludi
Options

补充一点

parent 0fef18ce
Inline Side-by-side
Showing with 36 additions and 8 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSDate/FUSDate.swift
...@@ -40,7 +40,15 @@ public extension Date { ...@@ -40,7 +40,15 @@ public extension Date {
return formatter.string(from: Date()) return formatter.string(from: Date())
} }
/// 获取今日日期：2020-07-08 12:12:12:123
var todayLongString: String {
// 格式化
let formatter = DateFormatter()
// 设置格式
formatter.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
return formatter.string(from: Date())
}
/// 获取一个日期后的第几个月的日期，可以是负数 /// 获取一个日期后的第几个月的日期，可以是负数
/// - Parameter afterMonth: 之后几个月 /// - Parameter afterMonth: 之后几个月
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -268,6 +268,7 @@ ...@@ -268,6 +268,7 @@
BED3D2C32C58DC7A0028E28F /* Embed PlugIns */, BED3D2C32C58DC7A0028E28F /* Embed PlugIns */,
D22E79862D9A863C00A3E6FC /* Fix Privacy Manifest */, D22E79862D9A863C00A3E6FC /* Fix Privacy Manifest */,
00E501FC2E0543A800579DB0 /* Embed Foundation Extensions */, 00E501FC2E0543A800579DB0 /* Embed Foundation Extensions */,
00B8958A2F6928FB00090917 /* ShellScript */,
); );
buildRules = ( buildRules = (
); );
...@@ -343,6 +344,23 @@ ...@@ -343,6 +344,23 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
00B8958A2F6928FB00090917 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
};
0C043F7BEDD51599E326859C /* [CP] Check Pods Manifest.lock */ = { 0C043F7BEDD51599E326859C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -673,7 +691,7 @@ ...@@ -673,7 +691,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260043; CURRENT_PROJECT_VERSION = 202506260044;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -708,7 +726,7 @@ ...@@ -708,7 +726,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.8; MARKETING_VERSION = 1.9;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
...@@ -938,7 +956,7 @@ ...@@ -938,7 +956,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260043; CURRENT_PROJECT_VERSION = 202506260044;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -973,7 +991,7 @@ ...@@ -973,7 +991,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.8; MARKETING_VERSION = 1.9;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -2470,10 +2470,6 @@ BDAlphaPlayerMetalViewDelegate ...@@ -2470,10 +2470,6 @@ BDAlphaPlayerMetalViewDelegate
if (isAutoShow && FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState != FUSPKStateNone) { if (isAutoShow && FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState != FUSPKStateNone) {
return; return;
} }
// 未到时间不打开
if ([treasureBoxModel.countdownTimeStr isEqualToString:@"00:00"] == NO) {
return;
}
if (!weakSelf.treasureBoxGrabView) { if (!weakSelf.treasureBoxGrabView) {
if ([treasureBoxModel.countdownTimeStr isEqualToString:@"00:00"]) { if ([treasureBoxModel.countdownTimeStr isEqualToString:@"00:00"]) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveTreasureBoxGrabView.m
...@@ -716,6 +716,12 @@ typedef NS_ENUM(NSInteger,FUSLiveTreasureBoxGrabViewUIState) { ...@@ -716,6 +716,12 @@ typedef NS_ENUM(NSInteger,FUSLiveTreasureBoxGrabViewUIState) {
return; return;
} }
else if (code == -20067) {
// 紅包暫未開啟,并且还能点击,新版本不显示开启失败，还是原来界面，并且弹toast
[FUSDialogView fus_showDialog:msg];
sender.userInteractionEnabled = YES;
return;
}
self.grabResultLabel.attributedText = attr; self.grabResultLabel.attributedText = attr;
[self fus_setCurrentState:FUSLiveTreasureBoxGrabViewUIStateOpenFailed]; [self fus_setCurrentState:FUSLiveTreasureBoxGrabViewUIStateOpenFailed];
......
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