Skip to content

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

Merge branch 'develop' into davidhuang 

* develop:
  修改版本号
  按钮逻辑
  1、删除 不使用的代码 2、处理一处 bug
  删除 不使用的库  减少包体积
  我的首页web
  // 去除网易SDK
  1、修改两处文案
parents 63b5483a c5029aba
Hide whitespace changes
Inline Side-by-side
Showing with 456 additions and 124 deletions
galaxy/Podfile
View file @ b0dded95
......@@ -29,8 +29,8 @@ target 'galaxy' do
pod 'SwifterSwift','6.0.0'
#下拉刷新、上拉更多
pod 'ESPullToRefresh',"2.9.3"
#Toast
pod 'Toast-Swift', '5.0.1'
# #Toast
# pod 'Toast-Swift', '5.0.1'
#富文本 UILabel
pod 'Nantes','0.1.2'
#提示框
......@@ -43,8 +43,8 @@ target 'galaxy' do
pod 'SwiftyTimer','2.1.0'
#UIColor 的扩展
# pod 'Hue','5.0.0'
#内存泄漏
pod 'LifetimeTracker','1.8.1'
# #内存泄漏
# pod 'LifetimeTracker','1.8.1'
#控制台转换成中文
pod 'ByebyeUnicode','1.1.0'
#轮播图
......@@ -53,8 +53,8 @@ target 'galaxy' do
pod 'SmartCodable','2.2.2'
#设备框架
pod 'DeviceKit', '5.1.0'
#骨架图
pod 'SkeletonView','1.30.4'
# #骨架图
# pod 'SkeletonView','1.30.4'
#导航栏、手势
pod 'GKNavigationBarSwift','1.6.5'
#crash统计
......@@ -71,23 +71,6 @@ target 'galaxy' do
pod 'JPush', '5.2.0'
pod 'JCore', '4.6.0-noidfa'
############# 网易云信 IM相关 start #############
#A 基础Kit库
pod 'NECoreKit', '9.6.5'
pod 'NECoreIMKit', '9.6.5'
pod 'NEChatKit', '9.6.5'
pod 'NECommonKit', '9.6.4'
pod 'NECommonUIKit', '9.6.5'
pod 'NIMSDK_LITE', '9.14.0'
#B UI组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
pod 'NEContactUIKit', '9.6.5'
pod 'NEConversationUIKit', '9.6.5'
pod 'NEChatUIKit', '9.6.5'
pod 'NETeamUIKit', '9.6.5'
############# 网易云信 IM相关 end #############
#富文本库
pod 'AttributedString','3.3.5'
#json转模型
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b0dded95
......@@ -17,6 +17,9 @@
0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
044413F72BC2786200784A14 /* YHHomeWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413F62BC2786200784A14 /* YHHomeWebViewController.swift */; };
044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */; };
044413FB2BC27E6F00784A14 /* YHHomeWebBottomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */; };
044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */; };
044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */; };
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */; };
......@@ -425,6 +428,9 @@
0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
044413F62BC2786200784A14 /* YHHomeWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewController.swift; sourceTree = "<group>"; };
044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebBottomView.swift; sourceTree = "<group>"; };
044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebBottomButton.swift; sourceTree = "<group>"; };
044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterView.swift; sourceTree = "<group>"; };
044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterItemCell.swift; sourceTree = "<group>"; };
044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadFailTipsView.swift; sourceTree = "<group>"; };
......@@ -2109,6 +2115,8 @@
A5C5B3222B57BF8F00A7C5D1 /* YHDavidCell1.swift */,
A5C5B3112B57B47D00A7C5D1 /* YHDavidCell0.swift */,
A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */,
044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */,
044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -2119,6 +2127,7 @@
A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */,
A5C5B2FE2B55623700A7C5D1 /* YHMainContentBaseViewController.swift */,
A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */,
044413F62BC2786200784A14 /* YHHomeWebViewController.swift */,
A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */,
);
path = C;
......@@ -2393,11 +2402,13 @@
A5ACE93D2B4564F7002C94D2 /* UIButton+Extension.swift in Sources */,
045EEEA32B9F171A0022A143 /* YHCompanyModel.swift in Sources */,
045EEEC62B9F171A0022A143 /* YHOtherTextViewItemView.swift in Sources */,
044413F72BC2786200784A14 /* YHHomeWebViewController.swift in Sources */,
A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */,
A5ACE9452B4564F7002C94D2 /* YHHUDContainerView.swift in Sources */,
045EEEFD2B9F171A0022A143 /* YHSheetPickerViewType.swift in Sources */,
045EEEC72B9F171A0022A143 /* YHOtherYesOrNoItemView.swift in Sources */,
04A7BD172BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift in Sources */,
044413FB2BC27E6F00784A14 /* YHHomeWebBottomButton.swift in Sources */,
045EEEB32B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift in Sources */,
045EEEF12B9F171A0022A143 /* YHChildInfoContainerVC.swift in Sources */,
045EEF0B2B9F171A0022A143 /* YHBasicInfoFillViewController.swift in Sources */,
......@@ -2649,6 +2660,7 @@
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */,
0425E6482BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift in Sources */,
04A271252BAC33BB00652B1B /* YHFilePreviewTool.swift in Sources */,
044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */,
045EEEC32B9F171A0022A143 /* YHOtherResidenceFillView.swift in Sources */,
045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */,
A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */,
......@@ -2804,7 +2816,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3005,7 +3017,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3047,7 +3059,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/AppDelegate.swift
View file @ b0dded95
......@@ -12,15 +12,6 @@ import SmartCodable
import GKNavigationBarSwift
import DeviceKit
import NIMSDK
import NECoreKit
import NECoreIMKit
import NEChatKit
import NEChatUIKit
import NEConversationUIKit
import NETeamUIKit
import NEChatUIKit
@main
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
......@@ -159,17 +150,6 @@ extension AppDelegate {
window?.makeKeyAndVisible()
}
// 网银云信IM相关配置
private func configIM() {
let option = NIMSDKOption()
option.appKey = IMAppKey.appKey
option.apnsCername = "云信控制台配置的 APNS 推送证书名称"
option.pkCername = "云信控制台配置的 PushKit 推送证书名称"
IMKitClient.instance.setupCoreKitIM(option)
let _ = NEAtMessageManager.instance
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
View file @ b0dded95
......@@ -110,7 +110,7 @@ class YHHomeViewController: YHBaseViewController {
dataSource.titles = arrItemTitles
dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 16)
dataSource.titleNormalColor = UIColor(hexString: "#888F98")
dataSource.titleNormalColor = UIColor(hexString: "#888F98")!
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
dataSource.titleSelectedColor = .brandMainColor
......@@ -394,22 +394,8 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
printLog("点击了 tableView Cell \(indexPath.row)")
// let vc = YHWebViewViewController()
// vc.url = "https://auth.qiyuesuo.cn?ticket=bQngrvjj1TPHPnaOt91wKNtzO5iBNDfcwtMtgZdpdZxKIiDgW914qVqxQfloCUVT&channel=OPEN_V2"
let url = URL(string: "https://auth.qiyuesuo.cn?ticket=mw5mqO2qx5y%2F%2BqZuOKet7ct3JhAtlFkH4ar9JyyMas0gQ4YYg28iV43Cs8QqqvN8&channel=OPEN_V2")!
// 创建SFSafariViewController
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
// 设置代理
safariViewController.delegate = self
// 显示
// present(safariViewController, animated: true, completion: nil)
self.navigationController?.pushViewController(safariViewController)
// https://cloudapi.qiyuesuo.cn/contract/share/3202449385770287813?openPageToken=d004e5af-aab9-43e4-b813-c5a6a8c16497
let vc = YHHomeWebViewController()
self.navigationController?.pushViewController(vc)
}
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift 0 → 100644
View file @ b0dded95
//
// YHHomeWebViewController.swift
// galaxy
//
// Created by EDY on 2024/4/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import WebKit
class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
var webview = WKWebView()
var progBar = UIProgressView()
var bottomView: YHHomeWebBottomView!
var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
override func viewDidLoad() {
super.viewDidLoad()
//获取导航栏高度
let navHeight = self.navigationController?.navigationBar.frame.height
//获取状态栏高度
let statusHeight = k_Height_statusBar()
// 创建wkwebview
webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height))
webview.navigationDelegate = self
// 创建网址
let url = NSURL(string: url)
// 创建请求
let request = NSURLRequest(url: url! as URL)
// 加载请求
webview.load(request as URLRequest)
// 添加wkwebview
self.view.addSubview(webview)
// 加载网页的进度条
progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
progBar.progress = 0.0
progBar.tintColor = UIColor.brandMainColor
webview.addSubview(progBar)
// 监听网页加载的进度
webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
bottomView = {
let view = YHHomeWebBottomView()
view.likeBlock = { [weak self] flag in
guard let self = self else { return }
if flag {
YHHUD.flash(message: "已点赞")
} else {
YHHUD.flash(message: "已取消点赞")
}
}
view.starBlock = { [weak self] flag in
guard let self = self else { return }
if flag {
YHHUD.flash(message: "已收藏")
} else {
YHHUD.flash(message: "已取消收藏")
}
}
return view
}()
view.addSubview(bottomView)
bottomView.snp.makeConstraints { make in
make.bottom.left.right.equalToSuperview()
make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
}
}
deinit {
webview.removeObserver(self, forKeyPath: "estimatedProgress")
}
// MARK: - WKNavigationDelegate
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
self.navigationItem.title = webview.title
}
// MARK: - WKUIDelegate
func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
// 实现非安全链接的跳转。如果目标主视图不为空,则允许导航
if !(navigationAction.targetFrame?.isMainFrame != nil) {
webview.load(navigationAction.request)
}
return nil
}
func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
// 修复弹窗弹出的问题
let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) -> Void in
completionHandler()
}))
self.present(alert, animated: true, completion: nil)
}
// MARK: - webview function
@objc func toBack() {
if webview.canGoBack {
webview.goBack()
}
}
@objc func toForward() {
if webview.canGoForward {
webview.goForward()
}
}
// MARK: - KVO
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
if keyPath == "estimatedProgress" {
self.progBar.alpha = 1.0
progBar.setProgress(Float(webview.estimatedProgress), animated: true)
//进度条的值最大为1.0
if(self.webview.estimatedProgress >= 1.0) {
UIView.animate(withDuration: 0.3, delay: 0.1, options: .curveEaseInOut, animations: { () -> Void in
self.progBar.alpha = 0.0
}, completion: { (finished:Bool) -> Void in
self.progBar.progress = 0
})
}
}
}
override class func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeWebBottomButton.swift 0 → 100644
View file @ b0dded95
//
// YHHomeWebBottomButton.swift
// galaxy
//
// Created by EDY on 2024/4/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHHomeWebBottomButton: UIButton {
var topImageView: UIImageView!
var bottomTitleLabel: UILabel!
override init(frame: CGRect) {
super.init(frame: frame)
setView()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func setView() {
topImageView = {
let view = UIImageView()
return view
}()
addSubview(topImageView)
topImageView.snp.makeConstraints { make in
make.top.centerX.equalToSuperview()
make.width.height.equalTo(21)
}
bottomTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_B(ofSize: 11)
label.textAlignment = .center
label.textColor = UIColor.mainTextColor
return label
}()
addSubview(bottomTitleLabel)
bottomTitleLabel.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(15)
}
}
func setContent(_ image: String, _ title: String) {
bottomTitleLabel.text = title
topImageView.image = UIImage(named: image)
}
/*
// Only override draw() if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
override func draw(_ rect: CGRect) {
// Drawing code
}
*/
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeWebBottomView.swift 0 → 100644
View file @ b0dded95
//
// YHHomeWebBottomView.swift
// galaxy
//
// Created by EDY on 2024/4/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHHomeWebBottomView: UIView {
typealias Block = (Bool) -> ()
var likeBlock: Block?
var starBlock: Block?
private var likeButton: YHHomeWebBottomButton!
private var starButton: YHHomeWebBottomButton!
var isStar: Bool = false {
didSet {
if isStar {
starButton.setContent("home_web_stared", "34")
} else {
starButton.setContent("home_web_star", "34")
}
}
}//是否收藏
var isLike: Bool = false {
didSet {
if isLike {
likeButton.setContent("home_web_liked", "34")
} else {
likeButton.setContent("home_web_like", "34")
}
}
}//是否点赞
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = .white
setUpView()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func setUpView() {
likeButton = {
let button = YHHomeWebBottomButton()
button.setContent("home_web_like", "652")
button.addTarget(self, action: #selector(likeBtnClick), for: .touchUpInside)
return button
}()
addSubview(likeButton)
likeButton.snp.makeConstraints { make in
make.right.equalTo(-31)
make.top.equalTo(10)
make.height.equalTo(39)
make.width.equalTo(24)
}
starButton = {
let button = YHHomeWebBottomButton()
button.setContent("home_web_star", "34")
button.addTarget(self, action: #selector(starBtnClick), for: .touchUpInside)
return button
}()
addSubview(starButton)
starButton.snp.makeConstraints { make in
make.right.equalTo(-79)
make.top.equalTo(10)
make.height.equalTo(39)
make.width.equalTo(24)
}
}
@objc private func likeBtnClick() {
isLike = !isLike
if let block = likeBlock {
block(isLike)
}
}
@objc private func starBtnClick() {
isStar = !isStar
if let block = starBlock {
block(isStar)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift
View file @ b0dded95
......@@ -90,7 +90,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 14)
dataSource.titleNormalColor = .labelTextColor2
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
dataSource.titleSelectedColor = UIColor(hexString: "#000000")
dataSource.titleSelectedColor = UIColor(hexString: "#000000")!
dataSource.isItemSpacingAverageEnabled = false
dataSource.itemWidth = JXSegmentedViewAutomaticDimension
dataSource.itemSpacing = 24
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift
View file @ b0dded95
......@@ -399,22 +399,22 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
var bgColor:UIColor = .clear
if supplementInfo.checkStatus == YHCertificateUploadStatus.review.rawValue {
text = "审核中".local
textColor = UIColor(hexString: "#FF9900")
bgColor = UIColor(hexString: "#FF9900", 0.08)
textColor = UIColor(hexString: "#FF9900")!
bgColor = UIColor(hexString: "#FF9900", transparency: 0.08)!
} else if supplementInfo.checkStatus == YHCertificateUploadStatus.preUpload.rawValue {
text = "待上传".local
textColor = UIColor(hexString: "#2F7EF6")
bgColor = UIColor(hexString: "#2F7EF6", 0.08)
textColor = UIColor(hexString: "#2F7EF6")!
bgColor = UIColor(hexString: "#2F7EF6", transparency: 0.08)!
} else if supplementInfo.checkStatus == YHCertificateUploadStatus.finish.rawValue {
text = "已完成".local
textColor = UIColor(hexString: "#49D2B1")
bgColor = UIColor(hexString: "#49D2B1", 0.08)
textColor = UIColor(hexString: "#49D2B1")!
bgColor = UIColor(hexString: "#49D2B1", transparency: 0.08)!
} else if supplementInfo.checkStatus == YHCertificateUploadStatus.rejected.rawValue {
text = "已驳回".local
textColor = UIColor(hexString: "#F81D22")
bgColor = UIColor(hexString: "#F81D22", 0.08)
textColor = UIColor(hexString: "#F81D22")!
bgColor = UIColor(hexString: "#F81D22", transparency: 0.08)!
}
statusLabel.text = text
statusLabel.textColor = textColor
......@@ -475,7 +475,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
let tipsFont = UIFont.PFSC_R(ofSize: 12)
let a: ASAttributedString = .init("*最多上传", .font(tipsFont),.foreground(UIColor.labelTextColor2))
let b: ASAttributedString = .init(" \(items.count)/99 ", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.init(hexString:"#2F2F2F")))
let b: ASAttributedString = .init(" \(items.count)/99 ", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.init(hexString:"#2F2F2F")!))
let c: ASAttributedString = .init("张图片或文件", .font(tipsFont), .foreground(UIColor.labelTextColor2))
label.attributed.text = a+b+c
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEditSheetView.swift
View file @ b0dded95
......@@ -34,7 +34,7 @@ class YHCertificateEditItem {
var type: YHCertificateEditType
var title: String
init(type:YHCertificateEditType, title: String) {
init(type:YHCertificateEditType, title: String,itemTitle : String? = nil) {
self.type = type
self.title = title
}
......@@ -103,6 +103,7 @@ class YHCertificateEditSheetView: UIView {
var items:[YHCertificateEditItem]
var action:((YHCertificateEditType)->())?
private var sheetTitle : String?
lazy var blackMaskView: UIView = {
let view = UIView(frame:UIScreen.main.bounds)
......@@ -135,8 +136,9 @@ class YHCertificateEditSheetView: UIView {
}()
init(items:[YHCertificateEditItem]) {
init(items:[YHCertificateEditItem],sheetTitle : String? = nil) {
self.items = items
self.sheetTitle = sheetTitle
super.init(frame:UIScreen.main.bounds)
createUI()
}
......@@ -145,8 +147,8 @@ class YHCertificateEditSheetView: UIView {
fatalError("init(coder:) has not been implemented")
}
static func sheetView(items:[YHCertificateEditItem], action:((YHCertificateEditType)->())?) -> YHCertificateEditSheetView {
let view = YHCertificateEditSheetView(items:items)
static func sheetView(items:[YHCertificateEditItem],sheetTitle : String? = nil, action:((YHCertificateEditType)->())?) -> YHCertificateEditSheetView {
let view = YHCertificateEditSheetView(items:items,sheetTitle: sheetTitle)
view.action = action
return view
}
......@@ -180,6 +182,10 @@ class YHCertificateEditSheetView: UIView {
make.left.right.top.equalToSuperview()
}
if let title = sheetTitle {
titleLabel.text = title
}
closeBtn.snp.makeConstraints { make in
make.centerY.equalTo(titleLabel)
make.right.equalToSuperview().offset(-20)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ b0dded95
......@@ -121,6 +121,13 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
if self.type == 3 && self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual.count == 0 && !success {
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
} else {
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
}
self.tableView.reloadData()
})
}
......@@ -529,7 +536,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
//弹窗 选择发送邮箱
let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
YHCertificateEditItem(type:.cancel, title:"取消")]
YHCertificateEditSheetView.sheetView(items:items) {
YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
[weak self] editType in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift
View file @ b0dded95
......@@ -309,7 +309,7 @@ extension YHMyDocumentsListViewController {
//弹窗 选择发送邮箱
let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
YHCertificateEditItem(type:.cancel, title:"取消")]
YHCertificateEditSheetView.sheetView(items:items) {
YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
[weak self] editType in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHEmailInputAlertView.swift
View file @ b0dded95
......@@ -199,7 +199,7 @@ extension YHEmailInputAlertView {
dismiss()
} else {
YHHUD.flash(message: "邮箱不合法")
YHHUD.flash(message: "邮箱格式有误")
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableViewCell.swift
View file @ b0dded95
......@@ -190,7 +190,14 @@ class YHSchemeTableViewCell: UITableViewCell {
}
} else if title.contains("文书写作") {
UIViewController.current?.navigationController?.pushViewController(YHMyDocumentsListViewController())
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let vc = YHMyDocumentsListViewController()
vc.orderId = orderID as? Int ?? 0
UIViewController.current?.navigationController?.pushViewController(vc)
} else {
YHHUD.flash(message: "订单号为空")
}
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ b0dded95
......@@ -104,6 +104,13 @@ class YHMySignatureDetailViewController: YHBaseViewController {
viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
if self.type == 3 && self.viewModel.mainModel?.doc_return_manual.count == 0 && !success {
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
} else {
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
}
self.tableView.reloadData()
})
}
......@@ -429,7 +436,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
//弹窗 选择发送邮箱
let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
YHCertificateEditItem(type:.cancel, title:"取消")]
YHCertificateEditSheetView.sheetView(items:items) {
YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
[weak self] editType in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift
View file @ b0dded95
......@@ -302,7 +302,7 @@ extension YHMySignatureListViewController {
//弹窗 选择发送邮箱
let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
YHCertificateEditItem(type:.cancel, title:"取消")]
YHCertificateEditSheetView.sheetView(items:items) {
YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
[weak self] editType in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ b0dded95
......@@ -8,7 +8,7 @@
import UIKit
import SwifterSwift
import Toast_Swift
//import Toast_Swift
class YHEducationDetailVC: YHBaseViewController {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift
View file @ b0dded95
......@@ -7,7 +7,7 @@
//
import UIKit
import Toast_Swift
//import Toast_Swift
class YHEducationInfoListVC: YHBaseViewController {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift
View file @ b0dded95
......@@ -7,7 +7,7 @@
//
import UIKit
import Toast_Swift
//import Toast_Swift
class YHQualificationDetailVC: YHBaseViewController {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsCell.swift
View file @ b0dded95
......@@ -227,7 +227,7 @@ extension YHInformationFillTipsCell {
holdView3.layer.cornerRadius = kCornerRadius6
holdView3.clipsToBounds = true
holdView3.layer.borderWidth = 1
holdView3.layer.borderColor = UIColor(hexString: "#E4EEFF").cgColor
holdView3.layer.borderColor = UIColor(hexString: "#E4EEFF")?.cgColor
holdView.addSubview(holdView3)
holdView3.snp.makeConstraints { make in
make.top.equalTo(holdView2.snp.bottom).offset(12)
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ b0dded95
......@@ -8,7 +8,6 @@
import UIKit
import SnapKit
import NEConversationUIKit
class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ b0dded95
......@@ -7,7 +7,6 @@
import UIKit
import SnapKit
import NEConversationUIKit
import SafariServices
enum YHPersonalModuleItemType: Int {
......
galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift
View file @ b0dded95
......@@ -123,26 +123,8 @@ func isIphoneX() -> Bool {
}
class YhConstant {
// MARK: - URL 相关
struct URL {
// MARK: - 帮助与反馈
static let userQAUrl = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/pages/my/index"
// MARK: - 优眠用户注销条款
static let userUnregisterURL = "https://www.baidu.com"
// MARK: - 隐私政策
static let privacyURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=privacy"
// MARK: - 用户协议
static let userProtocalURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=agreement"
}
// MARK: - 登录信息
static let KLoginedInfoKey = "KLoginedInfoKey"
}
extension YhConstant {
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ b0dded95
......@@ -8,10 +8,11 @@
// MARK: - 管理项目开发中需要使用到的域名地址
class YHBaseUrlManager {
//单例
static let shared = YHBaseUrlManager()
//测试环境
static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com/" //APP 使用域名
//正式环境
static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
......@@ -21,12 +22,7 @@ class YHBaseUrlManager {
//正式环境-OSS
static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/"
//h5开发环境-H5
static let h5UrlDev : String = ""
//h5正式环境-H5
static let h5UrlRelease : String = ""
// MARK: - 当前使用的url
func curURL() -> String {
#if DEBUG
return YHBaseUrlManager.baseUrlTest
......@@ -44,17 +40,6 @@ class YHBaseUrlManager {
return YHBaseUrlManager.baseOSSUrlTest
#else
return YHBaseUrlManager.baseOSSUrlRelease
#endif
}
// MARK: - 当前使用的url
func h5URL() -> String {
#if DEBUG
return YHBaseUrlManager.h5UrlDev
#elseif TESTENV
return YHBaseUrlManager.h5UrlDev
#else
return YHBaseUrlManager.h5UrlRelease
#endif
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/home_web_like.imageset/Contents.json 0 → 100644
View file @ b0dded95
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_web_like@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_web_like@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/home_web_liked.imageset/Contents.json 0 → 100644
View file @ b0dded95
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_web_liked@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_web_liked@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/home_web_star.imageset/Contents.json 0 → 100644
View file @ b0dded95
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_web_star@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_web_star@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/home_web_stared.imageset/Contents.json 0 → 100644
View file @ b0dded95
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_web_stared@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_web_stared@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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