From 5adf8e841257acd9b2a7bba25488f89e7e75de5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E6=98=9F?= Date: Fri, 10 Oct 2025 09:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E5=8D=A1=E5=85=AB=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=A6=BB=E7=BA=BF=EF=BC=8C=E8=83=8C=E5=8C=85=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E4=B8=80=E9=94=AE=E5=85=A8=E9=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pods/Pods.xcodeproj/project.pbxproj | 584 +++++++++--------- QXLive.xcodeproj/project.pbxproj | 38 +- .../xcschemes/QXLiveScreen.xcscheme | 1 + .../xcschemes/QXLiveScreenDev.xcscheme | 1 + .../xcdebugger/Breakpoints_v2.xcbkptlist | 16 + QXLive/Dynamic(语圈)/View/QXSendGiftView.m | 14 + .../Controlller/QXHomeSubViewController.m | 30 +- .../Controlller/QXHomeViewController.m | 55 +- .../View/房间/设置/QXDirectSetScaleView.h | 2 +- .../View/房间/麦位视图/QXRoomSeatContentView.h | 3 + .../View/房间/麦位视图/QXRoomSeatContentView.m | 12 +- .../房间/麦位视图/QXRoomSeatTypeNormalView.m | 3 + .../View/首页/排行榜/QXRankListCell.xib | 11 +- QXLive/Other/AppDelegate.m | 4 + QXLive/Tabbar/弹窗/QXCustomAlertView.h | 18 + QXLive/Tabbar/弹窗/QXCustomAlertView.m | 134 ++++ 16 files changed, 577 insertions(+), 349 deletions(-) create mode 100644 QXLive/Tabbar/弹窗/QXCustomAlertView.h create mode 100644 QXLive/Tabbar/弹窗/QXCustomAlertView.m diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index f3594dd..3afd614 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -18692,6 +18692,46 @@ }; name = Release; }; + 0D57A3B9AF147E7EAAF07548BC300423 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 664D85C77511FBEB1896EFC975EA5903 /* Pods-QXLiveDev.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + INFOPLIST_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 157AD3B723F05789883502A3BA33D47E /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = C9671D5694D2FCBEADA969DC5D078145 /* YYCache.debug.xcconfig */; @@ -19126,6 +19166,46 @@ }; name = Release; }; + 2337ACC38393E07C21C0AC096224C9C2 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2598910578FE259E665B3B0E83B7BDF0 /* Pods-QXLive.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + INFOPLIST_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 2451B18F949FB9FF83E0B4A81C1B1549 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 2F4308A38596D866AEC25B61D2C87543 /* MJRefresh.release.xcconfig */; @@ -19276,72 +19356,6 @@ }; name = Debug; }; - 2B9E26EAE2CD392AD762421F663075A1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - STRIP_INSTALLED_PRODUCT = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; 2D8D89F01134CC947F970AF6312F2F26 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = F8BC2B200445EF43137B596CD0CE9B46 /* MQTTClient.release.xcconfig */; @@ -19437,6 +19451,45 @@ }; name = Release; }; + 33D93A6DE5EF42B6F1229FDFCEE0A067 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 908009E78A2E56530859FF690E873087 /* Pods-QXLiveDev.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + INFOPLIST_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; 341C83D013F1F121459AEA3C20FD2D63 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 60F947CE04A1A0FCF25A9B0C51989DAB /* libwebp.debug.xcconfig */; @@ -19628,45 +19681,6 @@ }; name = Release; }; - 3D420B473A5D282BBD6CDA3A75FA81AC /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 908009E78A2E56530859FF690E873087 /* Pods-QXLiveDev.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - INFOPLIST_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 419CA29EFAECAAA2E27D55BB0CD453E1 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = A16C101E68E8852784429648C2CCACE5 /* TUIConversation.debug.xcconfig */; @@ -20082,46 +20096,6 @@ }; name = Debug; }; - 5B3A7E31950C49AF4EBD6F7AF6040E5E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 664D85C77511FBEB1896EFC975EA5903 /* Pods-QXLiveDev.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - INFOPLIST_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 5C6146B03B0A0A02DAAC174FADB1308F /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = A16C101E68E8852784429648C2CCACE5 /* TUIConversation.debug.xcconfig */; @@ -20160,6 +20134,45 @@ }; name = Debug; }; + 5D2621D05AC3624BB06B093AAA894648 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = CD816C1AB0BAE69BA4F0703D10DE6EC1 /* Pods-QXLive.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + INFOPLIST_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; 5DCB87DA558C85EB806D171A393782FA /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 94329B7AE8EE695E7D6F6A2D1247E7BA /* TIMCommon.release.xcconfig */; @@ -20194,68 +20207,6 @@ }; name = Debug; }; - 63FAF33E1C55B71A5F5A8B3CC8749F99 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - STRIP_INSTALLED_PRODUCT = NO; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Release; - }; 6558A5BDC2DB9A7A41F282203F8F4B1B /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 60EB43759A795C970FFCF4CA4505C9DB /* libwebp.release.xcconfig */; @@ -20596,45 +20547,6 @@ }; name = Release; }; - 7A9C2F6435012D294916163FBE35D99A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CD816C1AB0BAE69BA4F0703D10DE6EC1 /* Pods-QXLive.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - INFOPLIST_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 7D4D4B52A8E16F644DCDA002970B1279 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 899FE2DF1ECBAD93868B2D343027EDB0 /* JXPagingView.release.xcconfig */; @@ -20857,6 +20769,72 @@ }; name = Debug; }; + 8DE5143C03248BB6CD542DE3963D6F3A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Debug; + }; 8EAC2F834160F0D756B3363236E0940A /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 899FE2DF1ECBAD93868B2D343027EDB0 /* JXPagingView.release.xcconfig */; @@ -21235,6 +21213,68 @@ }; name = Release; }; + 9E406C6AAF85E580207CD97B0044DEAB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Release; + }; 9F84D925093362E29A484E2C87EE2D57 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = BEF43A731E4D94C78C75166E669E9FA8 /* ReactiveObjC.debug.xcconfig */; @@ -22040,46 +22080,6 @@ }; name = Release; }; - E230F866ABE1916F2590D747F618A3FC /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 2598910578FE259E665B3B0E83B7BDF0 /* Pods-QXLive.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - INFOPLIST_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-QXLive/Pods-QXLive.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; E30681762B80C188BE057874118FD967 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = C092C466730A789FFD1F47D57E1CBE1A /* AgoraLyricsScore.release.xcconfig */; @@ -22525,8 +22525,8 @@ 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2B9E26EAE2CD392AD762421F663075A1 /* Debug */, - 63FAF33E1C55B71A5F5A8B3CC8749F99 /* Release */, + 8DE5143C03248BB6CD542DE3963D6F3A /* Debug */, + 9E406C6AAF85E580207CD97B0044DEAB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -22561,8 +22561,8 @@ 59ABA45A9B2B6F413B61E053C1DA3A3A /* Build configuration list for PBXNativeTarget "Pods-QXLive" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7A9C2F6435012D294916163FBE35D99A /* Debug */, - E230F866ABE1916F2590D747F618A3FC /* Release */, + 5D2621D05AC3624BB06B093AAA894648 /* Debug */, + 2337ACC38393E07C21C0AC096224C9C2 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -22840,8 +22840,8 @@ B647BBB23FFA73A5FE6DB5DBED1422EA /* Build configuration list for PBXNativeTarget "Pods-QXLiveDev" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3D420B473A5D282BBD6CDA3A75FA81AC /* Debug */, - 5B3A7E31950C49AF4EBD6F7AF6040E5E /* Release */, + 33D93A6DE5EF42B6F1229FDFCEE0A067 /* Debug */, + 0D57A3B9AF147E7EAAF07548BC300423 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index fc8f1c5..8598477 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -7,9 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 95946C092E56B76F00ECFA94 /* Pods_QXLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95946C082E56B76F00ECFA94 /* Pods_QXLive.framework */; }; - 95946C0B2E56B78700ECFA94 /* Pods_QXLiveDev.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95946C0A2E56B78700ECFA94 /* Pods_QXLiveDev.framework */; }; + 4AF8AC7F832AA7A70929AB76 /* Pods_QXLiveDev.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D53181714A7F955CA60F4AB /* Pods_QXLiveDev.framework */; }; 95946C0C2E56B9FA00ECFA94 /* QXLiveScreenDev.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 95C3274A2E4C4068004B2D82 /* QXLiveScreenDev.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 9599C76B2E97631E008D19F6 /* libswiftCoreAudio.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9599C76A2E97631E008D19F6 /* libswiftCoreAudio.tbd */; }; 95C29E9E2E19166700F2524D /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95C2925B2E18BBF800F2524D /* ReplayKit.framework */; }; 95C29EA62E19166700F2524D /* QXLiveScreen.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 95C29E9D2E19166700F2524D /* QXLiveScreen.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 95C29EAB2E19173300F2524D /* AgoraReplayKitExtension.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95C292A42E18ED0C00F2524D /* AgoraReplayKitExtension.xcframework */; }; @@ -31,6 +31,7 @@ 95F205032DEF0ABD0031E710 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 95F205022DEF0ABD0031E710 /* libsqlite3.tbd */; }; 95F205052DEF0AC20031E710 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95F205042DEF0AC20031E710 /* CoreTelephony.framework */; }; 95F205072DEF0AD20031E710 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 95F205062DEF0AD20031E710 /* libz.tbd */; }; + BB879DD0574F50799C6C43C6 /* Pods_QXLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75B6DED9AC5D04AA580AC1B3 /* Pods_QXLive.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -90,18 +91,16 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2D163E917E90CDC07837F1A7 /* Pods_QXLiveDev.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QXLiveDev.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5D53181714A7F955CA60F4AB /* Pods_QXLiveDev.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QXLiveDev.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7270179B583CF68223E0AC0A /* Pods-QXLiveDev.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QXLiveDev.debug.xcconfig"; path = "Target Support Files/Pods-QXLiveDev/Pods-QXLiveDev.debug.xcconfig"; sourceTree = ""; }; + 75B6DED9AC5D04AA580AC1B3 /* Pods_QXLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QXLive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9537146C2E56B56C00569E1E /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; 9537146F2E56B59100569E1E /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 953714712E56B59B00569E1E /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; - 953714732E56B5BA00569E1E /* libswiftCoreAudio.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreAudio.tbd; path = usr/lib/swift/libswiftCoreAudio.tbd; sourceTree = SDKROOT; }; 9593D7172DB9C95C0082CA57 /* QXLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QXLive.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9593D7322DB9C95E0082CA57 /* QXLiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QXLiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 9593D73C2DB9C95E0082CA57 /* QXLiveUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QXLiveUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 959466212E56B6E500ECFA94 /* Pods_QXLiveDev.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_QXLiveDev.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 95946C082E56B76F00ECFA94 /* Pods_QXLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_QXLive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 95946C0A2E56B78700ECFA94 /* Pods_QXLiveDev.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_QXLiveDev.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9599C76A2E97631E008D19F6 /* libswiftCoreAudio.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreAudio.tbd; path = usr/lib/swift/libswiftCoreAudio.tbd; sourceTree = SDKROOT; }; 95C2925B2E18BBF800F2524D /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; }; 95C292682E18BBF800F2524D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 95C292A42E18ED0C00F2524D /* AgoraReplayKitExtension.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AgoraReplayKitExtension.xcframework; path = Pods/AgoraRtcEngine_iOS/AgoraReplayKitExtension.xcframework; sourceTree = ""; }; @@ -194,7 +193,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 95946C092E56B76F00ECFA94 /* Pods_QXLive.framework in Frameworks */, + 9599C76B2E97631E008D19F6 /* libswiftCoreAudio.tbd in Frameworks */, 95C29EAD2E191D6800F2524D /* ReplayKit.framework in Frameworks */, 95F205072DEF0AD20031E710 /* libz.tbd in Frameworks */, 95F205052DEF0AC20031E710 /* CoreTelephony.framework in Frameworks */, @@ -203,6 +202,7 @@ 95F204FF2DEF0AB20031E710 /* SystemConfiguration.framework in Frameworks */, 95F204FD2DEF0AAC0031E710 /* libiconv.tbd in Frameworks */, 95F204FB2DEF0AA10031E710 /* Security.framework in Frameworks */, + BB879DD0574F50799C6C43C6 /* Pods_QXLive.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -242,7 +242,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 95946C0B2E56B78700ECFA94 /* Pods_QXLiveDev.framework in Frameworks */, 95C3EFEF2E49F44A004B2D82 /* ReplayKit.framework in Frameworks */, 95C3EFF02E49F44A004B2D82 /* libz.tbd in Frameworks */, 95C3EFF12E49F44A004B2D82 /* CoreTelephony.framework in Frameworks */, @@ -251,6 +250,7 @@ 95C3EFF42E49F44A004B2D82 /* SystemConfiguration.framework in Frameworks */, 95C3EFF52E49F44A004B2D82 /* libiconv.tbd in Frameworks */, 95C3EFF62E49F44A004B2D82 /* Security.framework in Frameworks */, + 4AF8AC7F832AA7A70929AB76 /* Pods_QXLiveDev.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -271,10 +271,7 @@ 4B6F40DB8328A2B2BB1BF79D /* Frameworks */ = { isa = PBXGroup; children = ( - 95946C0A2E56B78700ECFA94 /* Pods_QXLiveDev.framework */, - 95946C082E56B76F00ECFA94 /* Pods_QXLive.framework */, - 959466212E56B6E500ECFA94 /* Pods_QXLiveDev.framework */, - 953714732E56B5BA00569E1E /* libswiftCoreAudio.tbd */, + 9599C76A2E97631E008D19F6 /* libswiftCoreAudio.tbd */, 953714712E56B59B00569E1E /* CoreAudioKit.framework */, 9537146F2E56B59100569E1E /* CoreAudio.framework */, 9537146C2E56B56C00569E1E /* CoreAudioTypes.framework */, @@ -290,9 +287,10 @@ 95F204FE2DEF0AB20031E710 /* SystemConfiguration.framework */, 95F204FC2DEF0AAC0031E710 /* libiconv.tbd */, 95F204FA2DEF0AA10031E710 /* Security.framework */, - 2D163E917E90CDC07837F1A7 /* Pods_QXLiveDev.framework */, 95C2925B2E18BBF800F2524D /* ReplayKit.framework */, 95C292682E18BBF800F2524D /* UIKit.framework */, + 75B6DED9AC5D04AA580AC1B3 /* Pods_QXLive.framework */, + 5D53181714A7F955CA60F4AB /* Pods_QXLiveDev.framework */, ); name = Frameworks; sourceTree = ""; @@ -785,6 +783,10 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SDKROOT)/usr/lib/swift", + ); MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -847,6 +849,10 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SDKROOT)/usr/lib/swift", + ); MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1192,7 +1198,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1256,7 +1262,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme index 8819567..35da550 100644 --- a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme +++ b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme @@ -87,6 +87,7 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" + askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> diff --git a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme index 9bd1f8a..e61af29 100644 --- a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme +++ b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme @@ -49,6 +49,7 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" + askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> + + + + diff --git a/QXLive/Dynamic(语圈)/View/QXSendGiftView.m b/QXLive/Dynamic(语圈)/View/QXSendGiftView.m index c969c4e..f1d00d5 100644 --- a/QXLive/Dynamic(语圈)/View/QXSendGiftView.m +++ b/QXLive/Dynamic(语圈)/View/QXSendGiftView.m @@ -15,6 +15,7 @@ #import "QXPayTypeModel.h" #import "QXMineNetwork.h" #import "QXDynamicNetwork.h" +#import "QXCustomAlertView.h" @interface QXSendGiftView() @@ -354,6 +355,19 @@ showToast(@"一键全送仅能选择一个用户"); return; } + MJWeakSelf + QXCustomAlertView *alertView = [[QXCustomAlertView alloc] init]; + alertView.cancelBlock = ^{ + + }; + alertView.commitBlock = ^{ + [weakSelf sendAllNetWork]; + }; + [alertView showInView:self.vc.view title:@"温馨提示" message:@"是否确认将背包礼物全部送出" cancleTitle:nil commitTitle:nil]; + +} +// 一键清空网络请求 +-(void)sendAllNetWork{ NSString *userId = [self.pitUserListView.selectedArray componentsJoinedByString:@","]; MJWeakSelf [QXMineNetwork roomBagGiftClearWithRoomId:self.roomId userId:userId heartId:self.heartId auction_id:self.auctionId successBlock:^(NSDictionary * _Nonnull dict) { diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeSubViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeSubViewController.m index bdb97e8..3ef3590 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeSubViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeSubViewController.m @@ -38,6 +38,10 @@ // Do any additional setup after loading the view. } +-(void)viewWillAppear:(BOOL)animated{ + [super viewWillAppear:animated]; + QXLOG(@"========首页子控制器即将展示========"); +} -(void)initSubViews{ self.page = 1; [self.view addSubview:self.collectionView]; @@ -48,24 +52,28 @@ [super viewDidAppear:animated]; [self.collectionView reloadData]; } + -(void)setRoomType:(QXMyRoomType *)roomType{ _roomType = roomType; [self getRoomList]; } - (void)getRoomList { - __weak typeof(self)weakSelf = self; +// __weak typeof(self)weakSelf = self; + @weakify(self) [QXHomePageNetwork homeRoomListWithPage:self.page is_top:NO label_id:self.roomType.id successBlock:^(NSArray * _Nonnull list, BOOL isAppStore) { - if (weakSelf.page == 1) { - [weakSelf.dataArray removeAllObjects]; + @strongify(self) + if (self.page == 1) { + [self.dataArray removeAllObjects]; } - [weakSelf.dataArray addObjectsFromArray:list]; - [weakSelf.collectionView reloadData]; + [self.dataArray addObjectsFromArray:list]; + [self.collectionView reloadData]; if (list.count == 0) { - weakSelf.collectionView.mj_footer.state = MJRefreshStateNoMoreData; + self.collectionView.mj_footer.state = MJRefreshStateNoMoreData; }else{ - [weakSelf.collectionView.mj_footer endRefreshing]; + [self.collectionView.mj_footer endRefreshing]; } } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + @strongify(self) [self.collectionView.mj_footer endRefreshing]; }]; } @@ -113,10 +121,12 @@ _collectionView.dataSource = self; _collectionView.backgroundColor = [UIColor clearColor]; [_collectionView registerNib:[UINib nibWithNibName:@"QXHomeRoomCell" bundle:[NSBundle mainBundle]] forCellWithReuseIdentifier:@"QXHomeRoomCell"]; - MJWeakSelf +// MJWeakSelf + @weakify(self) _collectionView.mj_footer = [MJRefreshBackStateFooter footerWithRefreshingBlock:^{ - weakSelf.page++; - [weakSelf getRoomList]; + @strongify(self) + self.page++; + [self getRoomList]; }]; } return _collectionView; diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index d45c04c..efaa331 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m @@ -121,11 +121,13 @@ self.categoryView.listContainer = (id)self.pagingView.listContainerView; self.pagingView.listContainerView.listCellBackgroundColor = [UIColor clearColor]; // [self performSelector:@selector(giftScrollViewShow) afterDelay:5]; - MJWeakSelf +// MJWeakSelf + @weakify(self) self.pagingView.mainTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ - [weakSelf requestSlideToolData]; - [weakSelf getTopRoomList]; - [weakSelf getBanner]; + @strongify(self) + [self requestSlideToolData]; + [self getTopRoomList]; + [self getBanner]; }]; self.firstRechargeBtn.hidden = YES; @@ -151,26 +153,28 @@ [self getBanner]; } - (void)requestSlideToolData { - __weak typeof(self) weakSelf = self; + @weakify(self) [QXHomePageNetwork homeRoomLabelListsuccessBlock:^(NSArray * _Nonnull list) { - [weakSelf.titles removeAllObjects]; + @strongify(self) + [self.titles removeAllObjects]; NSMutableArray *arr = [NSMutableArray array]; - [weakSelf.titles addObjectsFromArray:list]; + [self.titles addObjectsFromArray:list]; for (QXMyRoomType *md in list) { [arr addObject:md.label_name]; } - weakSelf.categoryView.titles = arr; - [weakSelf.categoryView reloadData]; - [weakSelf.pagingView.mainTableView.mj_header endRefreshing]; + self.categoryView.titles = arr; + [self.categoryView reloadData]; + [self.pagingView.mainTableView.mj_header endRefreshing]; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { - [weakSelf.pagingView.mainTableView.mj_header endRefreshing]; + [self.pagingView.mainTableView.mj_header endRefreshing]; }]; } -(void)getFirstRechargePermission{ - MJWeakSelf + @weakify(self) [QXHomePageNetwork getFirstRechargePermissionSuccessBlock:^(BOOL isShow) { - weakSelf.firstRechargeBtn.hidden = !isShow; + @strongify(self) + self.firstRechargeBtn.hidden = !isShow; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { }]; @@ -183,7 +187,7 @@ // [v showInView:self.view]; } -(void)popFirstRechargeView{ - MJWeakSelf +// MJWeakSelf // view.giftArray = @[@"",@"",@"",@"",@"",@""]; self.firstRechargeView.closeActionBlock = ^{ [[QXGlobal shareGlobal].alertViewController hideViewFinishBlock:^{ @@ -267,33 +271,35 @@ [[QXGlobal shareGlobal] joinRoomWithRoomId:model.roomId isRejoin:NO navagationController:self.navigationController]; } - (void)getTopRoomList { - __weak typeof(self)weakSelf = self; + @weakify(self) [QXHomePageNetwork homeRoomListWithPage:0 is_top:YES label_id:@"" successBlock:^(NSArray * _Nonnull list, BOOL isAppStore) { - [weakSelf.dataArray removeAllObjects]; - [weakSelf.dataArray addObjectsFromArray:list]; + @strongify(self) + [self.dataArray removeAllObjects]; + [self.dataArray addObjectsFromArray:list]; if (isAppStore) { self.appStoreView.hidden = NO; }else{ self.appStoreView.hidden = YES; } // weakSelf.appStoreView.dataArray = list; - [weakSelf.cycleScrollView reloadData]; + [self.cycleScrollView reloadData]; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { }]; } -(void)getBanner{ - MJWeakSelf + @weakify(self) [QXHomePageNetwork homeBannerSuccessBlock:^(NSArray * _Nonnull list) { + @strongify(self) NSMutableArray *arr = [NSMutableArray array]; for (QXBanner *banner in list) { [arr addObject:banner.image]; } - [weakSelf.bannerArry removeAllObjects]; - [weakSelf.bannerArry addObjectsFromArray:list]; - weakSelf.appStoreView.bannerArray = list; - weakSelf.bannerScrollView.imageURLStringsGroup = arr; + [self.bannerArry removeAllObjects]; + [self.bannerArry addObjectsFromArray:list]; + self.appStoreView.bannerArray = list; + self.bannerScrollView.imageURLStringsGroup = arr; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { }]; @@ -505,4 +511,7 @@ } return _appStoreView; } +-(void)dealloc{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} @end diff --git a/QXLive/HomePage(声播)/View/房间/设置/QXDirectSetScaleView.h b/QXLive/HomePage(声播)/View/房间/设置/QXDirectSetScaleView.h index 6b1a86b..9f9f659 100644 --- a/QXLive/HomePage(声播)/View/房间/设置/QXDirectSetScaleView.h +++ b/QXLive/HomePage(声播)/View/房间/设置/QXDirectSetScaleView.h @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @interface QXDirectSetScaleView : UIView @property (nonatomic,strong)NSString *userId; @property (nonatomic,strong)NSString *roomId; - +/// 转币 @property (nonatomic,assign)BOOL isGiveCoin; /// 头条 diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h index f7718cf..13da031 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h @@ -39,6 +39,9 @@ NS_ASSUME_NONNULL_BEGIN /// 麦位视图类型 @property (nonatomic,assign)QXRoomSeatContentViewType type; +/// 是否展示离线状态 需求暂定二卡八不展示离线状态 +@property (nonatomic,assign)BOOL noOffLine; + //@property (nonatomic,strong)QXRoomOwnerModel *userModel ; -(void)updateUserCharm:(NSString*)charm; diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m index f82e0d3..c4bf455 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m @@ -197,6 +197,9 @@ } -(void)onlineStatusDidChanged:(NSNotification*)notice{ + if (self.noOffLine) { + return; + } NSDictionary *parm = notice.object; NSString *uid = [NSString stringWithFormat:@"%@",[parm objectForKey:@"user_id"]]; BOOL isOnline = [[parm objectForKey:@"is_online"] boolValue]; @@ -232,6 +235,9 @@ [self stopAudioAnimation]; } } +-(void)setNoOffLine:(BOOL)noOffLine{ + _noOffLine = noOffLine; +} -(void)setIsPK:(BOOL)isPK{ _isPK = isPK; self.nameLabel.font = [UIFont systemFontOfSize:10]; @@ -365,7 +371,11 @@ if (pitModel.user_id.longValue > 0) { BOOL is_offline = [[[QXGlobal shareGlobal].offLineDict objectForKey:pitModel.user_id?pitModel.user_id:@"0"] boolValue]; if (is_offline) { - self.offlineImageView.hidden = NO; + if (self.noOffLine) { + self.offlineImageView.hidden = YES; + }else{ + self.offlineImageView.hidden = NO; + } }else{ self.offlineImageView.hidden = YES; } diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m index 4b46c26..9e4e69d 100644 --- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m +++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m @@ -74,6 +74,7 @@ static NSInteger maxSeat = 8; for (int i = 0 ; i < maxSeat ; i++) { QXRoomSeatContentView *contentView = [[QXRoomSeatContentView alloc] init]; contentView.number = i+1; + contentView.noOffLine = YES; // [contentView addTapBlock:^(id _Nonnull obj) { // [weakSelf didClickSeatView:obj]; // }]; @@ -88,6 +89,8 @@ static NSInteger maxSeat = 8; } [self.seatArray addObject:self.compereView]; [self.seatArray addObject:self.guestView]; + self.compereView.noOffLine = YES; + self.guestView.noOffLine = YES; } -(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event{ diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib index 2a85867..a5d6f7a 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib @@ -39,7 +39,7 @@