From b63bd9cab1550e2b2104057e0e27da0bfeca08b1 Mon Sep 17 00:00:00 2001 From: liangzhenying <867174124@qq.com> Date: Tue, 3 Mar 2026 11:10:40 +0800 Subject: [PATCH] =?utf8?q?=E6=94=B9=E4=BA=86=E5=BD=95=E9=9F=B3=EF=BC=8C?= =?utf8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88=E5=85=A8?= =?utf8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ShenYin/ShenYin.xcodeproj/project.pbxproj | 8 ++-- .../UI/Customer/CustomerHeaderView.swift | 2 +- .../search/CloudSelectedVC.swift | 35 +++++++++++++----- .../search/HistorySelectedVC.swift | 33 +++++++++++++---- .../UI/Home/Root/CurrentDeviceView.swift | 3 +- .../UI/common/ImagePickerManager.swift | 5 +-- .../home/polygon.imageset/Contents.json | 4 +- .../home/polygon.imageset/Polygon_2@2x.png | Bin 440 -> 0 bytes .../home/polygon.imageset/Polygon_2@3x.png | Bin 723 -> 0 bytes .../home/polygon.imageset/Slice 130@2x.png | Bin 0 -> 375 bytes .../home/polygon.imageset/Slice 130@3x.png | Bin 0 -> 584 bytes 11 files changed, 62 insertions(+), 28 deletions(-) delete mode 100644 ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png delete mode 100644 ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@3x.png create mode 100644 ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Slice 130@2x.png create mode 100644 ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Slice 130@3x.png diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index 6cf61ab..bcace1f 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -1287,7 +1287,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603031420; + CURRENT_PROJECT_VERSION = 202603031820; DEVELOPMENT_TEAM = MAC46RQ4KH; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1342,7 +1342,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603031420; + CURRENT_PROJECT_VERSION = 202603031820; DEVELOPMENT_TEAM = MAC46RQ4KH; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1519,7 +1519,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603031403; + CURRENT_PROJECT_VERSION = 202603031106; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1575,7 +1575,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603031403; + CURRENT_PROJECT_VERSION = 202603031106; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift b/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift index c89ea32..7ab4ae7 100644 --- a/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift +++ b/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift @@ -14,7 +14,7 @@ class CustomerHeaderView: BaseView { override func setupViews() { backgroundColor = .color(.bgColor) titleLabel.do { (v) in - v.data = FeedbackContentModel(content: "你好，请问有什么我可以帮助到您".l10n,isSend: false) + v.data = FeedbackContentModel(content: "你好，请问有什么我可以帮助到您".l10n + "?",isSend: false) } addSubviews([titleLabel,qaView]) } diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift index 38e68d1..cbb62b6 100644 --- a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift +++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift @@ -13,6 +13,7 @@ class CloudSelectedVC: BaseVC{ var deleteList = [RecordHistoryModel]() var remainDeleteList = [RecordHistoryModel]() var deleteCallback:((_ list:[RecordHistoryModel])->Void)? + let leftLabel = UILabel() init(data:[RecordHistoryModel]) { var tempList = [CloudSelectedModel]() @@ -39,8 +40,9 @@ class CloudSelectedVC: BaseVC{ v.titleLabel.font = .bold(16) v.title = "已选择0项" // v.leftView.backgroundColor = .red - v.leftView.setImage(nil, for: .normal) +// v.leftView.setImage(nil, for: .normal) v.rightView.isHidden = false + v.leftView.isHidden = true // v.rightView.backgroundColor = .red v.leftView.snp.remakeConstraints { (m) in @@ -55,19 +57,17 @@ class CloudSelectedVC: BaseVC{ m.bottom.equalToSuperview() m.width.greaterThanOrEqualTo(58) } - - let leftLabel = UILabel() - leftLabel.text = "全选".l10n + leftLabel.textColor = .color(.secondary) leftLabel.yc.setBorder(width: 1, color: .color(.secondary), radius: 11) leftLabel.font = .regular(12) leftLabel.textAlignment = .center leftLabel.yc.addTap(target: self, action: #selector(allSelctedAction)) - v.leftView.addSubview(leftLabel) + v.addSubview(leftLabel) leftLabel.snp.remakeConstraints { (m) in m.leading.equalToSuperview().inset(18) m.height.equalTo(22) - m.centerY.equalToSuperview() + m.centerY.equalTo(v.titleLabel) m.width.greaterThanOrEqualTo(40) } let rightLabel = UILabel() @@ -114,11 +114,21 @@ class CloudSelectedVC: BaseVC{ make.bottom.equalToSuperview().inset(95) } } - + override func setupData() { + selectedAction() + } @objc func allSelctedAction(){ - for item in list { - item.isSelcted = true + let selectedList = list.filter({$0.isSelcted}) + if selectedList.count == list.count{ + for item in list { + item.isSelcted = false + } + } + else{ + for item in list { + item.isSelcted = true + } } tableView.reloadData() selectedAction() @@ -129,6 +139,13 @@ class CloudSelectedVC: BaseVC{ func selectedAction(){ let selectedList = list.filter({$0.isSelcted}) navBar.title = "已选择\(selectedList.count)项" + + if selectedList.count == list.count { + leftLabel.text = "取消".l10n + } + else{ + leftLabel.text = "全选".l10n + } } @objc func outputAction(){ var tempList = [RecordHistoryModel]() diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift index bce6665..9aa9ac6 100644 --- a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift +++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift @@ -11,7 +11,7 @@ class HistorySelectedVC: BaseVC{ let bottomView = HistorySearchBottomView() var list = [RecordHistorySelectedModel]() var deleteCallback:((_ list:[RecordDetailModel])->Void)? - + let leftLabel = UILabel() init(data:[RecordDetailModel]) { var tempList = [RecordHistorySelectedModel]() for item in data { @@ -39,6 +39,7 @@ class HistorySelectedVC: BaseVC{ // v.leftView.backgroundColor = .red v.leftView.setImage(nil, for: .normal) v.rightView.isHidden = false + v.leftView.isHidden = true // v.rightView.backgroundColor = .red v.leftView.snp.remakeConstraints { (m) in @@ -53,19 +54,17 @@ class HistorySelectedVC: BaseVC{ m.bottom.equalToSuperview() m.width.greaterThanOrEqualTo(58) } - - let leftLabel = UILabel() - leftLabel.text = "全选" + leftLabel.textColor = .color(.secondary) leftLabel.yc.setBorder(width: 1, color: .color(.secondary), radius: 11) leftLabel.font = .regular(12) leftLabel.textAlignment = .center leftLabel.yc.addTap(target: self, action: #selector(allSelctedAction)) - v.leftView.addSubview(leftLabel) + v.addSubview(leftLabel) leftLabel.snp.remakeConstraints { (m) in m.leading.equalToSuperview().inset(18) m.height.equalTo(22) - m.centerY.equalToSuperview() + m.centerY.equalTo(v.titleLabel) m.width.greaterThanOrEqualTo(40) } let rightLabel = UILabel() @@ -113,10 +112,21 @@ class HistorySelectedVC: BaseVC{ } } + override func setupData() { + selectedAction() + } @objc func allSelctedAction(){ - for item in list { - item.isSelcted = true + let selectedList = list.filter({$0.isSelcted}) + if selectedList.count == list.count{ + for item in list { + item.isSelcted = false + } + } + else{ + for item in list { + item.isSelcted = true + } } tableView.reloadData() selectedAction() @@ -127,6 +137,13 @@ class HistorySelectedVC: BaseVC{ func selectedAction(){ let selectedList = list.filter({$0.isSelcted}) navBar.title = "已选择\(selectedList.count)项" + + if selectedList.count == list.count { + leftLabel.text = "取消".l10n + } + else{ + leftLabel.text = "全选".l10n + } } @objc func outputAction(){ var tempList = [RecordDetailModel]() diff --git a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift index ec3d5d0..382ff53 100644 --- a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift +++ b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift @@ -10,8 +10,9 @@ class CurrentDeviceView: BaseView { let imageView = UIImageView() override func setupViews() { // backgroundColor = .blue - addSubviews([imageView]) addSubviews([connetedView]) + addSubviews([imageView]) + imageView.do { v in v.image = UIImage(named: "home_header") } diff --git a/ShenYin/ShenYin/UI/common/ImagePickerManager.swift b/ShenYin/ShenYin/UI/common/ImagePickerManager.swift index b5a14b7..baf8bdd 100644 --- a/ShenYin/ShenYin/UI/common/ImagePickerManager.swift +++ b/ShenYin/ShenYin/UI/common/ImagePickerManager.swift @@ -37,6 +37,7 @@ class ImagePickerManager: NSObject, TZImagePickerControllerDelegate { picker?.allowPickingOriginalPhoto = false picker?.allowPickingVideo = false picker?.allowPickingImage = true + picker?.preferredLanguage = (CCConfig.appLanguage == .chinse || CCConfig.appLanguage == .Traditional_Chinese ) ? "zh-Hans" : "en" picker?.modalPresentationStyle = .overFullScreen viewController.present(picker!, animated: true, completion: nil) } @@ -44,13 +45,11 @@ class ImagePickerManager: NSObject, TZImagePickerControllerDelegate { self.imageCallback = callback let picker = TZImagePickerController(maxImagesCount: 1, delegate: self) -// picker?.needCircleCrop = true -// picker?.circleCropRadius = Int(UIScreen.main.bounds.size.width/2) -// picker?.allowCrop = true picker?.showSelectBtn = false picker?.allowPickingOriginalPhoto = false picker?.allowPickingVideo = false picker?.allowPickingImage = true + picker?.preferredLanguage = (CCConfig.appLanguage == .chinse || CCConfig.appLanguage == .Traditional_Chinese ) ? "zh-Hans" : "en" picker?.modalPresentationStyle = .overFullScreen viewController.present(picker!, animated: true, completion: nil) } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json index 8b4e60a..b4c5b6e 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Polygon_2@2x.png", + "filename" : "Slice 130@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Polygon_2@3x.png", + "filename" : "Slice 130@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png deleted file mode 100644 index 3467ca6991fe352a77d1932bba340341d2cc49f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmV;p0Z0CcP)HV{6vZ7o2}4j6C1PfPl?`=ZMf^JqAOS)Gb)iBap{@*|We1p6P+|U(p)0WU@ilXz_VqgQt6!II90MP5KjxpY<8KX-*DXcH5?AV zx-a4})NZ$b;9Q&`cW$cxvlCUzvewoD`0ZfWM z&zx(zuG=yJsUaaS7z|c0^@gznV}lOArsxHfB9bB7whiv^A!;U!3xk5kG`dTaB9b9g z91i$f;wKmj+{iMuOB6-wZd60)Dcfw@RR(`xRM;Hk+azzpNQh%d;g#|o)dw&VxPi-~ znn?K~DV8Boz^{QP#8oK6D&2V{OLDJAF?6J+)oSTXh+hN$i9rx+)lqIxj_-VIL#XWX zS>&tyjj=CSTg&BgPg(T5&6x{D5<^P2+chyI4!GYtX^U^xY_r+i2)%N^Vj@FAtJmv& z=FrYF-hqb@ubO!buN+RqjfoA33(=)}#5+)QLuae*LovrxG91egPhZP0j9GXRp5g&` zQ_Ll^a!{ongvt3kafbE)009608xy#$*m?-fEi{K49Y#6elj`8SJ@#NmLuDW5UD#Bl4 z1LmQD<}X%^8k$faJN5@@PBoMHkZZ^ebQM0mJj*_;mL==2TtgG;8jWqNpz)Iic`P(! zCnFlGP*JQh=dKAgheAUsF{r}}V_kDa+-g|V9IMR%00960ooHf100006Nkl< z%_~Gv7{+H<*w|WIu(gwgt^7L{6jEeEqBL6zVj&ArvcL!nIfz>7nWm{cl6t%Oqi*71 z23ny8qLzBL({vIVAdxq2=Aj^Z7PFXbn0@rwhhf9cC7Z@CYYkbCo z-Z3Fo$s;2N`yD5fNehOVIEJ{C!D9qGN1Zq8WRQiZbwk5maAoh`&K8mU)I>E zo+a);IVoqQT$0vJjqga-H_J0INLo{la)WZ*c_U+vPTwfH%}(6P;(@-|=A7K()q)u# zW7W`5|5o~-dG1`Tf#wFud0}iMV`Fur@c}Ufx>gCcG)}Rm3&)-?`4!68X*fz80_{%k zbBwX(2<8fH%+9i)W346DK_BRDH+Lm7v@tc2sA9(700030|1|3i8vp literal 0 HcmV?d00001 -- 2.17.1