diff --git a/Podfile b/Podfile index cc4bcee..de21bb9 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ target 'yinmeng-ios' do pod 'MBProgressHUD' pod 'SVGAPlayer' pod 'YYText' - pod 'YYWebImage', '~> 1.0.5' + pod 'YYWebImage' #下拉刷新控件 pod 'MJRefresh' # 滑动标签栏 @@ -22,26 +22,27 @@ target 'yinmeng-ios' do #cell pod 'Reusable' #约束 - pod 'SnapKit', '~> 5.6.0' + pod 'SnapKit' #获取设备信息 - pod 'DeviceKit', '~> 4.0' + pod 'DeviceKit' pod 'Nuke' pod "NSObject+Rx" pod 'Qiniu' #文字自动滚动 pod 'MarqueeLabel' - pod 'NIMSDK_LITE', '9.6.1' + pod 'NIMSDK_LITE' pod 'TZImagePickerController' pod 'LookinServer', :configurations => ['Debug'] #pop动画 - pod 'pop', '~> 1.0.12' + pod 'pop' pod 'FFPopup' - pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530' + pod 'TXLiteAVSDK_TRTC' pod 'MJExtension' pod 'QGVAPlayer' + #声网 - pod 'AgoraRtcEngine_iOS', '~> 4.2.2' + pod 'AgoraRtcEngine_iOS' # Pods for yinmeng-ios end diff --git a/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios.xcodeproj/project.pbxproj index 96ca8d6..558b3c6 100644 --- a/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 23116B0A2BDB8CA100F7F97A /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 23116B072BDB812600F7F97A /* PrivacyInfo.xcprivacy */; }; 2311D69D2B8DC311001C70AB /* PlanetStarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2311D69C2B8DC311001C70AB /* PlanetStarModel.swift */; }; 2311D6A12B8DD649001C70AB /* StarIcon.svga in Resources */ = {isa = PBXBuildFile; fileRef = 2311D6A02B8DD649001C70AB /* StarIcon.svga */; }; 2311D6A52B8F0E06001C70AB /* StarGift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 2311D6A42B8F0E06001C70AB /* StarGift.svga */; }; @@ -192,6 +193,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 23116B072BDB812600F7F97A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 2311D69C2B8DC311001C70AB /* PlanetStarModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanetStarModel.swift; sourceTree = ""; }; 2311D6A02B8DD649001C70AB /* StarIcon.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = StarIcon.svga; sourceTree = ""; }; 2311D6A42B8F0E06001C70AB /* StarGift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = StarGift.svga; sourceTree = ""; }; @@ -247,7 +249,6 @@ 23630BCE2BADA7D9003AD25D /* SendGiftSendNumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendGiftSendNumView.swift; sourceTree = ""; }; 23630BD02BADA900003AD25D /* SendGiftSendNumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendGiftSendNumCell.swift; sourceTree = ""; }; 23630BD22BADA9FF003AD25D /* SendGiftSendNumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendGiftSendNumModel.swift; sourceTree = ""; }; - 2368ECE02BC521B200EDF4C9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 238F418C2BBAB08A008564B8 /* YinUserInfoHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YinUserInfoHeadView.swift; sourceTree = ""; }; 238F418E2BBAC7BF008564B8 /* YinUserInfoHeadItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YinUserInfoHeadItemView.swift; sourceTree = ""; }; 238F41932BBBDCBE008564B8 /* YinUserInfoMoreCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YinUserInfoMoreCell.swift; sourceTree = ""; }; @@ -1198,7 +1199,6 @@ E884E85E2B6900C500ADE6EE /* AppDelegate.swift */, E884E8642B6900C500ADE6EE /* Main.storyboard */, 2311D6DC2B9204EF001C70AB /* logoBg.png */, - 2368ECE02BC521B200EDF4C9 /* PrivacyInfo.xcprivacy */, 2311D6D82B920442001C70AB /* yinLogo.png */, 2311D6DA2B920478001C70AB /* textLogo.png */, 23EE96F92BA1A3A200475D69 /* YinSpeak.svga */, @@ -1209,6 +1209,7 @@ E884E8672B6900C600ADE6EE /* Assets.xcassets */, E884E8692B6900C600ADE6EE /* LaunchScreen.storyboard */, E884E86C2B6900C600ADE6EE /* Info.plist */, + 23116B072BDB812600F7F97A /* PrivacyInfo.xcprivacy */, ); path = "yinmeng-ios"; sourceTree = ""; @@ -1381,6 +1382,7 @@ E884E8582B6900C500ADE6EE /* Frameworks */, E884E8592B6900C500ADE6EE /* Resources */, 0486212FDC8E85876369464E /* [CP] Embed Pods Frameworks */, + 342A0E7CD92CA856FA58E3A4 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -1430,6 +1432,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 23116B0A2BDB8CA100F7F97A /* PrivacyInfo.xcprivacy in Resources */, 23EE96FA2BA1A3A300475D69 /* YinSpeak.svga in Resources */, 2311D6D92B920442001C70AB /* yinLogo.png in Resources */, E884E86B2B6900C600ADE6EE /* LaunchScreen.storyboard in Resources */, @@ -1464,6 +1467,23 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + 342A0E7CD92CA856FA58E3A4 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-yinmeng-ios/Pods-yinmeng-ios-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 65A9458CEC329A8AC9C7F88D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1815,7 +1835,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -1837,7 +1857,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.7; PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1859,7 +1879,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -1881,7 +1901,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.7; PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate b/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 228b612..0000000 Binary files a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index e0e52ca..0000000 --- a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - diff --git a/yinmeng-ios/Modules/User/View/YinUserInfoHeadView.swift b/yinmeng-ios/Modules/User/View/YinUserInfoHeadView.swift index feee425..1a20460 100644 --- a/yinmeng-ios/Modules/User/View/YinUserInfoHeadView.swift +++ b/yinmeng-ios/Modules/User/View/YinUserInfoHeadView.swift @@ -397,7 +397,7 @@ class YinUserInfoHeadView: UIView{ }() private lazy var arrowView:UIButton = { let _arrowView = UIButton.getCustomBtn(image: UIImage(named: "yin_mine_header_arrow")) - + _arrowView.isHidden = true return _arrowView }()