Skip to content

Commit 5909d39

Browse files
author
wangfei
committed
修改scale
1 parent 709a751 commit 5909d39

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

TodayTransition/TodayTransition.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
buildSettings = {
446446
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
447447
CODE_SIGN_STYLE = Automatic;
448-
DEVELOPMENT_TEAM = HC3HD96FXF;
448+
DEVELOPMENT_TEAM = SQDU4YLT33;
449449
INFOPLIST_FILE = TodayTransition/Info.plist;
450450
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
451451
LD_RUNPATH_SEARCH_PATHS = (
@@ -464,7 +464,7 @@
464464
buildSettings = {
465465
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
466466
CODE_SIGN_STYLE = Automatic;
467-
DEVELOPMENT_TEAM = HC3HD96FXF;
467+
DEVELOPMENT_TEAM = SQDU4YLT33;
468468
INFOPLIST_FILE = TodayTransition/Info.plist;
469469
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
470470
LD_RUNPATH_SEARCH_PATHS = (

TodayTransition/TodayTransition/DetailViewController.swift

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,22 @@ class DetailViewController: UIViewController {
7777

7878
let btn = view.viewWithTag(99)
7979

80-
if scale >= 0.85 {
80+
if scale >= 0.8 {
8181
self.table.transform = CGAffineTransform(scaleX: scale, y: scale)
8282

83-
btn?.alpha = 1 - (1 - scale) * 1 / 0.15
83+
btn?.alpha = 1 - (1 - scale) * 1 / 0.2
8484

8585
self.table.layer.masksToBounds = true
86-
self.table.layer.cornerRadius = (1 - scale) * 10 / 0.15
86+
self.table.layer.cornerRadius = (1 - scale) * 15 / 0.2
8787

8888
}else {
89-
scale = 0.85
90-
self.navigationController?.popViewController(animated: true)
91-
self.table.transform = CGAffineTransform.identity
92-
btn?.alpha = 0
93-
btn?.removeFromSuperview()
94-
89+
scale = 0.8
90+
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
91+
self.navigationController?.popViewController(animated: true)
92+
self.table.transform = CGAffineTransform.identity
93+
btn?.alpha = 0
94+
btn?.removeFromSuperview()
95+
}
9596
}
9697

9798
break

0 commit comments

Comments
 (0)