Skip to content

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

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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  我的文书和我的签字修改
  //  空视图UI
parents 5ebe45b8 a6b5af8d
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 27 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 377570e4
...@@ -259,6 +259,7 @@ ...@@ -259,6 +259,7 @@
04A7BD172BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BD162BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift */; }; 04A7BD172BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BD162BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift */; };
04A7BD192BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BD182BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift */; }; 04A7BD192BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BD182BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift */; };
04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AA19FC2BB40D5C00C1CBBD /* Applegate(JPush).swift */; }; 04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AA19FC2BB40D5C00C1CBBD /* Applegate(JPush).swift */; };
04AAA8DC2BF5E5A200FE9FD5 /* YHEmptyDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AAA8DB2BF5E5A200FE9FD5 /* YHEmptyDataView.swift */; };
04AF514E2BEB585C00009E3A /* YHVideoPlayerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF514D2BEB585C00009E3A /* YHVideoPlayerVC.swift */; }; 04AF514E2BEB585C00009E3A /* YHVideoPlayerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF514D2BEB585C00009E3A /* YHVideoPlayerVC.swift */; };
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; }; 04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; }; 04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
...@@ -714,6 +715,7 @@ ...@@ -714,6 +715,7 @@
04A7BD162BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocumentsDetailViewModel.swift; sourceTree = "<group>"; }; 04A7BD162BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocumentsDetailViewModel.swift; sourceTree = "<group>"; };
04A7BD182BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocumentsUrlModel.swift; sourceTree = "<group>"; }; 04A7BD182BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocumentsUrlModel.swift; sourceTree = "<group>"; };
04AA19FC2BB40D5C00C1CBBD /* Applegate(JPush).swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Applegate(JPush).swift"; sourceTree = "<group>"; }; 04AA19FC2BB40D5C00C1CBBD /* Applegate(JPush).swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Applegate(JPush).swift"; sourceTree = "<group>"; };
04AAA8DB2BF5E5A200FE9FD5 /* YHEmptyDataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmptyDataView.swift; sourceTree = "<group>"; };
04AF514D2BEB585C00009E3A /* YHVideoPlayerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlayerVC.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>"; }; 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; }; 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
...@@ -2309,6 +2311,7 @@ ...@@ -2309,6 +2311,7 @@
A5ACE9252B4564F7002C94D2 /* YHBasicContentView.swift */, A5ACE9252B4564F7002C94D2 /* YHBasicContentView.swift */,
A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */, A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */,
04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */, 04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */,
04AAA8DB2BF5E5A200FE9FD5 /* YHEmptyDataView.swift */,
); );
path = V; path = V;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2890,6 +2893,7 @@ ...@@ -2890,6 +2893,7 @@
04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */, 04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */,
A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */, A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */,
045EEE872B9F171A0022A143 /* YHPreviewControllerHoldViewController.swift in Sources */, 045EEE872B9F171A0022A143 /* YHPreviewControllerHoldViewController.swift in Sources */,
04AAA8DC2BF5E5A200FE9FD5 /* YHEmptyDataView.swift in Sources */,
045EEF172B9F171A0022A143 /* YHSelectCountryViewController.swift in Sources */, 045EEF172B9F171A0022A143 /* YHSelectCountryViewController.swift in Sources */,
044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */, 044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */,
A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */, A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
......
galaxy/galaxy/Classes/Base/V/YHEmptyDataView.swift 0 → 100644
View file @ 377570e4
//
// YHEmptyDataView.swift
// galaxy
//
// Created by edy on 2024/5/16.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
// 通用空视图
let kEmptyCommonBgName = "no_data_bg_common"
// 搜索空视图
let kEmptySearchBgSName = "no_data_bg_search"
// 消息空视图
let kEmptyMessageBgSName = "no_data_bg_msg"
// 订单空视图
let kEmptyOrderBgName = "no_data_bg_order"
class YHEmptyDataView: UIView {
// 组件视图总高度
static let fixHeight = imgHeight + tipsHeight + gap
static let imgHeight = 128.0
static let tipsHeight = 20.0
static let gap = 16.0
var bgName: String = kEmptyCommonBgName {
didSet {
emptyBgImgV.image = UIImage(named:bgName)
}
}
var tips: String = "暂无内容" {
didSet {
tipsLabel.text = tips
}
}
var topMargin: Double = 0.0 {
didSet {
emptyBgImgV.snp.updateConstraints { make in
make.top.equalToSuperview().offset(topMargin)
}
self.setNeedsLayout()
self.layoutIfNeeded()
}
}
var emptyBgImgV: UIImageView = {
let imgView = UIImageView(image: UIImage(named: kEmptyCommonBgName))
return imgView
}()
var tipsLabel: UILabel = {
let label = UILabel()
label.textColor = UIColor.init(hex: 0x121A26, alpha: 0.5)
label.font = UIFont.PFSC_R(ofSize: 14)
label.textAlignment = .center
label.text = "暂无内容".local
return label
}()
static func createView(_ tips:String = "暂无内容", _ bgName:String = kEmptyCommonBgName) -> YHEmptyDataView {
let view = YHEmptyDataView(frame:CGRect(x: 0, y: 0, width: KScreenWidth, height: self.fixHeight))
view.bgName = bgName
view.tips = tips
return view
}
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func createUI() {
self.addSubview(emptyBgImgV)
self.addSubview(tipsLabel)
emptyBgImgV.snp.makeConstraints { make in
make.top.equalToSuperview().offset(0)
make.width.height.equalTo(Self.imgHeight)
make.centerX.equalTo(self)
}
tipsLabel.snp.makeConstraints { make in
make.top.equalTo(emptyBgImgV.snp.bottom).offset(Self.gap)
make.height.equalTo(Self.tipsHeight)
make.centerX.equalTo(self)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift
View file @ 377570e4
...@@ -146,6 +146,7 @@ extension YHHKPlanDoctumentVC { ...@@ -146,6 +146,7 @@ extension YHHKPlanDoctumentVC {
"plan_detail":viewModel.arrHKPlanData[3].content, "plan_detail":viewModel.arrHKPlanData[3].content,
"qualifications_and_awards":viewModel.arrHKPlanData[4].content, "qualifications_and_awards":viewModel.arrHKPlanData[4].content,
"other":viewModel.arrHKPlanData[5].content, "other":viewModel.arrHKPlanData[5].content,
"remark":viewModel.arrHKPlanData[6].content,
"content_save":1] "content_save":1]
cancelTimer() cancelTimer()
startTimer() startTimer()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 377570e4
...@@ -702,17 +702,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -702,17 +702,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .delete { if type == .delete {
YHHUD.flash(message: "产品确定 后续完善") // YHHUD.flash(message: "产品确定 后续完善")
// self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index] self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index]
// self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
// guard let self = self else { return } guard let self = self else { return }
// if success { if success {
// YHHUD.flash(message: "删除成功") YHHUD.flash(message: "删除成功")
// } else { } else {
// YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
// } }
// self.getData() self.getData()
// } }
} }
} }
return cell return cell
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHHKPlanDocModel.swift
View file @ 377570e4
...@@ -16,6 +16,7 @@ enum HKPlanDocQuestionType { ...@@ -16,6 +16,7 @@ enum HKPlanDocQuestionType {
case planDocQuestion4 //4、未来发展计划 case planDocQuestion4 //4、未来发展计划
case planDocQuestion5 //5、专业资格及奖项 case planDocQuestion5 //5、专业资格及奖项
case planDocQuestion6 //6、其他材料 case planDocQuestion6 //6、其他材料
case planOther //7、备注
} }
class YHHKPlanDocModel { class YHHKPlanDocModel {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentDetailModel.swift
View file @ 377570e4
...@@ -30,7 +30,8 @@ class YHMyDocumentProspectusModel: YHBaseModel { ...@@ -30,7 +30,8 @@ class YHMyDocumentProspectusModel: YHBaseModel {
var tag: String = "" var tag: String = ""
var tencent_file_id: String = "" var tencent_file_id: String = ""
var tencent_docs_url: String = "" var tencent_docs_url: String = ""
var remark: String = ""
//赴港计划书状态 //赴港计划书状态
var status : Int = 0 var status : Int = 0
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
View file @ 377570e4
...@@ -164,6 +164,8 @@ private extension YHHKPlanItemView { ...@@ -164,6 +164,8 @@ private extension YHHKPlanItemView {
YHWholeScreenTipsView.show(type: .hkPlanQ6, targetView: iconImageV) YHWholeScreenTipsView.show(type: .hkPlanQ6, targetView: iconImageV)
case .unknow: case .unknow:
printLog("") printLog("")
case .planOther:
YHWholeScreenTipsView.show(type: .hkPlanQ7, targetView: iconImageV)
} }
} }
...@@ -182,8 +184,12 @@ private extension YHHKPlanItemView { ...@@ -182,8 +184,12 @@ private extension YHHKPlanItemView {
myTextView.wrapToContent() myTextView.wrapToContent()
} }
numberLabel.text = myTextView.text.count.string + "/100" var number = 100
if myTextView.text.count > 100 { if model.type == .planOther {
number = 500
}
numberLabel.text = myTextView.text.count.string + "/\(number)"
if myTextView.text.count > number {
numberLabel.textColor = .failColor numberLabel.textColor = .failColor
} else { } else {
numberLabel.textColor = UIColor.placeHolderColor numberLabel.textColor = UIColor.placeHolderColor
...@@ -204,6 +210,9 @@ extension YHHKPlanItemView : UITextViewDelegate { ...@@ -204,6 +210,9 @@ extension YHHKPlanItemView : UITextViewDelegate {
return true return true
} }
let newLength = (textView.text as NSString).length + text.count - range.length let newLength = (textView.text as NSString).length + text.count - range.length
if dataMode?.type == .planOther {
return newLength <= 500
}
return newLength <= 100 return newLength <= 100
} }
...@@ -211,8 +220,12 @@ extension YHHKPlanItemView : UITextViewDelegate { ...@@ -211,8 +220,12 @@ extension YHHKPlanItemView : UITextViewDelegate {
guard let model = dataMode else { return } guard let model = dataMode else { return }
guard let text = textView.text else { return } guard let text = textView.text else { return }
model.content = text model.content = text
numberLabel.text = myTextView.text.count.string + "/100" var number = 100
if myTextView.text.count > 100 { if model.type == .planOther {
number = 500
}
numberLabel.text = myTextView.text.count.string + "/\(number)"
if myTextView.text.count > number {
numberLabel.textColor = .failColor numberLabel.textColor = .failColor
} else { } else {
numberLabel.textColor = UIColor.placeHolderColor numberLabel.textColor = UIColor.placeHolderColor
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift
View file @ 377570e4
...@@ -386,6 +386,15 @@ private extension YHMyDocumentsDetailViewModel { ...@@ -386,6 +386,15 @@ private extension YHMyDocumentsDetailViewModel {
tModel.title = "6、其他材料" tModel.title = "6、其他材料"
tModel.content = model.other.defaultStringIfEmpty(detaultValue: "") tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
tModel.type = .planDocQuestion6 tModel.type = .planDocQuestion6
arrHKPlanData.append(tModel)
}
//6、备注
do {
let tModel = YHHKPlanDocModel()
tModel.title = "7、备注"
tModel.content = model.remark.defaultStringIfEmpty(detaultValue: "")
tModel.type = .planOther
tModel.isLastData = true tModel.isLastData = true
arrHKPlanData.append(tModel) arrHKPlanData.append(tModel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ 377570e4
...@@ -595,17 +595,16 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -595,17 +595,16 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .delete { if type == .delete {
YHHUD.flash(message: "产品确定 后续完善") self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
// self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index] self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
// self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in guard let self = self else { return }
// guard let self = self else { return } if success {
// if success { YHHUD.flash(message: "删除成功")
// YHHUD.flash(message: "删除成功") } else {
// } else { YHHUD.flash(message: error?.errorMsg ?? "")
// YHHUD.flash(message: error?.errorMsg ?? "") }
// } self.getData()
// self.getData() }
// }
} }
} }
return cell return cell
......
galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift
View file @ 377570e4
...@@ -21,6 +21,7 @@ enum YHWholeScreenTipsViewType : Int { ...@@ -21,6 +21,7 @@ enum YHWholeScreenTipsViewType : Int {
case hkPlanQ4 //赴港计划书问题4 case hkPlanQ4 //赴港计划书问题4
case hkPlanQ5 //赴港计划书问题5 case hkPlanQ5 //赴港计划书问题5
case hkPlanQ6 //赴港计划书问题6 case hkPlanQ6 //赴港计划书问题6
case hkPlanQ7 //赴港计划书问题7
} }
...@@ -85,6 +86,8 @@ class YHWholeScreenTipsView: UIView { ...@@ -85,6 +86,8 @@ class YHWholeScreenTipsView: UIView {
return "请以不超过100字简介你所属的专业界别内曾获取由国家或国际认可/著名团体颁奖的专业资格，及曾取得的奖项（如有）" return "请以不超过100字简介你所属的专业界别内曾获取由国家或国际认可/著名团体颁奖的专业资格，及曾取得的奖项（如有）"
case .hkPlanQ6: case .hkPlanQ6:
return "请以不超过100字简介你认为对评核你的申请非常重要的其他材料" return "请以不超过100字简介你认为对评核你的申请非常重要的其他材料"
case .hkPlanQ7:
return "您可以在此输入因为字数限制无法输入的内容"
default: default:
return "--" return "--"
} }
......
galaxy/galaxy/Res/Assets.xcassets/EmptyDataBg/Contents.json 0 → 100644
View file @ 377570e4
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/EmptyDataBg/no_data_bg_common.imageset/Contents.json 0 → 100644
View file @ 377570e4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "暂无@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "暂无@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/EmptyDataBg/no_data_bg_msg.imageset/Contents.json 0 → 100644
View file @ 377570e4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "暂无消息@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "暂无消息@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/EmptyDataBg/no_data_bg_order.imageset/Contents.json 0 → 100644
View file @ 377570e4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "您还没有相关订单@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/EmptyDataBg/no_data_bg_search.imageset/Contents.json 0 → 100644
View file @ 377570e4
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "无搜索结果@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "无搜索结果@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