Skip to content

G
galaxy-iOS
Commit 83d7bad5 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

parents e16867b6 8aaa0e53
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 55 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 83d7bad5
......@@ -303,6 +303,7 @@
04AD317D2C295AE800DF5655 /* YHUserInfoSettingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AD317C2C295AE800DF5655 /* YHUserInfoSettingViewModel.swift */; };
04AD317F2C295C0300DF5655 /* YHChangeHeadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AD317E2C295C0300DF5655 /* YHChangeHeadModel.swift */; };
04ADBCA22C3674E300C37F10 /* YHMyLikeActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04ADBCA12C3674E300C37F10 /* YHMyLikeActivityViewController.swift */; };
04ADBCA42C36906000C37F10 /* YHHeadImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04ADBCA32C36906000C37F10 /* YHHeadImageViewController.swift */; };
04AF514E2BEB585C00009E3A /* YHVideoPlayerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF514D2BEB585C00009E3A /* YHVideoPlayerVC.swift */; };
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
04AF82D62C25542D0028CE2A /* YHInterestTopicLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF82D52C25542D0028CE2A /* YHInterestTopicLayout.swift */; };
......@@ -883,6 +884,7 @@
04AD317C2C295AE800DF5655 /* YHUserInfoSettingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoSettingViewModel.swift; sourceTree = "<group>"; };
04AD317E2C295C0300DF5655 /* YHChangeHeadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChangeHeadModel.swift; sourceTree = "<group>"; };
04ADBCA12C3674E300C37F10 /* YHMyLikeActivityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyLikeActivityViewController.swift; sourceTree = "<group>"; };
04ADBCA32C36906000C37F10 /* YHHeadImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHeadImageViewController.swift; sourceTree = "<group>"; };
04AF514D2BEB585C00009E3A /* YHVideoPlayerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlayerVC.swift; sourceTree = "<group>"; };
04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
04AF82D52C25542D0028CE2A /* YHInterestTopicLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInterestTopicLayout.swift; sourceTree = "<group>"; };
......@@ -1386,6 +1388,7 @@
044D0C1D2C22CFBF00C5CF5E /* YHEditWorkViewController.swift */,
044D0C1F2C22D37500C5CF5E /* YHEditHonorViewController.swift */,
04AD31762C22DE6600DF5655 /* YHEditInterestViewController.swift */,
04ADBCA32C36906000C37F10 /* YHHeadImageViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -3507,6 +3510,7 @@
04EA23082BB50753009DA928 /* YHDocumentMessageTableViewCell.swift in Sources */,
045EEE8E2B9F171A0022A143 /* YHPreviewInfoWorkSummaryView.swift in Sources */,
045EEECE2B9F171A0022A143 /* YHScoreDetailViewController.swift in Sources */,
04ADBCA42C36906000C37F10 /* YHHeadImageViewController.swift in Sources */,
045EEE852B9F171A0022A143 /* YHPreviewFamilyMemberViewController.swift in Sources */,
04FA8B332C0880A100ABE43F /* YHAppleLoginViewModel.swift in Sources */,
045EEE7F2B9F171A0022A143 /* YHWorkExpInfoPreviewModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift
View file @ 83d7bad5
......@@ -224,6 +224,11 @@ extension YHOneKeyLoginManager {
}
}
func isRunningOnSimulator() -> Bool {
return ProcessInfo.processInfo.environment["SIMULATOR_MODEL_IDENTIFIER"] != nil
}
func createLoginUIModel() -> TXCustomModel {
let model = TXCustomModel()
......@@ -336,7 +341,7 @@ extension YHOneKeyLoginManager {
let alertBtnWith = alertWidth-16.0*2
let alertBtnHeight = 45.0
var currentTop = 0.0
var currentTop : CGFloat = 0.0
model.privacyAlertTitleFrameBlock = {
screenSize, superViewSize, frame in
return CGRectMake(0, 15, frame.size.width, titleHeight)
......@@ -350,18 +355,33 @@ extension YHOneKeyLoginManager {
attributes: attributes,
context: nil
).size
let textHeight = ceill(boundingSize.height)
#if targetEnvironment(simulator)
// 这段代码只会在模拟器上编译
let textHeight = ceill(Float80(boundingSize.height))
model.privacyAlertPrivacyContentFrameBlock = {
screenSize, superViewSize, frame in
return CGRectMake(21.0, 15+24+33, alertContentWidth, textHeight)
return CGRectMake(21.0, 15.0+24.0+33.0, alertContentWidth, CGFloat(textHeight))
}
currentTop += 33+textHeight
currentTop = currentTop + 33.0 + Double(textHeight)
#else
// 这段代码只会在真机上编译
let textHeight = ceill(boundingSize.height)
model.privacyAlertPrivacyContentFrameBlock = {
screenSize, superViewSize, frame in
return CGRectMake(21.0, 15.0+24.0+33.0, alertContentWidth, CGFloat(textHeight))
}
currentTop = currentTop + 33.0 + Double(textHeight)
model.privacyAlertButtonFrameBlock = {
screenSize, superViewSize, frame in
return CGRectMake(16, 15+24+33+textHeight+36.0, alertBtnWith, alertBtnHeight)
}
#endif
currentTop += 36.0+alertBtnHeight
let totalHeight = currentTop + 16.0
model.privacyAlertFrameBlock = {
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepOneViewController.swift
View file @ 83d7bad5
......@@ -177,11 +177,18 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
view.endEditing(true)
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
self.photoImageView.image = image
self.viewModel.uploadImage(image, true) {[weak self] success, error in
let clipperVC = YHHeadImageViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Move)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
self.viewModel.model.avatar = success ?? ""
self.photoImageView.image = result
self.viewModel.uploadImage(result, true) {[weak self] success, error in
guard let self = self else { return }
self.viewModel.model.avatar = success ?? ""
}
}
self.navigationController?.pushViewController(clipperVC, animated: true)
}
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHAddFriendCardCell.swift
View file @ 83d7bad5
......@@ -301,8 +301,21 @@ class YHAddFriendCardCell: UITableViewCell {
attributes: attributes,
context: nil
).size
let textHeight = ceill(boundingSize.height)
#if targetEnvironment(simulator)
// 这段代码只会在模拟器上编译
print("This is running on a simulator.")
let textHeight : CGFloat = CGFloat(ceill(Float80(CGFloat(boundingSize.height))))
return textHeight
#else
// 这段代码只会在真机上编译
print("This is running on a physical device.")
let textHeight : CGFloat = ceill(CGFloat(boundingSize.height))
return textHeight
#endif
return 0.0
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHImageClipperViewController.swift
View file @ 83d7bad5
......@@ -52,15 +52,10 @@ class YHImageClipperViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .black
self.hidesBottomBarWhenPushed = true
if #available(iOS 11.0, *) {
} else {
self.automaticallyAdjustsScrollViewInsets = false
}
// Do any additional setup after loading the view.
setView()
gk_navigationBar.isHidden = true
}
func setView() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ 83d7bad5
......@@ -423,7 +423,8 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
let clipperVC = YHImageClipperViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Stay)
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: image.size.width, height: image.size.height), type: .Stay)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
self.viewModel.mainModel.wduty = result
......@@ -467,7 +468,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
let clipperVC = YHImageClipperViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Stay)
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: image.size.width, height: image.size.height), type: .Stay)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
self.viewModel.mainModel.highlights = result
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift
View file @ 83d7bad5
......@@ -248,7 +248,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
let clipperVC = YHImageClipperViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Stay)
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: image.size.width, height: image.size.height), type: .Stay)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
self.dataSource.project_highlights = result
......@@ -323,7 +323,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
// if longTimeButton.isSelected {
// dataSource.project_end_time = "至今"
// }
guard let _ = dataSource.project_name else {
guard let name = dataSource.project_name, name.count != 0 else {
YHHUD.flash(message: "您还有信息未填写")
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift
View file @ 83d7bad5
......@@ -457,8 +457,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
guard entryTime.count > 0 else { return false }
guard workCertificate.count > 0 else { return false }
guard duty.count > 0 else { return false }
guard companyMemberTotal > 0 else { return false }
guard companyManageTotal > 0 else { return false }
guard companyMemberTotal >= 0 else { return false }
guard companyManageTotal >= 0 else { return false }
guard professionalLevel > 0 else { return false }
if country.contains("中国") {
guard area.count > 0 else { return false }
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift
View file @ 83d7bad5
......@@ -155,11 +155,17 @@ class YHUserInfoSettingViewController: YHBaseViewController {
view.endEditing(true)
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
self.photoImageView.image = image
self.viewModel.uploadImage(image, true) {[weak self] success, error in
let clipperVC = YHHeadImageViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Move)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
self.headUrl = success ?? ""
self.photoImageView.image = result
self.viewModel.uploadImage(result, true) {[weak self] success, error in
guard let self = self else { return }
self.headUrl = success ?? ""
}
}
self.navigationController?.pushViewController(clipperVC, animated: true)
}
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHAllowSettingTableViewCell.swift
View file @ 83d7bad5
......@@ -121,7 +121,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
}
case .people:
if !detailSwitch.isOn {
YHCommonAlertView.show("", "关闭后，您将无法体验AI人脉匹配功能？", "仍然关闭", "开启") {
YHCommonAlertView.show("", "关闭后，您将无法体验AI人脉匹配功能？", "仍然关闭", "开启", fullGuestureEnable: false) {
self.detailSwitch.isOn = false
model.isSelect = self.detailSwitch.isOn
if let block = self.block {
......@@ -142,7 +142,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
}
case .school:
if !detailSwitch.isOn {
YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的教育经历", "仍然关闭", "开启") {
YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的教育经历", "仍然关闭", "开启", fullGuestureEnable: false) {
self.detailSwitch.isOn = false
model.isSelect = self.detailSwitch.isOn
if let block = self.block {
......@@ -163,7 +163,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
}
case .work:
if !detailSwitch.isOn {
YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的工作经历", "仍然关闭", "开启") {
YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的工作经历", "仍然关闭", "开启", fullGuestureEnable: false) {
self.detailSwitch.isOn = false
model.isSelect = self.detailSwitch.isOn
if let block = self.block {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift
View file @ 83d7bad5
......@@ -137,19 +137,24 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
view.endEditing(true)
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
self.photoImageView.image = image
self.viewModel.uploadImage(image, true) {[weak self] success, error in
let clipperVC = YHHeadImageViewController()
clipperVC.setBaseImg(image, resultImgSize: CGSize(width: 300, height: 300), type: .Move)
clipperVC.successClippedHandler = {[weak self] result in
guard let self = self else { return }
viewModel.model.avatar = success ?? ""
if self.viewModel.isCanNext(step: 1) {
nextButton.isEnabled = true
nextButton.backgroundColor = UIColor.brandMainColor
} else {
nextButton.isEnabled = false
nextButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.4)
self.photoImageView.image = result
self.viewModel.uploadImage(result, true) {[weak self] success, error in
guard let self = self else { return }
viewModel.model.avatar = success ?? ""
if self.viewModel.isCanNext(step: 1) {
nextButton.isEnabled = true
nextButton.backgroundColor = UIColor.brandMainColor
} else {
nextButton.isEnabled = false
nextButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.4)
}
}
}
self.navigationController?.pushViewController(clipperVC, animated: true)
}
}
......@@ -175,7 +180,7 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -189,7 +194,7 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditHonorViewController.swift
View file @ 83d7bad5
......@@ -128,7 +128,7 @@ class YHEditHonorViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -140,7 +140,7 @@ class YHEditHonorViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditInterestViewController.swift
View file @ 83d7bad5
......@@ -171,7 +171,7 @@ class YHEditInterestViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -183,7 +183,7 @@ class YHEditInterestViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditPersonalProfileViewController.swift
View file @ 83d7bad5
......@@ -128,7 +128,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -142,7 +142,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditSchoolViewController.swift
View file @ 83d7bad5
......@@ -90,7 +90,7 @@ class YHEditSchoolViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -102,7 +102,7 @@ class YHEditSchoolViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditWorkViewController.swift
View file @ 83d7bad5
......@@ -90,7 +90,7 @@ class YHEditWorkViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......@@ -102,7 +102,7 @@ class YHEditWorkViewController: YHBaseViewController {
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
if viewModel.didChange {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存") {
YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "关闭", "保存", fullGuestureEnable: false) {
self.navigationController?.popViewController()
} callBack: {
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHHeadImageViewController.swift 0 → 100644
View file @ 83d7bad5
//
// YHHeadImageViewController.swift
// galaxy
//
// Created by EDY on 2024/7/4.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHHeadImageViewController: YHBaseViewController {
typealias CancelClippedHandlerBlock = ()->Void
typealias SuccessClippedHandlerBlock = (_ image: UIImage) -> Void
//MARK Public
public var cancelClippedHandler:CancelClippedHandlerBlock?
public var successClippedHandler:SuccessClippedHandlerBlock?
public func setBaseImg(_ baseImg: UIImage, resultImgSize: CGSize, type: YHClipperType) {
self.baseImg = baseImg
self.resultImgSize = resultImgSize
clipperView = YHClipperView(frame: CGRect(x: 0, y: (isIphoneX() ? 88:64), width: KScreenWidth, height: KScreenHeight - k_Height_safeAreaInsetsBottom() - 54 - (isIphoneX() ? 88:64)))
clipperView?.resultImgSize = resultImgSize
clipperView?.baseImg = baseImg
clipperView?.type = type
self.view.addSubview(clipperView!)
self.view.sendSubviewToBack(clipperView!)
}
private var baseImg: UIImage!
private var resultImgSize: CGSize!
//MARK Private
private var clipperView: YHClipperView?
private var cannalButton: UIButton!
private var sureButton: UIButton!
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .black
// Do any additional setup after loading the view.
setView()
gk_navigationBar.isHidden = true
}
func setView() {
let bottomView = {
let bottom = UIView()
bottom.backgroundColor = .black
return bottom
}()
view.addSubview(bottomView)
bottomView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
}
sureButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.backgroundColor = UIColor.brandMainColor
button.contentHorizontalAlignment = .center
button.setTitle("确认", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.addTarget(self, action: #selector(sureBtnClick), for: .touchUpInside)
return button
}()
view.addSubview(sureButton)
sureButton.snp.makeConstraints { make in
make.right.equalTo(-16)
make.bottom.equalTo(-10 - k_Height_safeAreaInsetsBottom())
make.height.equalTo(44)
make.width.equalTo(93)
}
cannalButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .left
button.setTitle("取消", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.addTarget(self, action: #selector(cannalBtnClick), for: .touchUpInside)
return button
}()
view.addSubview(cannalButton)
cannalButton.snp.makeConstraints { make in
make.centerY.equalTo(sureButton.snp.centerY)
make.left.equalTo(30)
make.height.equalTo(44)
make.width.equalTo(60)
}
}
override func navigationShouldPop() -> Bool {
return false
}
@objc private func cannalBtnClick() {
if cancelClippedHandler != nil {
cancelClippedHandler!()
}
self.navigationController?.popViewController()
}
@objc private func sureBtnClick() {
guard let clippedImg = self.clipperView?.clipImg() else { return }
if successClippedHandler != nil {
successClippedHandler!(clippedImg)
}
self.navigationController?.popViewController()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.isNavigationBarHidden = false
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
}
galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift
View file @ 83d7bad5
......@@ -91,13 +91,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel())
return
}
if isPublic {
self.mProvider = OSSStsTokenCredentialProvider(accessKeyId: self.publicModel.accessKeyId, secretKeyId: self.publicModel.accessKeySecret, securityToken: self.publicModel.securityToken)
self.mClient = OSSClient(endpoint: self.publicModel.endpoint, credentialProvider: self.mProvider)
} else {
// self.mProvider = OSSStsTokenCredentialProvider(accessKeyId: self.model.accessKeyId, secretKeyId: self.model.accessKeySecret, securityToken: self.model.securityToken)
// self.mClient = OSSClient(endpoint: self.model.endpoint, credentialProvider: self.mProvider)
}
DispatchQueue.global().async {
request.uploadingData = imageData
......
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