Skip to content

G
galaxy-iOS
Commit 6c4eb07a authored by David黄金龙's avatar David黄金龙
Browse files
Options

正式批 动画相关

parent 0a459c37
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 37 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 6c4eb07a
......@@ -455,6 +455,7 @@
A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4E22BB6C4BB000DEECD /* YHDocumentUploadView.swift */; };
A517A4E52BB6C4BB000DEECD /* YHDocumentFileItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4E32BB6C4BB000DEECD /* YHDocumentFileItemView.swift */; };
A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A520124E2BABCE05008655EA /* YHFileListContentView.swift */; };
A537126F2C64EA0800FF1844 /* 45678.gif in Resources */ = {isa = PBXBuildFile; fileRef = A537126E2C64EA0800FF1844 /* 45678.gif */; };
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */; };
A53B61192BB3C9960010B573 /* YHMyDocListHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */; };
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
......@@ -603,8 +604,6 @@
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
A5F9E9F72C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F9E9F62C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift */; };
A5F9E9FA2C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F9E9F92C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift */; };
A5F9E9FD2C647187005BCA73 /* flower1.json in Resources */ = {isa = PBXBuildFile; fileRef = A5F9E9FC2C647187005BCA73 /* flower1.json */; };
A5F9E9FF2C6474EC005BCA73 /* flower3.gif in Resources */ = {isa = PBXBuildFile; fileRef = A5F9E9FE2C6474EC005BCA73 /* flower3.gif */; };
A5F9EA012C647506005BCA73 /* flower2.json in Resources */ = {isa = PBXBuildFile; fileRef = A5F9EA002C647506005BCA73 /* flower2.json */; };
A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD45222C523DD300908AD9 /* YHJsApi.swift */; };
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
......@@ -1106,6 +1105,7 @@
A517A4E22BB6C4BB000DEECD /* YHDocumentUploadView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDocumentUploadView.swift; sourceTree = "<group>"; };
A517A4E32BB6C4BB000DEECD /* YHDocumentFileItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDocumentFileItemView.swift; sourceTree = "<group>"; };
A520124E2BABCE05008655EA /* YHFileListContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
A537126E2C64EA0800FF1844 /* 45678.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = 45678.gif; sourceTree = "<group>"; };
A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemsView2.swift; sourceTree = "<group>"; };
A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocListHeaderView.swift; sourceTree = "<group>"; };
A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
......@@ -1259,8 +1259,6 @@
A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
A5F9E9F62C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalGuildLineCheckView.swift; sourceTree = "<group>"; };
A5F9E9F92C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessCheckView.swift; sourceTree = "<group>"; };
A5F9E9FC2C647187005BCA73 /* flower1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = flower1.json; sourceTree = "<group>"; };
A5F9E9FE2C6474EC005BCA73 /* flower3.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "\bflower3.gif"; sourceTree = "<group>"; };
A5F9EA002C647506005BCA73 /* flower2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = flower2.json; sourceTree = "<group>"; };
A5FD45222C523DD300908AD9 /* YHJsApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHJsApi.swift; sourceTree = "<group>"; };
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
......@@ -2379,6 +2377,7 @@
048FA0302BFDDFF400AD3BA9 /* gif */ = {
isa = PBXGroup;
children = (
A537126E2C64EA0800FF1844 /* 45678.gif */,
048FA0312BFDDFF400AD3BA9 /* submit_head_animation.gif */,
048FA0322BFDDFF400AD3BA9 /* submit_page_scroll.gif */,
);
......@@ -3292,8 +3291,8 @@
A5DF3D4A2BF9A304003D5F03 /* jsons */ = {
isa = PBXGroup;
children = (
A5F9EA002C647506005BCA73 /* flower2.json */,
A5F9EA022C647D32005BCA73 /* tabbar */,
A5F9E9FB2C647063005BCA73 /* officialApproval */,
043BA8822C24360C006EF02D /* people_rotate */,
043BA87C2C2435D4006EF02D /* people_launch */,
043BA8762C243477006EF02D /* people_head */,
......@@ -3359,16 +3358,6 @@
path = V;
sourceTree = "<group>";
};
A5F9E9FB2C647063005BCA73 /* officialApproval */ = {
isa = PBXGroup;
children = (
A5F9E9FE2C6474EC005BCA73 /* flower3.gif */,
A5F9EA002C647506005BCA73 /* flower2.json */,
A5F9E9FC2C647187005BCA73 /* flower1.json */,
);
path = "\U001dofficialApproval";
sourceTree = "<group>";
};
A5F9EA022C647D32005BCA73 /* tabbar */ = {
isa = PBXGroup;
children = (
......@@ -3508,8 +3497,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A5F9E9FF2C6474EC005BCA73 /* flower3.gif in Resources */,
04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */,
A537126F2C64EA0800FF1844 /* 45678.gif in Resources */,
04F0ABF42C364F9400518C30 /* my.json in Resources */,
049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */,
045EEED42B9F171A0022A143 /* scoreOptionData.plist in Resources */,
......@@ -3525,7 +3514,6 @@
04F0ABF52C364F9400518C30 /* community.json in Resources */,
04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
048FA0332BFDDFF400AD3BA9 /* submit_head_animation.gif in Resources */,
A5F9E9FD2C647187005BCA73 /* flower1.json in Resources */,
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
A5F9EA012C647506005BCA73 /* flower2.json in Resources */,
A5EE42022C216C78005BBA5D /* img_2.jpg in Resources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/OfficialApprovalBatch(正式批)/C/YHOfficialApprovalResultVC.swift
View file @ 6c4eb07a
......@@ -19,6 +19,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
setupUI()
}
//背景
lazy var bkgImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_bkg")
......@@ -27,6 +28,24 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
return imageV
}()
//白纸
lazy var paperImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_paper")
imageV.contentMode = .scaleAspectFit
imageV.clipsToBounds = true
return imageV
}()
//文档
lazy var docImageV: UIImageView = {
let imageV = UIImageView()
imageV.image = UIImage(named: "official_approval_result_doc")
imageV.contentMode = .scaleAspectFit
imageV.clipsToBounds = true
return imageV
}()
}
private extension YHOfficialApprovalResultVC {
......@@ -41,6 +60,29 @@ private extension YHOfficialApprovalResultVC {
make.edges.equalToSuperview()
}
view.addSubview(paperImageV)
paperImageV.snp.makeConstraints { make in
make.left.equalToSuperview()
make.top.equalToSuperview().offset(200)
make.width.equalTo(294)
make.height.equalTo(530)
}
paperImageV.layer.zPosition = 0
view.addSubview(docImageV)
docImageV.snp.makeConstraints { make in
make.right.equalToSuperview()
make.top.equalToSuperview().offset(64)
make.width.equalTo(294)
make.height.equalTo(530)
}
docImageV.layer.zPosition = 1
}
func addRightItem() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/OfficialApprovalBatch(正式批)/V/YHOffivialApprovalSuccessCheckView.swift
View file @ 6c4eb07a
......@@ -27,7 +27,7 @@ class YHOffivialApprovalSuccessCheckView: UIView {
lazy var scrollBgImgV:YYAnimatedImageView = {
let img = YYImage(named:"vid_0.gif")
let img = YYImage(named:"45678.gif")
let imgV = YYAnimatedImageView(image: img)
imgV.autoPlayAnimatedImage = false
imgV.currentAnimatedImageIndex = 0
......@@ -39,6 +39,8 @@ class YHOffivialApprovalSuccessCheckView: UIView {
let button = UIButton(type: .custom)
button.addTarget(self, action: #selector(clickSureBtn), for: .touchUpInside)
button.setImage(UIImage(named: "official_approval_btn"), for: .normal)
button.setImage(UIImage(named: "official_approval_btn"), for: .disabled)
button.isEnabled = false
return button
}()
......@@ -114,6 +116,7 @@ extension YHOffivialApprovalSuccessCheckView {
@objc func clickSureBtn() {
YHHUD.flash(message: "点击了 xx")
dismiss()
}
@objc func clickCloseBtn() {
......@@ -150,8 +153,8 @@ private extension YHOffivialApprovalSuccessCheckView {
holdView.addSubview(rewardBtn)
rewardBtn.snp.makeConstraints { make in
make.top.equalTo(233)
make.width.equalTo(188)
make.height.equalTo(36)
make.width.equalTo(196)
make.height.equalTo(44)
make.centerX.equalToSuperview()
}
......@@ -169,31 +172,35 @@ private extension YHOffivialApprovalSuccessCheckView {
self.holdView.frame = CGRect(x: 0, y: (KScreenHeight-imageH)/2 + 20, width: KScreenWidth, height: imageH)
} completion: { flag in
self.titleLabel.isHidden = false
self.closeBtn.isHidden = false
// self.startTyping()
self.startTypingEffect()
}
}
// addSubview(animationView)
// animationView.snp.makeConstraints { make in
// make.edges.equalToSuperview()
// }
// animationView.play { completed in
// self.animationView.isHidden = true
// }
addSubview(animationView)
animationView.snp.makeConstraints { make in
addSubview(scrollBgImgV)
scrollBgImgV.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
animationView.play { completed in
self.animationView.isHidden = true
self.scrollBgImgV.isHidden = false
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1) {
self.scrollBgImgV.animationRepeatCount = 2
self.scrollBgImgV.startAnimating()
Timer.scheduledTimer(withTimeInterval: 4, repeats: false) { timer in
self.scrollBgImgV.stopAnimating()
timer.invalidate()
self.closeBtn.isHidden = false
self.scrollBgImgV.isHidden = true
self.rewardBtn.isEnabled = true
}
}
// addSubview(scrollBgImgV)
// scrollBgImgV.snp.makeConstraints { make in
// make.edges.equalToSuperview()
// }
//
// DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1) {
// self.scrollBgImgV.startAnimating()
// }
}
......
galaxy/galaxy/Res/jsons/officialApproval/flower3.gif deleted 100644 → 0
View file @ 0a459c37
This diff is collapsed.
galaxy/galaxy/Res/jsons/officialApproval/flower1.json deleted 100644 → 0
View file @ 0a459c37
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment