Skip to content

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

1、删除不使用的库 

2、修改文书状态流程
parent 94cb1c0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 599 deletions
galaxy/Podfile
View file @ d18bb551
......@@ -17,8 +17,8 @@ target 'galaxy' do
# pod 'RxSwift','6.6.0'
# pod 'RxCocoa','6.6.0'
# pod 'RxAlamofire','6.1.1'
#数据存储
pod 'SwiftyUserDefaults','5.3.0'
# #数据存储
# pod 'SwiftyUserDefaults','5.3.0'
#数据加、解密
pod 'CryptoSwift','1.8.0'
#手动布局
......@@ -31,21 +31,21 @@ target 'galaxy' do
pod 'ESPullToRefresh',"2.9.3"
# #Toast
# pod 'Toast-Swift', '5.0.1'
#富文本 UILabel
pod 'Nantes','0.1.2'
# #富文本 UILabel
# pod 'Nantes','0.1.2'
#提示框
pod 'PKHUD','5.3.0'
#日志 调试
# pod 'CocoaDebug', '1.7.7'
#date分类
pod 'SwiftDate','7.0.0'
#定时器
pod 'SwiftyTimer','2.1.0'
# #date分类
# pod 'SwiftDate','7.0.0'
# #定时器
# pod 'SwiftyTimer','2.1.0'
#UIColor 的扩展
# pod 'Hue','5.0.0'
# #内存泄漏
# pod 'LifetimeTracker','1.8.1'
#控制台转换成中文
# #控制台转换成中文
pod 'ByebyeUnicode','1.1.0'
#轮播图
pod 'FSPagerView','0.8.3'
......@@ -65,8 +65,8 @@ target 'galaxy' do
pod 'JXSegmentedView','1.3.0'
#UI调试组件
pod 'LookinServer','1.2.6',:subspecs => ['Swift'], :configurations => ['Debug']
#阿里云OOS
pod 'AliyunOSSiOS','2.10.18'
# #阿里云OOS
# pod 'AliyunOSSiOS','2.10.18'
#极光推送
pod 'JPush', '5.2.0'
pod 'JCore', '4.6.0-noidfa'
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ d18bb551
......@@ -217,7 +217,6 @@
0468D42E2B5654A500CFB916 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42D2B5654A500CFB916 /* CoreTelephony.framework */; };
0468D4302B5654B500CFB916 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */; };
0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
0468D4342B56587B00CFB916 /* YHOSSManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4332B56587B00CFB916 /* YHOSSManager.swift */; };
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
047294E82B988A19008E0B84 /* YHNewWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047294E72B988A19008E0B84 /* YHNewWebViewController.swift */; };
......@@ -651,7 +650,6 @@
0468D42C2B56549200CFB916 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
0468D42D2B5654A500CFB916 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
0468D4332B56587B00CFB916 /* YHOSSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOSSManager.swift; sourceTree = "<group>"; };
0468D4352B57752F00CFB916 /* YHUserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHUserModel.swift; path = "galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift"; sourceTree = SOURCE_ROOT; };
0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginViewModel.swift; sourceTree = "<group>"; };
047294E72B988A19008E0B84 /* YHNewWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNewWebViewController.swift; sourceTree = "<group>"; };
......@@ -1505,14 +1503,6 @@
path = Analytics;
sourceTree = "<group>";
};
0468D4322B56581000CFB916 /* YHOOS */ = {
isa = PBXGroup;
children = (
0468D4332B56587B00CFB916 /* YHOSSManager.swift */,
);
path = YHOOS;
sourceTree = "<group>";
};
0468D4372B57756300CFB916 /* M */ = {
isa = PBXGroup;
children = (
......@@ -1940,7 +1930,6 @@
A5ACE8EE2B4564F7002C94D2 /* Tools */ = {
isa = PBXGroup;
children = (
0468D4322B56581000CFB916 /* YHOOS */,
0468D4292B55017400CFB916 /* Analytics */,
04AF58BA2B4FB71C0066011A /* Localized */,
A5ACE8F12B4564F7002C94D2 /* NetWork */,
......@@ -2538,7 +2527,6 @@
045EEEB22B9F171A0022A143 /* YHWorkActionView.swift in Sources */,
A58AC09F2BAC05BA00A30FA9 /* YHFileListItemsView.swift in Sources */,
045EEE8C2B9F171A0022A143 /* YHPreviewMainViewController.swift in Sources */,
0468D4342B56587B00CFB916 /* YHOSSManager.swift in Sources */,
A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */,
A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
......@@ -2908,7 +2896,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3109,7 +3097,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3151,7 +3139,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift
View file @ d18bb551
......@@ -346,7 +346,32 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS
tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
updateBottomViewNumbers()
} else {
if model.file_type == "doc" {
// if model.file_type == "doc" {
// if model.template_id == 195 {
// //跳转赴港计划书
// let vc = YHHKPlanDoctumentVC()
// vc.supplement_id = model.id
// vc.status = model.status
// self.navigationController?.pushViewController(vc)
// } else {
// let vc = YHMyDocumentsDetailViewController()
// vc.id = model.id
// self.navigationController?.pushViewController(vc)
// }
// } else {
// let vc = YHMySignatureDetailViewController()
// vc.id = model.sign_doc.id
// self.navigationController?.pushViewController(vc)
// }
if model.document.status == 6 && model.sign_doc.id > 0 {
//签字状态
let vc = YHMySignatureDetailViewController()
vc.id = model.sign_doc.id
self.navigationController?.pushViewController(vc)
} else {
//文书状态
if model.template_id == 195 {
//跳转赴港计划书
let vc = YHHKPlanDoctumentVC()
......@@ -355,13 +380,9 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS
self.navigationController?.pushViewController(vc)
} else {
let vc = YHMyDocumentsDetailViewController()
vc.id = model.id
vc.id = model.id
self.navigationController?.pushViewController(vc)
}
} else {
let vc = YHMySignatureDetailViewController()
vc.id = model.sign_doc.id
self.navigationController?.pushViewController(vc)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocListCell.swift
View file @ d18bb551
......@@ -144,65 +144,99 @@ class YHDocListCell: UITableViewCell {
} else {
checkButton.isHidden = true
statusHoldView.isHidden = false
/*
docOpt: {
1: '不展示',
2: '待确认',
3: '核对中',
4: '核对中',
5: '已驳回',
6: '已定稿',
},
*/
var statusTxt = "--"
var color : UIColor = .failColor
if dataSource.document.status == 6 && dataSource.sign_doc.id > 0 {
//签字状态
let status = dataSource.sign_doc.status
if status == 3 {
statusTxt = "待签章"
color = UIColor.brandMainColor
} else if status == 4 {
statusTxt = "已签章"
color = UIColor.successColor
} else if status == 5 {
statusTxt = "已完成"
color = UIColor.labelTextColor2
} else if status == 6 {
statusTxt = "已驳回"
color = UIColor.failColor
} else {
statusTxt = "--"
color = UIColor.failColor
}
} else {
//文书状态
let status = dataSource.document.status
if status == 2 {
statusTxt = "待确认"
color = UIColor.brandMainColor
} else if status == 3 {
statusTxt = "核对中"
color = UIColor.warnColor
} else if status == 4 {
statusTxt = "核对中"
color = UIColor.warnColor
} else if status == 5 {
statusTxt = "已驳回"
color = UIColor.failColor
} else if status == 6 {
statusTxt = "已定稿"
color = UIColor.labelTextColor2
} else {
statusTxt = "--"
color = UIColor.failColor
}
}
var statusTxt = "--"
var color : UIColor = .brandMainColor
if dataSource.file_type.contains("sign", caseSensitive: true) {
let status = dataSource.sign_doc.status
if status == 3 {
statusTxt = "待签章"
color = UIColor.brandMainColor
} else if status == 4 {
statusTxt = "已签章"
color = UIColor.successColor
} else if status == 5 {
statusTxt = "已完成"
color = UIColor.labelTextColor2
} else if status == 6 {
statusTxt = "已驳回"
color = UIColor.failColor
} else {
statusTxt = "--"
color = UIColor.failColor
}
} else if dataSource.file_type.contains("doc", caseSensitive: true) {
let status = dataSource.status
if status == 2 {
statusTxt = "待确认"
color = UIColor.brandMainColor
} else if status == 3 {
statusTxt = "核对中"
color = UIColor.warnColor
} else if status == 4 {
statusTxt = "核对中"
color = UIColor.warnColor
} else if status == 5 {
statusTxt = "已驳回"
color = UIColor.failColor
} else if status == 6 {
statusTxt = "已定稿"
color = UIColor.labelTextColor2
} else {
statusTxt = "--"
color = UIColor.failColor
}
} else {
statusTxt = "--"
color = UIColor.failColor
}
//
// if dataSource.file_type.contains("sign", caseSensitive: true) {
// let status = dataSource.sign_doc.status
// if status == 3 {
// statusTxt = "待签章"
// color = UIColor.brandMainColor
// } else if status == 4 {
// statusTxt = "已签章"
// color = UIColor.successColor
// } else if status == 5 {
// statusTxt = "已完成"
// color = UIColor.labelTextColor2
// } else if status == 6 {
// statusTxt = "已驳回"
// color = UIColor.failColor
// } else {
// statusTxt = "--"
// color = UIColor.failColor
// }
// } else if dataSource.file_type.contains("doc", caseSensitive: true) {
// let status = dataSource.status
// if status == 2 {
// statusTxt = "待确认"
// color = UIColor.brandMainColor
// } else if status == 3 {
// statusTxt = "核对中"
// color = UIColor.warnColor
// } else if status == 4 {
// statusTxt = "核对中"
// color = UIColor.warnColor
// } else if status == 5 {
// statusTxt = "已驳回"
// color = UIColor.failColor
// } else if status == 6 {
// statusTxt = "已定稿"
// color = UIColor.labelTextColor2
// } else {
// statusTxt = "--"
// color = UIColor.failColor
// }
// } else {
// statusTxt = "--"
// color = UIColor.failColor
//
// }
statusLabel.text = statusTxt
statusLabel.textColor = color
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHHomeCollectionViewCell.swift
View file @ d18bb551
......@@ -155,21 +155,22 @@ class YHHomeCollectionViewCell: UICollectionViewCell {
}
func getImageSize(_ url: String?) -> CGSize {
guard let urlStr = url, urlStr.count != 0 else {
return CGSize.zero
}
let tempUrl = URL(string: urlStr)
let imageSourceRef = CGImageSourceCreateWithURL(tempUrl! as CFURL, nil)
var width: CGFloat = 0
var height: CGFloat = 0
if let imageSRef = imageSourceRef {
let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSRef, 0, nil)
if let imageP = imageProperties {
let imageDict = imageP as Dictionary
width = imageDict[kCGImagePropertyPixelWidth] as! CGFloat
height = imageDict[kCGImagePropertyPixelHeight] as! CGFloat
}
}
return CGSize(width: width, height: height)
// guard let urlStr = url, urlStr.count != 0 else {
// return CGSize.zero
// }
// let tempUrl = URL(string: urlStr)
// let imageSourceRef = CGImageSourceCreateWithURL(tempUrl! as CFURL, nil)
// var width: CGFloat = 0
// var height: CGFloat = 0
// if let imageSRef = imageSourceRef {
// let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSRef, 0, nil)
// if let imageP = imageProperties {
// let imageDict = imageP as Dictionary
// width = imageDict[kCGImagePropertyPixelWidth] as! CGFloat
// height = imageDict[kCGImagePropertyPixelHeight] as! CGFloat
// }
// }
return CGSize(width: 200, height: 250)
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceTableFootView.swift
View file @ d18bb551
......@@ -76,22 +76,22 @@ class YHServiceTableFootView: UIView {
}
func getImageSize(_ url: String?) -> CGSize {
guard let urlStr = url, urlStr.count != 0 else {
return CGSize.zero
}
let tempUrl = URL(string: urlStr)
let imageSourceRef = CGImageSourceCreateWithURL(tempUrl! as CFURL, nil)
var width: CGFloat = 0
var height: CGFloat = 0
if let imageSRef = imageSourceRef {
let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSRef, 0, nil)
if let imageP = imageProperties {
let imageDict = imageP as Dictionary
width = imageDict[kCGImagePropertyPixelWidth] as! CGFloat
height = imageDict[kCGImagePropertyPixelHeight] as! CGFloat
}
}
return CGSize(width: width, height: height)
// guard let urlStr = url, urlStr.count != 0 else {
// return CGSize.zero
// }
// let tempUrl = URL(string: urlStr)
// let imageSourceRef = CGImageSourceCreateWithURL(tempUrl! as CFURL, nil)
// var width: CGFloat = 0
// var height: CGFloat = 0
// if let imageSRef = imageSourceRef {
// let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSRef, 0, nil)
// if let imageP = imageProperties {
// let imageDict = imageP as Dictionary
// width = imageDict[kCGImagePropertyPixelWidth] as! CGFloat
// height = imageDict[kCGImagePropertyPixelHeight] as! CGFloat
// }
// }
return CGSize(width: 150, height: 250)
}
}
......
galaxy/galaxy/Classes/Tools/YHOOS/YHOSSManager.swift deleted 100644 → 0
View file @ 94cb1c0a
This diff is collapsed.
galaxy/galaxy/Res/galaxy-Bridge-Header.h
View file @ d18bb551
......@@ -10,7 +10,7 @@
#import <Bugly/Bugly.h>
#import <ATAuthSDK_D/ATAuthSDK.h>
#import <AliyunOSSiOS/OSSService.h>
//#import <AliyunOSSiOS/OSSService.h>
#import "JPUSHService.h"
// iOS10注册APNs所需头文件
......
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