Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit 110d16a0 by pierce
Options

fixed 退不出去的问题

parent 37245333
Inline Side-by-side
Showing with 8 additions and 3 deletions
Module/GDFightTeamModule/GDFightTeamModule.xcodeproj/project.pbxproj
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
BE6694FC2C47D98F00C1386C /* GDFightTeamZoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C12C47D98F00C1386C /* GDFightTeamZoneController.swift */; }; BE6694FC2C47D98F00C1386C /* GDFightTeamZoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C12C47D98F00C1386C /* GDFightTeamZoneController.swift */; };
BE6694FD2C47D98F00C1386C /* GDFightTeamZoneViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C32C47D98F00C1386C /* GDFightTeamZoneViewModel.swift */; }; BE6694FD2C47D98F00C1386C /* GDFightTeamZoneViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C32C47D98F00C1386C /* GDFightTeamZoneViewModel.swift */; };
BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE66946A2C47D98E00C1386C /* GDFightTeamCreateController.xib */; }; BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE66946A2C47D98E00C1386C /* GDFightTeamCreateController.xib */; };
BED3D00C2C58955C0028E28F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BED3D00B2C58955C0028E28F /* Info.plist */; };
BEDC2F4C2C46868900651C72 /* GDFightTeamModule.h in Headers */ = {isa = PBXBuildFile; fileRef = BEDC2F4B2C46868900651C72 /* GDFightTeamModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; BEDC2F4C2C46868900651C72 /* GDFightTeamModule.h in Headers */ = {isa = PBXBuildFile; fileRef = BEDC2F4B2C46868900651C72 /* GDFightTeamModule.h */; settings = {ATTRIBUTES = (Public, ); }; };
BEDC2F652C47759900651C72 /* GDFightTeamAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5A2C47759900651C72 /* GDFightTeamAPI.swift */; }; BEDC2F652C47759900651C72 /* GDFightTeamAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5A2C47759900651C72 /* GDFightTeamAPI.swift */; };
BEDC2F662C47759900651C72 /* GDFightTeamHttpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5B2C47759900651C72 /* GDFightTeamHttpHelper.swift */; }; BEDC2F662C47759900651C72 /* GDFightTeamHttpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5B2C47759900651C72 /* GDFightTeamHttpHelper.swift */; };
...@@ -775,7 +774,6 @@ ...@@ -775,7 +774,6 @@
files = ( files = (
BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */, BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */,
BEDC2F6F2C47762D00651C72 /* FightTeamAssets.xcassets in Resources */, BEDC2F6F2C47762D00651C72 /* FightTeamAssets.xcassets in Resources */,
BED3D00C2C58955C0028E28F /* Info.plist in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -1128,6 +1126,7 @@ ...@@ -1128,6 +1126,7 @@
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
VERSIONING_SYSTEM = "";
WRAPPER_EXTENSION = bundle; WRAPPER_EXTENSION = bundle;
}; };
name = Debug; name = Debug;
...@@ -1152,6 +1151,7 @@ ...@@ -1152,6 +1151,7 @@
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
VERSIONING_SYSTEM = "";
WRAPPER_EXTENSION = bundle; WRAPPER_EXTENSION = bundle;
}; };
name = Release; name = Release;
......
Module/GDShowRoomModule/GDShowRoomModule/Features/Audience/View/GDLiveAudienceController.swift
...@@ -287,7 +287,12 @@ class GDLiveAudienceController: BaseViewController, LiveControllerType { ...@@ -287,7 +287,12 @@ class GDLiveAudienceController: BaseViewController, LiveControllerType {
} }
}.subscribe(onNext: {[weak self] offset in }.subscribe(onNext: {[weak self] offset in
guard let self = self else { return } guard let self = self else { return }
GDStatistics.track(.liveSwipeUpDown) GDStatistics.track(.liveSwipeUpDown)
if let functionView = self.functionView as? GDLiveFunctionView {
functionView.closeGuideView?.removeFromSuperview()
functionView.closeGuideView = nil
}
if let data = GDLiveHelper.shared.audienceInviteCenter.inviteData.value { if let data = GDLiveHelper.shared.audienceInviteCenter.inviteData.value {
// 有邀请数据 // 有邀请数据
......
Module/GDShowRoomModule/GDShowRoomModule/Features/Function/GDLiveFunctionView.swift
...@@ -189,7 +189,7 @@ class GDLiveFunctionView: BaseView { ...@@ -189,7 +189,7 @@ class GDLiveFunctionView: BaseView {
/// 新人用户礼包View /// 新人用户礼包View
private var newUserRewardView: GDNewUserRewardView? private var newUserRewardView: GDNewUserRewardView?
private var closeGuideView: GDCloseRoomGuideView? public var closeGuideView: GDCloseRoomGuideView?
private var giftGuideView: GDLiveGiftPanelGuideView? private var giftGuideView: GDLiveGiftPanelGuideView?
private var anchorInviteView: GDLiveAnchorInviteView? private var anchorInviteView: GDLiveAnchorInviteView?
private var fansGroupGuideView: GDLiveFansGroupGuideView? private var fansGroupGuideView: GDLiveFansGroupGuideView?
......
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