diff --git a/Podfile b/Podfile index 195ef0a..5600633 100644 --- a/Podfile +++ b/Podfile @@ -34,7 +34,7 @@ target 'Thimra' do pod 'EmptyStateKit' #空数据页面 pod 'ReachabilitySwift' #网络状态监控 pod 'WMZPageController' #分页控制器 - + pod 'SVProgressHUD' #HUD diff --git a/Podfile.lock b/Podfile.lock index 4c78339..e6ab7a9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,6 +14,9 @@ PODS: - ReachabilitySwift (5.2.4) - SmartCodable (4.3.2) - SnapKit (5.7.1) + - SVProgressHUD (2.3.1): + - SVProgressHUD/Core (= 2.3.1) + - SVProgressHUD/Core (2.3.1) - Toast (4.1.1) - WMZPageController (1.5.5) - YYKit (1.0.9): @@ -33,6 +36,7 @@ DEPENDENCIES: - ReachabilitySwift - SmartCodable - SnapKit + - SVProgressHUD - Toast - WMZPageController - YYKit @@ -51,6 +55,7 @@ SPEC REPOS: - ReachabilitySwift - SmartCodable - SnapKit + - SVProgressHUD - Toast - WMZPageController - YYKit @@ -68,11 +73,12 @@ SPEC CHECKSUMS: ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda SmartCodable: 88fbf3d65207c2376fdbce4b080a3d578cb51be8 SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a + SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22 Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e WMZPageController: 87dd82d1e3528cd362de19b9a74fd6890d6e1906 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13 -PODFILE CHECKSUM: 6569d2af22714fb67d77646500c1ce1c95d63b3c +PODFILE CHECKSUM: a2c39b60a617ef47e0a8a03d4115500405588542 COCOAPODS: 1.16.2 diff --git a/Thimra/AppDelegate/AppDelegate+Config.swift b/Thimra/AppDelegate/AppDelegate+Config.swift index b399337..dc2f6d6 100644 --- a/Thimra/AppDelegate/AppDelegate+Config.swift +++ b/Thimra/AppDelegate/AppDelegate+Config.swift @@ -15,6 +15,8 @@ extension AppDelegate { // keyBoardStyle() SPToast.config() + + SPHUD.config() } diff --git a/Thimra/Base/Networking/Base/SPNetwork.swift b/Thimra/Base/Networking/Base/SPNetwork.swift index 3e3d132..72ef019 100644 --- a/Thimra/Base/Networking/Base/SPNetwork.swift +++ b/Thimra/Base/Networking/Base/SPNetwork.swift @@ -50,12 +50,12 @@ class SPNetwork: NSObject { static func _request(parameters: SPNetworkParameters, completion: ((_ response: SPNetworkResponse) -> Void)?) -> Cancellable { if parameters.isLoding { -// ETHUD.show() + SPHUD.show() } return provider.requestCustomJson(.request(parameters: parameters)) { (result) in if parameters.isLoding { -// ETHUD.dismiss() + SPHUD.dismiss() } guard let completion = completion else {return} diff --git a/Thimra/Base/Networking/Base/SPURLPath.swift b/Thimra/Base/Networking/Base/SPURLPath.swift index 61a6315..a9c50b6 100644 --- a/Thimra/Base/Networking/Base/SPURLPath.swift +++ b/Thimra/Base/Networking/Base/SPURLPath.swift @@ -8,26 +8,22 @@ import UIKit /* - https://admin-thimratv.guyantv.com/login + - https://api-thimratv.thimratv.com/0a2c5b02/ - - 新app的web需要适配 https://thimratv.com/ https://www.thimratv.com/ https://campaign.thimratv.com/ */ #if DEBUG -//let SPBaseURL = "https://test1-api.guyantv.com" -//let SPURLPathPrefix = "" let SPBaseURL = "https://api-thimratv.thimratv.com" let SPURLPathPrefix = "/0a2c5b02" let SPWebBaseURL = "https://www.thimratv.com" #else -let SPBaseURL = " https://api-thimratv.thimratv.com" +let SPBaseURL = "https://api-thimratv.thimratv.com" let SPURLPathPrefix = "/0a2c5b02" + let SPWebBaseURL = "https://www.thimratv.com" #endif diff --git a/Thimra/Libs/HUD/SPHUD.swift b/Thimra/Libs/HUD/SPHUD.swift new file mode 100644 index 0000000..9d76f8a --- /dev/null +++ b/Thimra/Libs/HUD/SPHUD.swift @@ -0,0 +1,23 @@ +// +// SPHUD.swift +// Thimra +// +// Created by Overseas on 2025/4/24. +// + +import UIKit + +class SPHUD: NSObject { + static func config() { + SVProgressHUD.setDefaultMaskType(.clear) + } + + static func show() { + SVProgressHUD.setDefaultMaskType(.clear) + SVProgressHUD.show() + } + + static func dismiss() { + SVProgressHUD.dismiss() + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/Contents.json b/Thimra/Source/Assets.xcassets/LaunchScreen/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Thimra/Source/Assets.xcassets/LaunchScreen/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json new file mode 100644 index 0000000..575adc4 --- /dev/null +++ b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png new file mode 100644 index 0000000..7f38b11 Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png new file mode 100644 index 0000000..abbe58c Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json new file mode 100644 index 0000000..d8d4737 --- /dev/null +++ b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png new file mode 100644 index 0000000..0e66982 Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png new file mode 100644 index 0000000..6ebd314 Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json new file mode 100644 index 0000000..77c7666 --- /dev/null +++ b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png new file mode 100644 index 0000000..ebfc142 Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png new file mode 100644 index 0000000..6a0cbfd Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json new file mode 100644 index 0000000..d28576e --- /dev/null +++ b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 4@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 4@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png new file mode 100644 index 0000000..5c3a11f Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png differ diff --git a/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png new file mode 100644 index 0000000..7569b9a Binary files /dev/null and b/Thimra/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png differ diff --git a/Thimra/Source/Base.lproj/LaunchScreen.storyboard b/Thimra/Source/Base.lproj/LaunchScreen.storyboard index 865e932..d319f91 100644 --- a/Thimra/Source/Base.lproj/LaunchScreen.storyboard +++ b/Thimra/Source/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,11 @@ - - + + + - + + + @@ -11,10 +14,36 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22,4 +51,13 @@ + + + + + + + + + diff --git a/Thimra/Source/Thimra-Bridging-Header.h b/Thimra/Source/Thimra-Bridging-Header.h index 30f41af..2cf3878 100644 --- a/Thimra/Source/Thimra-Bridging-Header.h +++ b/Thimra/Source/Thimra-Bridging-Header.h @@ -15,3 +15,4 @@ #import #import #import "WMPageController.h" +#import