From: liangzhenying <867174124@qq.com> Date: Wed, 8 Apr 2026 07:08:00 +0000 (+0800) Subject: 适配PAXA X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=243b7c082910e050440566b7dbf0dd4a14a30af6;p=mirrors%2FShenYin.git 适配PAXA --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index b5e5a20..6e25b77 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -124,12 +124,16 @@ membershipExceptions = ( "/Localized: Channel/DeepChords/DeepChords.storyboard", Channel/DeepChords/Channel/Config/CCConfig.swift, + Channel/DeepChords/Channel/UI/BleScanHeaderView.swift, + Channel/DeepChords/Channel/UI/CustomButton.swift, Channel/DeepChords/DeepChords.plist, Channel/DeepChords/DeepChords.xcassets, Channel/PLAYBOY/Channel/Config/CCBleManager.swift, Channel/PLAYBOY/Channel/Config/CCConfig.swift, Channel/PLAYBOY/Channel/Config/CCDevice.swift, Channel/PLAYBOY/Channel/Config/CCPage.swift, + Channel/PLAYBOY/Channel/UI/BleScanHeaderView.swift, + Channel/PLAYBOY/Channel/UI/CustomButton.swift, Channel/PLAYBOY/Channel/UI/PbLoginVC.swift, Channel/PLAYBOY/Channel/UI/PbModeVC.swift, Channel/PLAYBOY/Channel/UI/PbTabBC.swift, @@ -158,7 +162,9 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Channel/DeepChords/DeepChords.plist, + Channel/PaXa/Config/BleScanHeaderView.swift, Channel/PaXa/Config/CCConfig.swift, + Channel/PaXa/Config/CustomButton.swift, Channel/PaXa/PaXa.plist, Channel/PaXa/PaXa.storyboard, Channel/PaXa/PaXa.xcassets, @@ -166,6 +172,8 @@ Channel/PLAYBOY/Channel/Config/CCConfig.swift, Channel/PLAYBOY/Channel/Config/CCDevice.swift, Channel/PLAYBOY/Channel/Config/CCPage.swift, + Channel/PLAYBOY/Channel/UI/BleScanHeaderView.swift, + Channel/PLAYBOY/Channel/UI/CustomButton.swift, Channel/PLAYBOY/Channel/UI/PbLoginVC.swift, Channel/PLAYBOY/Channel/UI/PbModeVC.swift, Channel/PLAYBOY/Channel/UI/PbTabBC.swift, @@ -191,6 +199,8 @@ Channel/DeepChords/Channel/Config/CCConfig.swift, Channel/DeepChords/Channel/Config/CCDevice.swift, Channel/DeepChords/Channel/Config/CCPage.swift, + Channel/DeepChords/Channel/UI/BleScanHeaderView.swift, + Channel/DeepChords/Channel/UI/CustomButton.swift, Channel/DeepChords/Channel/UI/JoyAiFunctionVC.swift, Channel/DeepChords/Channel/UI/JoyAiFunctionView.swift, Channel/DeepChords/Channel/UI/JoyCallingRecordVC.swift, @@ -215,7 +225,9 @@ Channel/DeepChords/Sdk/JoyRecord.swift, Channel/DeepChords/Sdk/JoySdkManager.swift, Channel/DeepChords/Sdk/JoyTcty.swift, + Channel/PaXa/Config/BleScanHeaderView.swift, Channel/PaXa/Config/CCConfig.swift, + Channel/PaXa/Config/CustomButton.swift, Channel/PaXa/PaXa.plist, Channel/PaXa/PaXa.storyboard, Channel/PaXa/PaXa.xcassets, @@ -1357,7 +1369,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/Channel/PLAYBOY/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603311815; + CURRENT_PROJECT_VERSION = 202604081115; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1391,7 +1403,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.0.2; + MARKETING_VERSION = 0.02; PRODUCT_BUNDLE_IDENTIFIER = com.ios.playboy; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1415,7 +1427,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/Channel/PLAYBOY/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603311815; + CURRENT_PROJECT_VERSION = 202604081115; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1449,7 +1461,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 0.0.2; + MARKETING_VERSION = 0.02; PRODUCT_BUNDLE_IDENTIFIER = com.ios.playboy; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift index b4d946b..452d55c 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift @@ -43,6 +43,8 @@ class CCConfig{ static let serviceLogo = "logo_2" static let userInfoList:[UserInfoCellType] = [.avatar,.nickName,.gender,.birthday,.height,.weight,.hobbies,.uid,.area] static let preferredStatusBarStyle: UIStatusBarStyle = .darkContent + + static let currentDeviceSize = CGSize(width: 168, height: 138) } extension YLColor: ColorRGBProviderProtocol { public var rgbValue: Int { diff --git a/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/BleScanHeaderView.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/BleScanHeaderView.swift new file mode 100644 index 0000000..6f1c690 --- /dev/null +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/BleScanHeaderView.swift @@ -0,0 +1,35 @@ +// +// BleScanHeaderView.swift +// ShenYin +// +// Created by liangshi on 2026/4/8. +// + +import DGActivityIndicatorView + +class BleScanHeaderView: BaseView { + let rippleView = DGActivityIndicatorView(type: .triplePulse,tintColor: UIColor.color(.theme),size: 250)! + var radarImageView = UIImageView() + override func setupViews() { + + addSubviews([rippleView,radarImageView]) + rippleView.startAnimating() + + radarImageView.do { v in + v.image = UIImage(named: "device_logo") + } + radarImageView.snp.makeConstraints { make in + make.width.equalTo(58) + make.height.equalTo(46) + make.center.equalToSuperview() + } + rippleView.snp.makeConstraints { make in + make.size.equalTo(250) + make.center.equalToSuperview() + } + + } + +} + + diff --git a/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/CustomButton.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/CustomButton.swift new file mode 100644 index 0000000..963d8de --- /dev/null +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/CustomButton.swift @@ -0,0 +1,56 @@ +// +// CustomButton.swift +// ShenYin +// +// Created by liangshi on 2026/4/7. +// + +import UIKit + +enum CustomButtonStyle:Int{ + case theme1 + case theme2 + case theme3 + case theme4 + case custom + case sport +} + +class CustomButton: UIButton { + func set(title:String,font:UIFont = .bold(14),style:CustomButtonStyle = .theme1, target: Any?, action: Selector) { + setTitle(title, for: .normal) + addTarget(target, action: action, for: .touchUpInside) + layer.cornerRadius = 12 + layer.masksToBounds = true + titleLabel?.font = font + + if style == .theme1 { + setTitleColor(.white, for: .normal) + backgroundColor = .color(.theme) + } + else if style == .theme4 { + setTitleColor(.hexString("#FF4E4E"), for: .normal) + backgroundColor = UIColor.hexString("#FF4E4E") + setTitleColor(.white, for: .normal) + titleLabel?.font = .bold(14) + } + else if style == .theme3 { + layer.cornerRadius = 12 + setTitleColor(.color(.level1), for: .normal) + backgroundColor = .color(.cellBg) + titleLabel?.font = .regular(14) + } + else if style == .sport { + setTitleColor(.white, for: .normal) + backgroundColor = .color(.sport) + } + else{ + setTitleColor(.color(.theme), for: .normal) + backgroundColor = .clear + layer.borderWidth = 1.4 + layer.borderColor = UIColor.color(.theme).cgColor + } + + } + +} diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift index 317ac5c..0f2515a 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift @@ -39,6 +39,7 @@ class CCConfig{ static let serviceLogo = "logo_4" static let userInfoList:[UserInfoCellType] = [.avatar,.nickName,.gender,.uid,.area] static let preferredStatusBarStyle: UIStatusBarStyle = .lightContent + static let currentDeviceSize = CGSize(width: 168, height: 138) } extension YLColor: ColorRGBProviderProtocol { diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/BleScanHeaderView.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/BleScanHeaderView.swift new file mode 100644 index 0000000..d4dc72b --- /dev/null +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/BleScanHeaderView.swift @@ -0,0 +1,25 @@ + +class BleScanHeaderView: BaseView { + var radarImageView = UIImageView() + override func setupViews() { + + addSubviews([radarImageView]) + + radarImageView.do { v in + v.image = UIImage(named: "radar_icon") + // + let animation = CABasicAnimation.init(keyPath: "transform.rotation.z") + animation.beginTime = 0.0 + animation.fromValue = 0.0 + animation.toValue = 2*Double.pi + animation.duration = 2 + animation.repeatCount = MAXFLOAT + v.layer.add(animation, forKey: "radar.transform.rotation.x") + } + radarImageView.snp.makeConstraints { make in + make.size.equalTo(200) + make.center.equalToSuperview() + } + } + +} diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/CustomButton.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/CustomButton.swift new file mode 100644 index 0000000..a75b176 --- /dev/null +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/CustomButton.swift @@ -0,0 +1,54 @@ +// +// CustomButton.swift +// ShenYin +// +// Created by liangshi on 2026/4/7. +// + +import UIKit + +enum CustomButtonStyle:Int{ + case theme1 + case theme2 + case theme3 + case theme4 + case custom + case sport +} + +class CustomButton: UIButton { + func set(title:String,font:UIFont = .bold(14),style:CustomButtonStyle = .theme1, target: Any?, action: Selector) { + setTitle(title, for: .normal) + addTarget(target, action: action, for: .touchUpInside) + layer.cornerRadius = 23 + layer.masksToBounds = true + titleLabel?.font = font + + if style == .theme1 { + setTitleColor(.rgb(0x121212), for: .normal) + backgroundColor = .white + } + else if style == .theme4 { + setTitleColor(.hexString("#FF4E4E"), for: .normal) + backgroundColor = UIColor.hexString("#FF4E4E") + setTitleColor(.white, for: .normal) + titleLabel?.font = .bold(14) + } + else if style == .theme3 { + layer.cornerRadius = 12 + setTitleColor(.color(.level1), for: .normal) + backgroundColor = .color(.cellBg) + titleLabel?.font = .regular(14) + } + else if style == .sport { + setTitleColor(.white, for: .normal) + backgroundColor = .color(.sport) + } + else{ + setTitleColor(.white, for: .normal) + backgroundColor = .clear + layer.borderWidth = 1.4 + layer.borderColor = UIColor.color(.level1).cgColor + } + } +} diff --git a/ShenYin/ShenYin/Channel/PaXa/Config/BleScanHeaderView.swift b/ShenYin/ShenYin/Channel/PaXa/Config/BleScanHeaderView.swift new file mode 100644 index 0000000..849dfcd --- /dev/null +++ b/ShenYin/ShenYin/Channel/PaXa/Config/BleScanHeaderView.swift @@ -0,0 +1,30 @@ +// +// Untitled.swift +// ShenYin +// +// Created by liangshi on 2026/4/8. +// +import DGActivityIndicatorView +class BleScanHeaderView: BaseView { + let rippleView = DGActivityIndicatorView(type: .triplePulse,tintColor: UIColor.color(.theme),size: 250)! + var radarImageView = UIImageView() + override func setupViews() { + + addSubviews([rippleView,radarImageView]) + rippleView.startAnimating() + + radarImageView.do { v in + v.image = UIImage(named: "device_logo") + } + radarImageView.snp.makeConstraints { make in + make.width.equalTo(74) + make.height.equalTo(16) + make.center.equalToSuperview() + } + rippleView.snp.makeConstraints { make in + make.size.equalTo(250) + make.center.equalToSuperview() + } + } + +} diff --git a/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift b/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift index 7a6a99e..b19e960 100644 --- a/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift +++ b/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift @@ -41,7 +41,12 @@ class CCConfig{ static let serviceLogo = "logo_2" static let userInfoList:[UserInfoCellType] = [.avatar,.nickName,.gender,.birthday,.height,.weight,.hobbies,.uid,.area] static let preferredStatusBarStyle: UIStatusBarStyle = .darkContent + + static let currentDeviceSize = CGSize(width: 168, height: 138) } + + + extension YLColor: ColorRGBProviderProtocol { public var rgbValue: Int { switch self { diff --git a/ShenYin/ShenYin/Channel/PaXa/Config/CustomButton.swift b/ShenYin/ShenYin/Channel/PaXa/Config/CustomButton.swift new file mode 100644 index 0000000..83944c8 --- /dev/null +++ b/ShenYin/ShenYin/Channel/PaXa/Config/CustomButton.swift @@ -0,0 +1,55 @@ +// +// CustomButton.swift +// ShenYin +// +// Created by liangshi on 2026/4/7. +// + +import UIKit + +enum CustomButtonStyle:Int{ + case theme1 + case theme2 + case theme3 + case theme4 + case custom + case sport +} + +class CustomButton: UIButton { + func set(title:String,font:UIFont = .bold(14),style:CustomButtonStyle = .theme1, target: Any?, action: Selector) { + setTitle(title, for: .normal) + addTarget(target, action: action, for: .touchUpInside) + layer.cornerRadius = 12 + layer.masksToBounds = true + titleLabel?.font = font + + if style == .theme1 { + setTitleColor(.white, for: .normal) + backgroundColor = .color(.theme) + } + else if style == .theme4 { + setTitleColor(.hexString("#FF4E4E"), for: .normal) + backgroundColor = UIColor.hexString("#FF4E4E") + setTitleColor(.white, for: .normal) + titleLabel?.font = .bold(14) + } + else if style == .theme3 { + layer.cornerRadius = 12 + setTitleColor(.color(.level1), for: .normal) + backgroundColor = .color(.cellBg) + titleLabel?.font = .regular(14) + } + else if style == .sport { + setTitleColor(.white, for: .normal) + backgroundColor = .color(.sport) + } + else{ + setTitleColor(.color(.theme), for: .normal) + backgroundColor = .clear + layer.borderWidth = 1.4 + layer.borderColor = UIColor.color(.theme).cgColor + } + } + +} diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.plist b/ShenYin/ShenYin/Channel/PaXa/PaXa.plist index 6c69c97..c3d1518 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.plist +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.plist @@ -52,6 +52,6 @@ audio UIDesignRequiresCompatibility - + diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Contents.json index 3cbe57f..7b9d24b 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "server_qr.png", + "filename" : "Frame 2543.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Frame 2543.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Frame 2543.png new file mode 100644 index 0000000..5529025 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/Frame 2543.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/server_qr.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/server_qr.png deleted file mode 100644 index a06461f..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/customer/server_qr.imageset/server_qr.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@2x.png index b947bdb..4f92021 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@3x.png index 1aede79..af6e8cb 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/collection_selected.imageset/Frame_2216@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Contents.json index 68bbddd..46cc05b 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "中英互译@2x.png", + "filename" : "Slice 340@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "中英互译@3x.png", + "filename" : "Slice 340@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@2x.png new file mode 100644 index 0000000..e144cb0 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@3x.png new file mode 100644 index 0000000..2a55892 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/Slice 340@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@2x.png" deleted file mode 100644 index 3a6c8b0..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@3x.png" deleted file mode 100644 index ff5b297..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_chinese2english.imageset/\344\270\255\350\213\261\344\272\222\350\257\221@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Contents.json index b5ef55e..a183581 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "对话翻译@2x.png", + "filename" : "Slice 343@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "对话翻译@3x.png", + "filename" : "Slice 343@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@2x.png new file mode 100644 index 0000000..f11434b Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@3x.png new file mode 100644 index 0000000..6392406 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/Slice 343@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@2x.png" deleted file mode 100644 index 6eb61b1..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@3x.png" deleted file mode 100644 index 009c881..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Contents.json index b14a288..0a368a0 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "同传听译@2x.png", + "filename" : "Slice 347@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "同传听译@3x.png", + "filename" : "Slice 347@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@2x.png new file mode 100644 index 0000000..72d26ee Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@3x.png new file mode 100644 index 0000000..150f27e Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/Slice 347@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@2x.png" deleted file mode 100644 index 5f06735..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@3x.png" deleted file mode 100644 index 7e22615..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Contents.json index c8994e8..0923b3f 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(9).png", + "filename" : "Slice 374@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(8).png", + "filename" : "Slice 374@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@2x(9).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@2x(9).png deleted file mode 100644 index 74e7869..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@2x(9).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@3x(8).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@3x(8).png deleted file mode 100644 index fdb915b..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Frame@3x(8).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@2x.png new file mode 100644 index 0000000..a54d9f4 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@3x.png new file mode 100644 index 0000000..8c1827b Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_about.imageset/Slice 374@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Contents.json index 2bda9f7..9f7fda7 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(2).png", + "filename" : "Slice 373@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(3).png", + "filename" : "Slice 373@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@2x(2).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@2x(2).png deleted file mode 100644 index a5d423e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@2x(2).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@3x(3).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@3x(3).png deleted file mode 100644 index 8669b1b..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Frame@3x(3).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@2x.png new file mode 100644 index 0000000..b8c4b73 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@3x.png new file mode 100644 index 0000000..cec7c91 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_feedback.imageset/Slice 373@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Contents.json index 08f6a19..afd72e7 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(6).png", + "filename" : "Slice 369@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(7).png", + "filename" : "Slice 369@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@2x(6).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@2x(6).png deleted file mode 100644 index 18d9ed0..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@2x(6).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@3x(7).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@3x(7).png deleted file mode 100644 index 8a38a4b..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Frame@3x(7).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@2x.png new file mode 100644 index 0000000..6d1e068 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@3x.png new file mode 100644 index 0000000..c005fe4 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_instru.imageset/Slice 369@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Contents.json index 5c4d3b1..fdbd205 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x.png", + "filename" : "Slice 371@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x.png", + "filename" : "Slice 371@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@2x.png deleted file mode 100644 index a3bf533..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@3x.png deleted file mode 100644 index ed2e1c3..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Frame@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@2x.png new file mode 100644 index 0000000..d3c62ed Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@3x.png new file mode 100644 index 0000000..ccc3264 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_lan.imageset/Slice 371@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Contents.json index 99ffc12..0b0e832 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "设置_1@2x.png", + "filename" : "Slice 372@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "设置_1@3x.png", + "filename" : "Slice 372@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@2x.png new file mode 100644 index 0000000..8006789 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@3x.png new file mode 100644 index 0000000..303c2e8 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/Slice 372@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@2x.png" deleted file mode 100644 index b856efd..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@3x.png" deleted file mode 100644 index b7a2a2e..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_more.imageset/\350\256\276\347\275\256_1@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Contents.json index ffe9cff..51e1dcd 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(4).png", + "filename" : "Slice 370@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(5).png", + "filename" : "Slice 370@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@2x(4).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@2x(4).png deleted file mode 100644 index adaeb33..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@2x(4).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@3x(5).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@3x(5).png deleted file mode 100644 index 3670036..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Frame@3x(5).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@2x.png new file mode 100644 index 0000000..9de7f77 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@3x.png new file mode 100644 index 0000000..9ba0c65 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cell_update.imageset/Slice 370@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Contents.json index 2bc80a1..1567f41 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "天气_多云_1@2x.png", + "filename" : "Slice 368@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "天气_多云_1@3x.png", + "filename" : "Slice 368@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@2x.png new file mode 100644 index 0000000..757dd07 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@3x.png new file mode 100644 index 0000000..c81caf9 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/Slice 368@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@2x.png" deleted file mode 100644 index 7fa426d..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@3x.png" deleted file mode 100644 index c9650dc..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/mine_cloud.imageset/\345\244\251\346\260\224_\345\244\232\344\272\221_1@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@2x.png index e5cbbe0..569a756 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@3x.png index 3ee5aa2..0a0ab07 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/find_icon.imageset/Frame@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Contents.json index 7a3ad69..8f4ea96 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2250-1 1.png", + "filename" : "Slice 305@2x 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2250-1.png", + "filename" : "Slice 305@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1 1.png deleted file mode 100644 index 5c3a3bb..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1.png deleted file mode 100644 index eb82ce3..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Frame 2250-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@2x 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@2x 1.png new file mode 100644 index 0000000..91db52b Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@2x 1.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@3x.png new file mode 100644 index 0000000..c0af169 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_normal.imageset/Slice 305@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Contents.json index 9e0d40b..5e440ad 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Contents.json @@ -6,12 +6,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2251.png", + "filename" : "Slice 304@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2250.png", + "filename" : "Slice 304@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2250.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2250.png deleted file mode 100644 index 428a253..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2250.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2251.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2251.png deleted file mode 100644 index c2035a2..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Frame 2251.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@2x.png new file mode 100644 index 0000000..8d19837 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@3x.png new file mode 100644 index 0000000..62c6d44 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_0_selected.imageset/Slice 304@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Contents.json index ddf6868..74356b9 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2249-1.png", + "filename" : "Slice 307@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2249-1 1.png", + "filename" : "Slice 307@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1 1.png deleted file mode 100644 index ef00a94..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1.png deleted file mode 100644 index bac5ece..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Frame 2249-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@2x.png new file mode 100644 index 0000000..af81b9f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@3x.png new file mode 100644 index 0000000..945279b Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_normal.imageset/Slice 307@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Contents.json index 4244878..4ab34a7 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2250.png", + "filename" : "Slice 306@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2249.png", + "filename" : "Slice 306@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2249.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2249.png deleted file mode 100644 index b2427a2..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2249.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2250.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2250.png deleted file mode 100644 index 088f7e2..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Frame 2250.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@2x.png new file mode 100644 index 0000000..64a532b Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@3x.png new file mode 100644 index 0000000..e53963f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_1_selected.imageset/Slice 306@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Contents.json index ba8c961..b01e2a5 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2251-1 1.png", + "filename" : "Slice 309@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2251-1.png", + "filename" : "Slice 309@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1 1.png deleted file mode 100644 index aae62f9..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1.png deleted file mode 100644 index e9fbeee..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Frame 2251-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@2x.png new file mode 100644 index 0000000..71b734d Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@3x.png new file mode 100644 index 0000000..f744774 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_normal.imageset/Slice 309@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Contents.json index 2bfc97d..2b47ec2 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2251.png", + "filename" : "Slice 308@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2252.png", + "filename" : "Slice 308@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2251.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2251.png deleted file mode 100644 index 352a2b9..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2251.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2252.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2252.png deleted file mode 100644 index 7ed4d05..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Frame 2252.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@2x.png new file mode 100644 index 0000000..77f0431 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@3x.png new file mode 100644 index 0000000..9180153 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_2_selected.imageset/Slice 308@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Contents.json index 6465865..df6565b 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2252-1 1.png", + "filename" : "Slice 311@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2252-1.png", + "filename" : "Slice 311@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1 1.png deleted file mode 100644 index 70267ee..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1.png deleted file mode 100644 index bc75988..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Frame 2252-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@2x.png new file mode 100644 index 0000000..9a19d5f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@3x.png new file mode 100644 index 0000000..96f6230 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_normal.imageset/Slice 311@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Contents.json index 4567bba..f130342 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2253.png", + "filename" : "Slice 310@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2252.png", + "filename" : "Slice 310@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2252.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2252.png deleted file mode 100644 index 6dbe1cd..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2252.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2253.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2253.png deleted file mode 100644 index 25c87c2..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Frame 2253.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@2x.png new file mode 100644 index 0000000..f9d472a Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@3x.png new file mode 100644 index 0000000..0c2cadd Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_3_selected.imageset/Slice 310@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Contents.json index 454222a..94fb9f5 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2253.png", + "filename" : "Slice 313@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2253 (1).png", + "filename" : "Slice 313@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253 (1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253 (1).png deleted file mode 100644 index 1746aa4..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253 (1).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253.png deleted file mode 100644 index 57e8310..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Frame 2253.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@2x.png new file mode 100644 index 0000000..394d8e3 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@3x.png new file mode 100644 index 0000000..396ae17 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_normal.imageset/Slice 313@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Contents.json index 21c68b7..19e9c34 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2254.png", + "filename" : "Slice 312@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2253.png", + "filename" : "Slice 312@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2253.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2253.png deleted file mode 100644 index 55c20b3..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2253.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2254.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2254.png deleted file mode 100644 index f272461..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Frame 2254.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@2x.png new file mode 100644 index 0000000..a4e89b8 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@3x.png new file mode 100644 index 0000000..0eac542 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/tabbar/tab_4_selected.imageset/Slice 312@3x.png differ diff --git a/ShenYin/ShenYin/ShenYin-Bridging-Header.h b/ShenYin/ShenYin/ShenYin-Bridging-Header.h index d74e715..935b5ea 100644 --- a/ShenYin/ShenYin/ShenYin-Bridging-Header.h +++ b/ShenYin/ShenYin/ShenYin-Bridging-Header.h @@ -6,7 +6,7 @@ // //#import "SVProgressHUD+YLAdd.h" -#import "YLTimerButton.h" +//#import "YLTimerButton.h" #import "PcmSound.h" #import #import "JLBleAssistManager.h" diff --git a/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.h b/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.h deleted file mode 100644 index 1d10193..0000000 --- a/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// YLTimerButton.h -// YLProject -// -// Created by Mac01 on 2018/3/24. -// Copyright © 2018å¹´ Mac01. All rights reserved. -// - -#import -@interface YLTimerButton : UIButton -@property(nonatomic, strong) UILabel *label; -@property(nonatomic, assign) NSInteger maxCount; - -- (void)start; -@end diff --git a/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.m b/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.m deleted file mode 100644 index 92699a8..0000000 --- a/ShenYin/ShenYin/Tools/TimerButton/YLTimerButton.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// YLTimerButton.m -// YLProject -// -// Created by Mac01 on 2018/3/24. -// Copyright © 2018å¹´ Mac01. All rights reserved. -// - -#import "YLTimerButton.h" - - -@interface YLTimerButton () - -@property(nonatomic, assign) NSInteger second; -@property(nonatomic, strong) NSTimer *timer; -@property(nonatomic, strong) NSDate *lastTime; -@end - -@implementation YLTimerButton - -- (instancetype)initWithFrame:(CGRect)frame{ - if (self = [super initWithFrame:frame]) { - self.maxCount = 60; - - [self setTitle:@"" forState:UIControlStateNormal]; - self.titleLabel.font = [UIFont systemFontOfSize:14]; - - self.layer.cornerRadius = 5; - self.layer.masksToBounds = YES; - - self.label = [[UILabel alloc]initWithFrame:self.bounds]; - self.label.text = @"点击获取"; - self.label.font = [UIFont systemFontOfSize:14]; - self.label.textColor = [UIColor blueColor]; - self.label.textAlignment = NSTextAlignmentCenter; - self.label.backgroundColor = [UIColor clearColor]; - [self addSubview:self.label]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(becomeActive) name:UIApplicationDidBecomeActiveNotification object:nil]; - } - return self; -} - --(void)layoutSubviews{ - [super layoutSubviews]; - self.label.frame = self.bounds; -// self.backgroundColor = [UIColor redColor]; -} - -- (void)start { - self.enabled = NO; - self.second = self.maxCount; - self.label.textColor = [UIColor colorWithRed:67/255.0f green:155/255.0f blue:255/255.0f alpha:1.0f]; - self.label.text = [NSString stringWithFormat:@"%ldS",self.second]; - self.timer = [NSTimer scheduledTimerWithTimeInterval:1 - target:self - selector:@selector(count) - userInfo:nil - repeats:YES]; -} - -- (void)stop { - self.enabled = YES; - self.label.text = @"发送验证码"; - self.label.textColor = [UIColor colorWithRed:67/255.0f green:155/255.0f blue:255/255.0f alpha:1.0f]; - if ([self.timer isValid]) { - [self.timer invalidate]; - } -} - -- (void)count { - self.second--; - if (self.second < 0) { - self.second = 0; - } - - self.label.text = [NSString stringWithFormat:@"%ldS", (long)self.second]; - if (self.second == 0) { - [self stop]; - } -} - - -#pragma mark - notification -- (void)enterBackground{ - if ([self.timer isValid]) { - [self.timer invalidate]; - self.lastTime = [NSDate date]; - } - else{ - self.lastTime = nil; - } -} - -- (void)becomeActive{ - if (self.lastTime == nil) { - return; - } - NSInteger count = [self.lastTime timeIntervalSinceNow]; - self.second -= ABS(count); - if (self.second > 0) { - self.timer = [NSTimer scheduledTimerWithTimeInterval:1 - target:self - selector:@selector(count) - userInfo:nil - repeats:YES]; - } - else{ - [self count]; - } -} -@end - diff --git a/ShenYin/ShenYin/Tools/YLTimerButton.swift b/ShenYin/ShenYin/Tools/YLTimerButton.swift new file mode 100644 index 0000000..328f20c --- /dev/null +++ b/ShenYin/ShenYin/Tools/YLTimerButton.swift @@ -0,0 +1,152 @@ +// +// YL.swift +// ShenYin +// +// Created by liangshi on 2026/4/8. +// + +import UIKit + +class YLTimerButton: UIButton { + // 公开属性 + private let label = UILabel() + var maxCount: Int = 60 + var color:UIColor = .blue{ + didSet{ + label.textColor = color + } + } + + // 私有属性 + private var second: Int = 0 + private var timer: Timer? + private var lastTime: Date? + + override init(frame: CGRect) { + super.init(frame: frame) + setupUI() + addNotifications() + } + + required init?(coder: NSCoder) { + super.init(coder: coder) + setupUI() + addNotifications() + } + + // 初始化UI + private func setupUI() { + // 按钮基础配置 + setTitle("", for:.normal) + titleLabel?.font = UIFont.systemFont(ofSize: 14) + layer.cornerRadius = 5 + layer.masksToBounds = true + + // 配置label + label.frame = bounds + label.text = "点击获取".l10n + label.font = UIFont.systemFont(ofSize: 14) + label.textColor = color + label.textAlignment = .center + label.backgroundColor = .clear + addSubview(label) + } + + // 添加通知监听 + private func addNotifications() { + NotificationCenter.default.addObserver( + self, + selector: #selector(enterBackground), + name: UIApplication.didEnterBackgroundNotification, + object: nil + ) + NotificationCenter.default.addObserver( + self, + selector: #selector(becomeActive), + name: UIApplication.didBecomeActiveNotification, + object: nil + ) + } + + // 布局子视图 + override func layoutSubviews() { + super.layoutSubviews() + label.frame = bounds + } + + // 开始倒计时 + func start() { + isEnabled = false + second = maxCount + label.textColor = .lightGray + label.text = "\(second)S" + + // 启动定时器 + timer?.invalidate() + timer = Timer.scheduledTimer( + timeInterval: 1, + target: self, + selector: #selector(count), + userInfo: nil, + repeats: true + ) + } + + // 停止倒计时 + func stop() { + isEnabled = true + label.text = "发送验证码".l10n + label.textColor = color + timer?.invalidate() + timer = nil + } + + // 倒计时逻辑 + @objc private func count() { + second -= 1 + if second < 0 { + second = 0 + } + label.text = "\(second)S" + + if second == 0 { + stop() + } + } + + // 应用进入后台 + @objc private func enterBackground() { + if timer?.isValid == true { + timer?.invalidate() + lastTime = Date() + } else { + lastTime = nil + } + } + + // 应用回到前台 + @objc private func becomeActive() { + guard let lastTime = lastTime else { return } + + let interval = Int(lastTime.timeIntervalSinceNow) + second -= abs(interval) + + if second > 0 { + timer = Timer.scheduledTimer( + timeInterval: 1, + target: self, + selector: #selector(count), + userInfo: nil, + repeats: true + ) + } else { + count() + } + } + + // 释放资源 + deinit { + NotificationCenter.default.removeObserver(self) + timer?.invalidate() + } +} diff --git a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift index ef2ddff..d54cde5 100644 --- a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift +++ b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift @@ -91,23 +91,11 @@ class CurrentDeviceView: BaseView { } override func setupLayout() { - if CCConfig.appType == .deepchords { - imageView.snp.makeConstraints { make in - make.width.equalTo(168) - make.height.equalTo(138) - make.centerX.equalToSuperview() - make.top.equalToSuperview().inset(20) - make.bottom.equalToSuperview().inset(20) - } - } - else{ - imageView.snp.makeConstraints { make in - make.width.equalTo(220) - make.height.equalTo(120) - make.centerX.equalToSuperview() - make.top.equalToSuperview().inset(20) - make.bottom.equalToSuperview().inset(20) - } + imageView.snp.makeConstraints { make in + make.size.equalTo(CCConfig.currentDeviceSize) + make.centerX.equalToSuperview() + make.top.equalToSuperview().inset(20) + make.bottom.equalToSuperview().inset(20) } connetedView.snp.makeConstraints { make in make.edges.equalToSuperview() diff --git a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift index 2bde660..7dfb5e2 100644 --- a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift +++ b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift @@ -6,7 +6,7 @@ // import UIKit -import DGActivityIndicatorView + enum BleScanState{ case scan case has @@ -112,67 +112,7 @@ extension BleScanVC:UITableViewDelegate,UITableViewDataSource { } -class BleScanHeaderView: BaseView { - let rippleView = DGActivityIndicatorView(type: .triplePulse,tintColor: UIColor.color(.theme),size: 250)! - var radarImageView = UIImageView() - override func setupViews() { - - if CCConfig.appType == .playboy { - addSubviews([radarImageView]) - - radarImageView.do { v in - v.image = UIImage(named: "radar_icon") - // - let animation = CABasicAnimation.init(keyPath: "transform.rotation.z") - animation.beginTime = 0.0 - animation.fromValue = 0.0 - animation.toValue = 2*Double.pi - animation.duration = 2 - animation.repeatCount = MAXFLOAT - v.layer.add(animation, forKey: "radar.transform.rotation.x") - } - radarImageView.snp.makeConstraints { make in - make.size.equalTo(200) - make.center.equalToSuperview() - } - } - else if CCConfig.appType == .deepchords{ - addSubviews([rippleView,radarImageView]) - rippleView.startAnimating() - - radarImageView.do { v in - v.image = UIImage(named: "device_logo") - } - radarImageView.snp.makeConstraints { make in - make.width.equalTo(58) - make.height.equalTo(46) - make.center.equalToSuperview() - } - rippleView.snp.makeConstraints { make in - make.size.equalTo(250) - make.center.equalToSuperview() - } - } - else if CCConfig.appType == .paxa{ - addSubviews([rippleView,radarImageView]) - rippleView.startAnimating() - - radarImageView.do { v in - v.image = UIImage(named: "device_logo") - } - radarImageView.snp.makeConstraints { make in - make.width.equalTo(74) - make.height.equalTo(16) - make.center.equalToSuperview() - } - rippleView.snp.makeConstraints { make in - make.size.equalTo(250) - make.center.equalToSuperview() - } - } - } -} class ScanStateCell: BaseTableViewCell { let titleLabel = UILabel() diff --git a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift index a4395f9..03195d0 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift @@ -60,25 +60,32 @@ class ForgetVC:BaseVC{ } override func setupLayout(){ - logoImg.snp.makeConstraints { make in - if CCConfig.appType == .playboy{ + if CCConfig.appType == .playboy{ + logoImg.snp.makeConstraints { make in make.width.equalTo(62) make.height.equalTo(80) make.top.equalTo(kNavBtm) make.centerX.equalToSuperview() } - else{ - + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(180) + make.bottom.equalToSuperview() + } + } + else{ + logoImg.snp.makeConstraints { make in make.left.equalToSuperview().inset(28) make.top.equalTo(kNavBtm + 20) make.centerX.equalToSuperview() } + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(214) + make.bottom.equalToSuperview() + } } - bgView.snp.makeConstraints { make in - make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(CCConfig.appType == .playboy ? 180:214) - make.bottom.equalToSuperview() - } + titleLabel.snp.makeConstraints { make in make.top.equalToSuperview().offset(34) diff --git a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift index 8f28cdc..85e9f44 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift @@ -55,23 +55,30 @@ class RegisterVC:BaseVC{ } override func setupLayout(){ - logoImg.snp.makeConstraints { make in - if CCConfig.appType == .playboy{ + if CCConfig.appType == .playboy{ + logoImg.snp.makeConstraints { make in make.width.equalTo(62) make.height.equalTo(80) - make.top.equalTo(kNavBtm ) + make.top.equalTo(kNavBtm) make.centerX.equalToSuperview() } - else{ + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(180) + make.bottom.equalToSuperview() + } + } + else{ + logoImg.snp.makeConstraints { make in make.left.equalToSuperview().inset(28) make.top.equalTo(kNavBtm + 20) make.centerX.equalToSuperview() } - } - bgView.snp.makeConstraints { make in - make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(CCConfig.appType == .playboy ? 180:214) - make.bottom.equalToSuperview() + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(214) + make.bottom.equalToSuperview() + } } titleLabel.snp.makeConstraints { make in diff --git a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift index 8b71b13..f58bf74 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift @@ -52,23 +52,30 @@ class SmsLoginVC:BaseVC{ } override func setupLayout(){ - logoImg.snp.makeConstraints { make in - if CCConfig.appType == .playboy{ + if CCConfig.appType == .playboy{ + logoImg.snp.makeConstraints { make in make.width.equalTo(62) make.height.equalTo(80) make.top.equalTo(kNavBtm) make.centerX.equalToSuperview() } - else{ + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(180) + make.bottom.equalToSuperview() + } + } + else{ + logoImg.snp.makeConstraints { make in make.left.equalToSuperview().inset(28) make.top.equalTo(kNavBtm + 20) make.centerX.equalToSuperview() } - } - bgView.snp.makeConstraints { make in - make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(CCConfig.appType == .playboy ? 180:214) - make.bottom.equalToSuperview() + bgView.snp.makeConstraints { make in + make.left.right.equalToSuperview() + make.top.equalToSuperview().inset(214) + make.bottom.equalToSuperview() + } } titleLabel.snp.makeConstraints { make in diff --git a/ShenYin/ShenYin/UI/Login/View/CodeView.swift b/ShenYin/ShenYin/UI/Login/View/CodeView.swift index b14b32c..1f6b3b9 100644 --- a/ShenYin/ShenYin/UI/Login/View/CodeView.swift +++ b/ShenYin/ShenYin/UI/Login/View/CodeView.swift @@ -20,10 +20,9 @@ class CodeView: BaseView { } codeButton.do { (v) in v.maxCount = 60 - v.label.textColor = .color(.theme) + v.color = .color(.theme) v.backgroundColor = .clear v.addLine(height: 22) - v.label.text = "点击获取".l10n } inputBgView.backgroundColor = .color(.inputBg) diff --git a/ShenYin/ShenYin/UI/common/CustomButton.swift b/ShenYin/ShenYin/UI/common/CustomButton.swift deleted file mode 100644 index 7dc2e60..0000000 --- a/ShenYin/ShenYin/UI/common/CustomButton.swift +++ /dev/null @@ -1,125 +0,0 @@ -// -// CustomButton.swift -// ShenYin -// -// Created by liangshi on 2025/7/30. -// - -import UIKit - -enum CustomButtonStyle:Int{ - case theme1 - case theme2 - case theme3 - case theme4 - case custom - case sport -} - -class CustomButton: UIButton { - func set(title:String,font:UIFont = .bold(14),style:CustomButtonStyle = .theme1, target: Any?, action: Selector) { - if CCConfig.appType == .deepchords{ - setTitle(title, for: .normal) - addTarget(target, action: action, for: .touchUpInside) - layer.cornerRadius = 12 - layer.masksToBounds = true - titleLabel?.font = font - - if style == .theme1 { - setTitleColor(.white, for: .normal) - backgroundColor = .color(.theme) - } - else if style == .theme4 { - setTitleColor(.hexString("#FF4E4E"), for: .normal) - backgroundColor = UIColor.hexString("#FF4E4E") - setTitleColor(.white, for: .normal) - titleLabel?.font = .bold(14) - } - else if style == .theme3 { - layer.cornerRadius = 12 - setTitleColor(.color(.level1), for: .normal) - backgroundColor = .color(.cellBg) - titleLabel?.font = .regular(14) - } - else if style == .sport { - setTitleColor(.white, for: .normal) - backgroundColor = .color(.sport) - } - else{ - setTitleColor(.color(.theme), for: .normal) - backgroundColor = .clear - layer.borderWidth = 1.4 - layer.borderColor = UIColor.color(.theme).cgColor - } - } - else if CCConfig.appType == .paxa{ - setTitle(title, for: .normal) - addTarget(target, action: action, for: .touchUpInside) - layer.cornerRadius = 12 - layer.masksToBounds = true - titleLabel?.font = font - - if style == .theme1 { - setTitleColor(.white, for: .normal) - backgroundColor = .color(.theme) - } - else if style == .theme4 { - setTitleColor(.hexString("#FF4E4E"), for: .normal) - backgroundColor = UIColor.hexString("#FF4E4E") - setTitleColor(.white, for: .normal) - titleLabel?.font = .bold(14) - } - else if style == .theme3 { - layer.cornerRadius = 12 - setTitleColor(.color(.level1), for: .normal) - backgroundColor = .color(.cellBg) - titleLabel?.font = .regular(14) - } - else if style == .sport { - setTitleColor(.white, for: .normal) - backgroundColor = .color(.sport) - } - else{ - setTitleColor(.color(.theme), for: .normal) - backgroundColor = .clear - layer.borderWidth = 1.4 - layer.borderColor = UIColor.color(.theme).cgColor - } - } - else{ - setTitle(title, for: .normal) - addTarget(target, action: action, for: .touchUpInside) - layer.cornerRadius = 23 - layer.masksToBounds = true - titleLabel?.font = font - - if style == .theme1 { - setTitleColor(.rgb(0x121212), for: .normal) - backgroundColor = .white - } - else if style == .theme4 { - setTitleColor(.hexString("#FF4E4E"), for: .normal) - backgroundColor = UIColor.hexString("#FF4E4E") - setTitleColor(.white, for: .normal) - titleLabel?.font = .bold(14) - } - else if style == .theme3 { - layer.cornerRadius = 12 - setTitleColor(.color(.level1), for: .normal) - backgroundColor = .color(.cellBg) - titleLabel?.font = .regular(14) - } - else if style == .sport { - setTitleColor(.white, for: .normal) - backgroundColor = .color(.sport) - } - else{ - setTitleColor(.white, for: .normal) - backgroundColor = .clear - layer.borderWidth = 1.4 - layer.borderColor = UIColor.color(.level1).cgColor - } - } - } - -} diff --git a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift index 7b6cf28..8afa267 100644 --- a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift +++ b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift @@ -205,7 +205,7 @@ class RecordTipsView: BasePresentView { v.numberOfLines = 0 } actionbtn.do { v in - if CCConfig.appType == .deepchords{ + if CCConfig.appType == .deepchords || CCConfig.appType == .paxa{ v.backgroundColor = .color(.theme) v.setTitleColor(.white, for: .normal) }