Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d8bd551b 由 cgx
选项

新增网络请求指示器，并适配夜间模式

1 个父辈 f863800b
内嵌 并排
正在显示 7 个修改的文件 包含 22 行增加 和 44 行删除
DreamSleep/DreamSleep/Network/DSProgressHUD.h
......@@ -33,10 +33,6 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)showDetailInfo:(NSString *)info inView:(UIView *)view;
+ (void)showDetailInfo:(NSString *)info delay:(NSTimeInterval)delay;
/** 显示APP重载提示信息 */
+ (void)showDetailInfoForAppReload:(NSString *)info;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Network/DSProgressHUD.m
......@@ -6,7 +6,7 @@
//
#import "DSProgressHUD.h"
#import <MBProgressHUD/MBProgressHUD.h>
#import <MBProgressHUD.h>
@implementation DSProgressHUD
......@@ -81,20 +81,12 @@ static MBProgressHUD *hud;
[hud hideAnimated:NO afterDelay:delay];
}
+ (void)showDetailInfoForAppReload:(NSString *)info
{
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:DSKeyWindow animated:YES];
hud.mode = MBProgressHUDModeText;
hud.removeFromSuperViewOnHide = YES;
hud.detailsLabel.text = info;
hud.detailsLabel.font = [UIFont systemFontOfSize:14.0];
[hud hideAnimated:NO afterDelay:4.0];
}
+ (void)adjustThemeWithHud:(MBProgressHUD *)hud {
hud.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
hud.bezelView.dk_backgroundColorPicker = DKColorPickerWithColors(DSBlack, DSWhite, DSWhite);
hud.label.dk_textColorPicker = DKColorPickerWithColors(DSWhite, DSBlack, DSWhite);
hud.detailsLabel.dk_textColorPicker = DKColorPickerWithColors(DSWhite, DSBlack, DSWhite);
hud.contentColor = [hud.dk_manager.themeVersion isEqualToString:DKThemeVersionNormal] ? DSWhite : DSBlack;
}
@end
DreamSleep/DreamSleep/Profile/Account/AccountController.m
......@@ -40,7 +40,9 @@
#pragma mark - UserInfoViewDelegate
- (void)didTriggerUserAction:(int)index {
if (index == 1) { // 退出登录
[DSProgressHUD showProgressHUDWithInfo:@"正在退出"];
[UserRequestModel layoutRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
[DSProgressHUD dissmissProgressHUD];
if (requestModel.resCode == DSResCodeSuccess) {
[self clearUserData:@"退出成功"];
// 刷新我的个人信息相关数据
......@@ -52,7 +54,9 @@
#pragma mark - CloseAlertViewDelegate（注销账号）
- (void)didClickCloseUserBtn {
[DSProgressHUD showProgressHUDWithInfo:@"正在注销"];
[UserRequestModel closeUserRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
[DSProgressHUD dissmissProgressHUD];
if (requestModel.resCode == DSResCodeSuccess) {
[self.closeAlertView dismissCloseUserAlertView];
[self clearUserData:@"注销成功"];
......
DreamSleep/Podfile
......@@ -10,7 +10,6 @@ target 'DreamSleep' do
pod 'DOUAudioStreamer', '~> 0.2.16'
pod 'MBProgressHUD', '~> 1.2.0'
pod 'YYWebImage', '~> 1.0.5'
# pod 'YYImage/WebP'
pod 'YYModel', '~> 1.0.4'
end
......
DreamSleep/Podfile.lock
......@@ -75,6 +75,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
PODFILE CHECKSUM: f00caaba3112a9603146aa839feedababa93bb83
PODFILE CHECKSUM: f57f9b361f7780fe0e72846ec7653ec88ed1e48c
COCOAPODS: 1.11.3
DreamSleep/Pods/Manifest.lock
......@@ -75,6 +75,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
PODFILE CHECKSUM: f00caaba3112a9603146aa839feedababa93bb83
PODFILE CHECKSUM: f57f9b361f7780fe0e72846ec7653ec88ed1e48c
COCOAPODS: 1.11.3
DreamSleep/Pods/Pods.xcodeproj/project.pbxproj
......@@ -765,7 +765,7 @@
5EF79041D9E1040D70AD67FF7BEB2F35 /* YYCache-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "YYCache-Info.plist"; sourceTree = "<group>"; };
5EF969ED27FEA720E7E60A7E929CE326 /* UIPageControl+Night.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIPageControl+Night.m"; path = "DKNightVersion/UIKit/UIPageControl+Night.m"; sourceTree = "<group>"; };
5F3D1A2F9722B0A36F44584D4670650A /* CALayer+YYWebImage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "CALayer+YYWebImage.h"; path = "YYWebImage/Categories/CALayer+YYWebImage.h"; sourceTree = "<group>"; };
601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = YTKNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; };
601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = YTKNetwork; path = YTKNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61086D3D84126F964CFC26711E5932E1 /* LOTLayerGroup.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LOTLayerGroup.m; path = "lottie-ios/Classes/Models/LOTLayerGroup.m"; sourceTree = "<group>"; };
613469A03654E72ECBC919210AF4D34C /* View+MASAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "View+MASAdditions.h"; path = "Masonry/View+MASAdditions.h"; sourceTree = "<group>"; };
6165D42A20F701BA309E1C3411399835 /* YTKChainRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YTKChainRequest.h; path = YTKNetwork/YTKChainRequest.h; sourceTree = "<group>"; };
......@@ -887,7 +887,7 @@
9AB07800B5D6B6912EBD7B0BBB45381F /* YYAnimatedImageView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYAnimatedImageView.m; path = YYImage/YYAnimatedImageView.m; sourceTree = "<group>"; };
9ADFC91DE41A843E1DE64CA7E00E99C5 /* YTKChainRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YTKChainRequest.m; path = YTKNetwork/YTKChainRequest.m; sourceTree = "<group>"; };
9B660CA637979EDB2CF8336F870775C4 /* LOTValueInterpolator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTValueInterpolator.h; path = "lottie-ios/Classes/RenderSystem/InterpolatorNodes/LOTValueInterpolator.h"; sourceTree = "<group>"; };
9BD6F0B21CDAE9FA26016DC870A83047 /* Pods_DreamSleep.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DreamSleep.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9BD6F0B21CDAE9FA26016DC870A83047 /* Pods-DreamSleep */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-DreamSleep"; path = Pods_DreamSleep.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9BF58916B143279B23323492C57E1612 /* LOTGradientFillRender.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LOTGradientFillRender.m; path = "lottie-ios/Classes/RenderSystem/RenderNodes/LOTGradientFillRender.m"; sourceTree = "<group>"; };
9C1DE243C99C0666139DC12F44B5D33C /* NSLayoutConstraint+MASDebugAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSLayoutConstraint+MASDebugAdditions.h"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.h"; sourceTree = "<group>"; };
9CEE2BB7DE40FE4C8D2ACD29D0289540 /* DOUEAGLView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DOUEAGLView.m; path = src/DOUEAGLView.m; sourceTree = "<group>"; };
......@@ -908,7 +908,7 @@
A3C44EC33AA7BF6D2D2CF9B274AF61F5 /* LOTAsset.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTAsset.h; path = "lottie-ios/Classes/Models/LOTAsset.h"; sourceTree = "<group>"; };
A3E53B8FE56DFEA1CB05E6252B5790B6 /* NSObject+DeallocBlock.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+DeallocBlock.h"; path = "DKNightVersion/DeallocBlockExecutor/NSObject+DeallocBlock.h"; sourceTree = "<group>"; };
A455B2848003E4DFBF0B77148D0DB5C3 /* YYCache.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = YYCache.debug.xcconfig; sourceTree = "<group>"; };
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = AFNetworking; path = AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A5760943081F20582E8978B6065D22D5 /* DKColor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DKColor.m; path = DKNightVersion/Core/DKColor.m; sourceTree = "<group>"; };
A5A0463D70D729A4A40AEAF890E90640 /* YYImageCoder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YYImageCoder.h; path = YYImage/YYImageCoder.h; sourceTree = "<group>"; };
A629CB356708A98788C8D98AC5BD6FDB /* CAShapeLayer+Night.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "CAShapeLayer+Night.h"; path = "DKNightVersion/CoreAnimation/CAShapeLayer+Night.h"; sourceTree = "<group>"; };
......@@ -1031,7 +1031,7 @@
E460D5B0416D36F66EE8EC89E5D2FA0A /* YYModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = YYModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E47088ADD8AE6DB8C0978B8ACF022195 /* YYCache.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = YYCache.release.xcconfig; sourceTree = "<group>"; };
E4902A8876717BC9B777D927E672EC5A /* LOTMaskContainer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTMaskContainer.h; path = "lottie-ios/Classes/AnimatableLayers/LOTMaskContainer.h"; sourceTree = "<group>"; };
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MJRefresh.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MJRefresh; path = MJRefresh.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E676DCC4C64D1F04CBFF5A5C3F272075 /* LOTTrimPathNode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LOTTrimPathNode.m; path = "lottie-ios/Classes/RenderSystem/ManipulatorNodes/LOTTrimPathNode.m"; sourceTree = "<group>"; };
E677E28EA82716A992F7D1432C435902 /* LOTBlockCallback.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LOTBlockCallback.m; path = "lottie-ios/Classes/Private/LOTBlockCallback.m"; sourceTree = "<group>"; };
E6CF255EDC0D76BEC29D708DA0F455A0 /* LOTAnimationCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTAnimationCache.h; path = "lottie-ios/Classes/PublicHeaders/LOTAnimationCache.h"; sourceTree = "<group>"; };
......@@ -1685,15 +1685,15 @@
8EBED1F8E09ECFA915D1609640CD2F9B /* Products */ = {
isa = PBXGroup;
children = (
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */,
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */,
D49390DC16189A74052FAC3455F18249 /* DKNightVersion.framework */,
04B380B6648264692DA26C32040918AF /* DOUAudioStreamer.framework */,
51BA97E8B5085EFFB47BC9C0B785CEA7 /* Lottie.framework */,
1FFED36A657123030ABB700256D73F15 /* Masonry.framework */,
8B8FAB0D627B17EDE1366984278705D9 /* MBProgressHUD.framework */,
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */,
9BD6F0B21CDAE9FA26016DC870A83047 /* Pods_DreamSleep.framework */,
601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork.framework */,
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */,
9BD6F0B21CDAE9FA26016DC870A83047 /* Pods-DreamSleep */,
601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork */,
48ACF38225AF5129416A1F090F6D3286 /* YYCache.framework */,
0C6F4829D47D1826F47CDC4264F9F6A8 /* YYImage.framework */,
E460D5B0416D36F66EE8EC89E5D2FA0A /* YYModel.framework */,
......@@ -2430,7 +2430,7 @@
);
name = AFNetworking;
productName = AFNetworking;
productReference = A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking.framework */;
productReference = A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */;
productType = "com.apple.product-type.framework";
};
0B967D7F8561D42493EE289EC8D450D1 /* lottie-ios */ = {
......@@ -2516,7 +2516,7 @@
);
name = "Pods-DreamSleep";
productName = Pods_DreamSleep;
productReference = 9BD6F0B21CDAE9FA26016DC870A83047 /* Pods_DreamSleep.framework */;
productReference = 9BD6F0B21CDAE9FA26016DC870A83047 /* Pods-DreamSleep */;
productType = "com.apple.product-type.framework";
};
5CEB6950CD05DCBC58038F439D626086 /* DOUAudioStreamer */ = {
......@@ -2552,7 +2552,7 @@
);
name = MJRefresh;
productName = MJRefresh;
productReference = E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh.framework */;
productReference = E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */;
productType = "com.apple.product-type.framework";
};
822E44240F2922DAB12018A6B649BD19 /* YYImage */ = {
......@@ -2643,7 +2643,7 @@
);
name = YTKNetwork;
productName = YTKNetwork;
productReference = 601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork.framework */;
productReference = 601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork */;
productType = "com.apple.product-type.framework";
};
CFDAE6EB02F58B9A37CADCF439AE6082 /* YYCache */ = {
......@@ -2671,7 +2671,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1240;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1240;
};
buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
compatibilityVersion = "Xcode 13.0";
......@@ -3305,7 +3305,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/MJRefresh/MJRefresh.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = MJRefresh;
PRODUCT_NAME = MJRefresh;
SDKROOT = iphoneos;
......@@ -3409,7 +3408,6 @@
);
MACH_O_TYPE = staticlib;
MODULEMAP_FILE = "Target Support Files/Pods-DreamSleep/Pods-DreamSleep.modulemap";
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
PODS_ROOT = "$(SRCROOT)";
......@@ -3445,7 +3443,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/YYImage/YYImage.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = YYImage;
PRODUCT_NAME = YYImage;
SDKROOT = iphoneos;
......@@ -3547,7 +3544,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/lottie-ios/lottie-ios.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = Lottie;
PRODUCT_NAME = Lottie;
SDKROOT = iphoneos;
......@@ -3683,7 +3679,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/AFNetworking/AFNetworking.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = AFNetworking;
PRODUCT_NAME = AFNetworking;
SDKROOT = iphoneos;
......@@ -3717,7 +3712,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/DKNightVersion/DKNightVersion.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = DKNightVersion;
PRODUCT_NAME = DKNightVersion;
SDKROOT = iphoneos;
......@@ -3819,7 +3813,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/YYWebImage/YYWebImage.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = YYWebImage;
PRODUCT_NAME = YYWebImage;
SDKROOT = iphoneos;
......@@ -3993,7 +3986,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/YYModel/YYModel.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = YYModel;
PRODUCT_NAME = YYModel;
SDKROOT = iphoneos;
......@@ -4359,7 +4351,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/YYCache/YYCache.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = YYCache;
PRODUCT_NAME = YYCache;
SDKROOT = iphoneos;
......@@ -4393,7 +4384,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/MBProgressHUD/MBProgressHUD.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = MBProgressHUD;
PRODUCT_NAME = MBProgressHUD;
SDKROOT = iphoneos;
......@@ -4461,7 +4451,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/YTKNetwork/YTKNetwork.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = YTKNetwork;
PRODUCT_NAME = YTKNetwork;
SDKROOT = iphoneos;
......@@ -4529,7 +4518,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/DOUAudioStreamer/DOUAudioStreamer.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = DOUAudioStreamer;
PRODUCT_NAME = DOUAudioStreamer;
SDKROOT = iphoneos;
......@@ -4697,7 +4685,6 @@
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "Target Support Files/Masonry/Masonry.modulemap";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_MODULE_NAME = Masonry;
PRODUCT_NAME = Masonry;
SDKROOT = iphoneos;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!