Skip to content

G
galaxy-iOS
Commit 40dbf448 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit '2ff3c1d0' into xiezhaolin 

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents 0af7d29c 2ff3c1d0
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 113 deletions
galaxy/Podfile
View file @ 40dbf448
......@@ -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 @ 40dbf448
......@@ -266,6 +266,7 @@
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */; };
A53B61192BB3C9960010B573 /* YHMyDocListHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */; };
A53D381E2BC23794006AE6F7 /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */; };
A53D38202BC243F1006AE6F7 /* YHStartPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */; };
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
......@@ -679,6 +680,7 @@
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>"; };
A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHStartPageViewController.swift; sourceTree = "<group>"; };
A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -2126,6 +2128,7 @@
A5C5B2FE2B55623700A7C5D1 /* YHMainContentBaseViewController.swift */,
A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */,
044413F62BC2786200784A14 /* YHHomeWebViewController.swift */,
A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -2607,6 +2610,7 @@
04A7BD132BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift in Sources */,
04A671622BA058DE00C1FB91 /* YHCertificateEditSheetView.swift in Sources */,
A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
A53D38202BC243F1006AE6F7 /* YHStartPageViewController.swift in Sources */,
045EEE882B9F171A0022A143 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */,
0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */,
A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,
......
galaxy/galaxy/AppDelegate.swift
View file @ 40dbf448
......@@ -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?
......@@ -137,32 +128,27 @@ extension AppDelegate {
let v2 = YHNavigationController(rootVC:YHMsgViewController())
let v3 = YHNavigationController(rootVC:YHMyViewController())
v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "photo"), selectedImage: UIImage(named: "photo_1"))
v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "find"), selectedImage: UIImage(named: "find_1"))
v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "find"), selectedImage: UIImage(named: "find_1"))
v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
tabBarController.viewControllers = [v0,v1,v2,v3]
// tabBarController.viewControllers = [v1,v2] //for test hjl 配合测试同学做自动化测试 Moon 2023.03.12
tabBarController.tabBar.backgroundColor = .white
window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = tabBarController
// window?.rootViewController = tabBarController
window?.rootViewController = YHStartPageViewController()
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/Base/V/YHBasicContentView.swift
View file @ 40dbf448
......@@ -15,10 +15,12 @@ class YHBasicContentView: ESTabBarItemContentView {
super.init(frame: frame)
textColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
highlightTextColor = .brandMainColor
iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
highlightIconColor = .brandMainColor
titleLabel.font = UIFont.PFSC_R(ofSize: 10)
titleLabel.font = UIFont.PFSC_R(ofSize: 14)
}
public required init?(coder aDecoder: NSCoder) {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
View file @ 40dbf448
......@@ -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
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift 0 → 100644
View file @ 40dbf448
//
// YHStartPageViewController.swift
// galaxy
//
// Created by davidhuangA on 2024/4/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import ESTabBarController_swift
/*
启动页 自带倒计时
*/
class YHStartPageViewController: UIViewController {
private var MaxTime : Int = 10 //for test hjl
private var timer : Timer?
lazy var imagV: UIImageView = {
let imagV = UIImageView()
imagV.contentMode = .scaleAspectFill
return imagV
}()
lazy var closeBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 12)
button.setTitle("跳过 5", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.setBackgroundColor(color: UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.3), forState: .normal)
return button
}()
override func viewDidLoad() {
super.viewDidLoad()
initView()
self.startTimer()
}
}
private extension YHStartPageViewController {
func cancelTimer() {
guard self.timer != nil else {
return
}
self.timer!.invalidate()
self.timer = nil
}
func startTimer() {
cancelTimer()
self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(1), target: self, selector: #selector(downTimerOp), userInfo: nil, repeats: true)
RunLoop.current.add(self.timer!, forMode: .common)
}
@objc func downTimerOp() {
MaxTime = MaxTime - 1
if MaxTime < 0 {
cancelTimer()
clickCancelBtn()
return
}
let title = "跳过 " + MaxTime.string
closeBtn.setTitle(title, for: .normal)
}
func initView() {
imagV.image = UIImage(named: "start_page_bkg")
view.addSubview(imagV)
imagV.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
view.addSubview(closeBtn)
closeBtn.layer.zPosition = 10
closeBtn.clipsToBounds = true
closeBtn.layer.cornerRadius = 14
closeBtn.snp.makeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.right.equalTo(-10)
make.width.equalTo(56)
make.height.equalTo(28)
}
closeBtn.addTarget(self, action: #selector(clickCancelBtn), for: .touchUpInside)
}
@objc func clickCancelBtn() {
cancelTimer()
setupRootVC()
}
//1.设置主窗口
func setupRootVC() {
let tabBarController = YHTabBarViewController()
let v0 = YHNavigationController(rootVC:YHHomeViewController())
let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
let v2 = YHNavigationController(rootVC:YHMsgViewController())
let v3 = YHNavigationController(rootVC:YHMyViewController())
v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
tabBarController.viewControllers = [v0,v1,v2,v3]
// tabBarController.viewControllers = [v1,v2] //for test hjl 配合测试同学做自动化测试 Moon 2023.03.12
tabBarController.tabBar.backgroundColor = .white
let window = UIApplication.shared.yhKeyWindow()
window?.rootViewController = tabBarController
window?.makeKeyAndVisible()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 40dbf448
......@@ -47,6 +47,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
let titleLable = UILabel(text: "您好,-")
titleLable.font = UIFont.PFSC_B(ofSize: 21)
titleLable.textColor = UIColor.mainTextColor
titleLable.lineBreakMode = .byTruncatingMiddle
return titleLable
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift
View file @ 40dbf448
......@@ -28,7 +28,7 @@ class YHContactMainItemStatusModel {
iconName = "service_center_sfsq_wdqz_icon"
itemName = "我的签字"
} else if type == 6 {
iconName = "service_center_sfsq_wdpf_icon"
iconName = "service_center_sfsq_wdfa_icon"
itemName = "我的方案"
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift
View file @ 40dbf448
......@@ -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 @ 40dbf448
......@@ -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 @ 40dbf448
......@@ -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(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift
View file @ 40dbf448
......@@ -32,6 +32,7 @@ class YHCertificateEntryHeadView: UIView {
let titleLable = UILabel(text: "您好,李先生")
titleLable.font = UIFont.PFSC_B(ofSize: 21)
titleLable.textColor = UIColor.mainTextColor
titleLable.lineBreakMode = .byTruncatingMiddle
return titleLable
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift
View file @ 40dbf448
......@@ -79,6 +79,7 @@ extension YHHKPlanDoctumentVC {
fileprivate func startTimer() {
cancelTimer()
self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(3), target: self, selector: #selector(self.flipNext(sender:)), userInfo: nil, repeats: false)
RunLoop.current.add(self.timer!, forMode: .common)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 40dbf448
......@@ -529,7 +529,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 @ 40dbf448
......@@ -259,6 +259,8 @@ extension YHMyDocumentsListViewController {
make.left.right.equalToSuperview()
make.bottom.equalTo(bottomView.snp.top)
}
gk_navTitle = "批量下载"
} else if type == .cancel {
bottomView.isHidden = true
tableView.snp.remakeConstraints { make in
......@@ -266,6 +268,10 @@ extension YHMyDocumentsListViewController {
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
gk_navTitle = "我的文书"
} else {
gk_navTitle = "我的文书"
}
}
......@@ -303,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 @ 40dbf448
......@@ -199,7 +199,7 @@ extension YHEmailInputAlertView {
dismiss()
} else {
YHHUD.flash(message: "邮箱不合法")
YHHUD.flash(message: "邮箱格式有误")
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHMyDocListHeaderView.swift
View file @ 40dbf448
......@@ -60,6 +60,7 @@ class YHMyDocListHeaderView: UIView {
let lable0 = UILabel(text: "您好，尊敬的客户")
lable0.textColor = UIColor.mainTextColor
lable0.font = UIFont.PFSC_M(ofSize: 21)
lable0.lineBreakMode = .byTruncatingMiddle
return lable0
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ 40dbf448
......@@ -429,7 +429,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 @ 40dbf448
......@@ -254,6 +254,7 @@ extension YHMySignatureListViewController {
make.left.right.equalToSuperview()
make.bottom.equalTo(bottomView.snp.top)
}
gk_navTitle = "批量下载"
} else if type == .cancel {
bottomView.isHidden = true
tableView.snp.remakeConstraints { make in
......@@ -261,6 +262,9 @@ extension YHMySignatureListViewController {
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
gk_navTitle = "我的签字"
} else {
gk_navTitle = "我的签字"
}
}
......@@ -298,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(服务中心)/V/YHContractMainItemStatusCell.swift
View file @ 40dbf448
......@@ -95,7 +95,7 @@ extension YHContractMainItemStatusCell {
} else if dataModel?.type == 2 {
gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
} else if dataModel?.type == 3 {
} else {
myNextImgV.isHidden = false
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsCell.swift
View file @ 40dbf448
......@@ -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/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 40dbf448
......@@ -151,11 +151,7 @@ extension YHServiceCenterMainViewModel {
}
//我的评分
let model3 = YHContactMainItemStatusModel()
model3.type = 3
model3.isFinished = true
arrContactStausItmes.append(model3)
if resultModel.my_document {
//我的文书
......@@ -174,6 +170,13 @@ extension YHServiceCenterMainViewModel {
arrContactStausItmes.append(model5)
}
//我的评分
let model3 = YHContactMainItemStatusModel()
model3.type = 3
model3.isFinished = true
arrContactStausItmes.append(model3)
if resultModel.scheme_position_switch == 1 {
//我的方案
let model6 = YHContactMainItemStatusModel()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ 40dbf448
......@@ -8,7 +8,6 @@
import UIKit
import SnapKit
import NEConversationUIKit
class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 40dbf448
......@@ -7,7 +7,6 @@
import UIKit
import SnapKit
import NEConversationUIKit
import SafariServices
enum YHPersonalModuleItemType: Int {
......
galaxy/galaxy/Res/Assets.xcassets/StartPage/Contents.json 0 → 100644
View file @ 40dbf448
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/tabBar/find.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/StartPage/start_page_bkg.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／product1@2x.png",
"filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／product1@3x.png",
"filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/find_1.imageset/Contents.json deleted 100644 → 0
View file @ 0af7d29c
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／product2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／product2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/tabBar/home.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／home1@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／home1@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/home_1.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／home2@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／home2@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/me.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／my1@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／my1@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/me_1.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／my2@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／my2@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/favor.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/tabBar/msg.imageset/Contents.json
View file @ 40dbf448
{
"images" : [
{
"filename" : "favor.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "favor@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/photo.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/tabBar/msg_1.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／music1@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／music1@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/photo_1.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/tabBar/service.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／music2@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／music2@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/tabBar/favor_1.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/tabBar/service_1.imageset/Contents.json
View file @ 40dbf448
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon／24／tabbar／product2@2x.png",
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon／24／tabbar／product2@3x.png",
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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