From: liangzhenying <867174124@qq.com> Date: Fri, 9 Jan 2026 07:21:57 +0000 (+0800) Subject: 修改眼镜Ai页面 X-Git-Tag: mix-v1.0~19 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=8ff4dd478fef379520279744dd64c6b897345358;p=mirrors%2FShenYin.git 修改眼镜Ai页面 --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index fe3ea5d..8eb828f 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ 3FD1DFED2F0E00BF00A62733 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; }; 3FD1DFF02F0E00BF00A62733 /* JLAudioUnitKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3FD1A2912F0BC9D800A62733 /* JLAudioUnitKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 644D1BB5EDD3EA1D77C57786 /* Pods_DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */; }; + 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */; }; 817510A595D00CAD05E3772C /* Pods_playboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F69407092D551BA7F3AD217C /* Pods_playboy.framework */; }; F2E449CAD5874BE652A69B50 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ @@ -84,6 +85,7 @@ 3FD1DFF42F0E00BF00A62733 /* playboy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = playboy.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5A92F7DC2CB6E6E69D2AB23E /* Pods-DeepChordsSdk.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DeepChordsSdk.debug.xcconfig"; path = "Target Support Files/Pods-DeepChordsSdk/Pods-DeepChordsSdk.debug.xcconfig"; sourceTree = ""; }; 5F5DE5910965D53C2B3405B0 /* Pods-ShenYin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShenYin.debug.xcconfig"; path = "Target Support Files/Pods-ShenYin/Pods-ShenYin.debug.xcconfig"; sourceTree = ""; }; + 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShenYin.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CB933A7969ADF81D59503790 /* Pods-LingQi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LingQi.debug.xcconfig"; path = "Target Support Files/Pods-LingQi/Pods-LingQi.debug.xcconfig"; sourceTree = ""; }; CE98543C79FAAB6CEF4CBFCA /* Pods-LingQi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LingQi.release.xcconfig"; path = "Target Support Files/Pods-LingQi/Pods-LingQi.release.xcconfig"; sourceTree = ""; }; E7D3DF51BED56E93E4ED8102 /* Pods-DeepChordsSdk.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DeepChordsSdk.release.xcconfig"; path = "Target Support Files/Pods-DeepChordsSdk/Pods-DeepChordsSdk.release.xcconfig"; sourceTree = ""; }; @@ -199,6 +201,7 @@ 3F469CB12F0B539600121DBD /* DeepChordsSdk.framework in Frameworks */, F2E449CAD5874BE652A69B50 /* (null) in Frameworks */, 3FD1A2952F0BCACB00A62733 /* JLAudioUnitKit.xcframework in Frameworks */, + 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -267,6 +270,7 @@ 3F7602EA2EFA891200588C18 /* DeepChordsSdk.framework */, 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */, F69407092D551BA7F3AD217C /* Pods_playboy.framework */, + 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceCell.swift b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceCell.swift index bbe8064..3ca4e0a 100644 --- a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceCell.swift +++ b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceCell.swift @@ -36,7 +36,7 @@ class HomeDeviceCell: BaseCollectionViewCell { alpha = 1 } else{ - alpha = 0.3 + alpha = 0.5 } } } diff --git a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift index 115a63f..440c18b 100644 --- a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift +++ b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift @@ -155,8 +155,15 @@ extension HomeDeviceVC:UICollectionViewDataSource,UICollectionViewDelegate,UICol return cell } func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - let model = DeviceVM.shared.dataList[indexPath.row] - App.shared.goToPage(HomeVC(device: model)) + if CCDevice.isJoy { + let model = DeviceVM.shared.dataList[indexPath.row] + App.shared.goToPage(HomeVC(device: model)) + } + else{ + let model = DeviceVM.shared.dataList[indexPath.row] + App.shared.goToPage(AiFunctionVC(device: model)) + } + } func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView{ diff --git a/ShenYin/ShenYin/UI/Home/Root/AiFunctionVC.swift b/ShenYin/ShenYin/UI/Home/Root/AiFunctionVC.swift new file mode 100644 index 0000000..666dd45 --- /dev/null +++ b/ShenYin/ShenYin/UI/Home/Root/AiFunctionVC.swift @@ -0,0 +1,300 @@ +// +// AiFunctionVC.swift +// ShenYin +// +// Created by liangshi on 2026/1/9. +// + +import UIKit + +class AiFunctionVC:BaseVC{ + private let bgView = UIScrollView() + private let headerView = AiFunctionHeadView() + private let functionView = AiFunctionView() + + private var device: HomeDeviceModel + init(device model: HomeDeviceModel) { + self.device = model + super.init() + } + + override func viewDidLoad() { + super.viewDidLoad() + NotificationManager.add(self, selector: #selector(deviceChange(_:)), forName: .deviceValidChange) + updateUI() + } + + override func setupViews() { + navBar.title = device.productName + navBar.backgroundColor = .color(.bgColor) + view.backgroundColor = .color(.bgColor) + // navBar.rightView.setImage(UIImage(named: "add_icon"), for: .normal) + view.addSubview(bgView) + bgView.addSubviews([headerView,functionView]) + headerView.do { v in + v.icon.imageView.kf.setImage(with: device.image.yc.asUrl) + v.bottonView.yc.addTap(target: self, action: #selector(chatAction)) + } + functionView.do { v in + v.tapCallback = {[weak self] type in + self?.tapFunctionAction(type) + } + } + } + override func setupLayout() { + bgView.snp.makeConstraints { make in + make.top.equalTo(kNavBtm) + make.left.right.bottom.equalToSuperview() + } + headerView.snp.makeConstraints { make in + make.top.equalToSuperview() + make.left.equalToSuperview() + make.width.equalTo(kScreenWid) + } + functionView.snp.makeConstraints { make in + make.top.equalTo(headerView.snp.bottom).offset(10) + make.left.equalToSuperview() + make.width.equalTo(kScreenWid) + } + } + func updateUI(){ + if let mac = CCBleManager.shared.connectPeripheral?.mac, mac == device.mac, CCBleManager.shared.isConnetd{ + headerView.enable = true + functionView.enable = true + } + else{ + headerView.enable = false + functionView.enable = false + } + } + @objc func deviceChange(_ noti:Notification){ + updateUI() + } + @objc func chatAction(){ + if let mac = CCBleManager.shared.connectPeripheral?.mac, mac == device.mac, CCBleManager.shared.isConnetd{ + CCPage.gotoChat() + } + } + func tapFunctionAction(_ type:HomeCellType){ +// if type == .recordHistory{ +// App.shared.goToPage(HistoryRecordVC()) +// return +// } +// if let mac = CCBleManager.shared.connectPeripheral?.mac, mac == device.mac, CCBleManager.shared.isConnetd{ + switch type { + case .fileRecord: + CCPage.gotoFieldRecord() + case .callRecord: + CCPage.gotoCallRecord() + case .chinese2English: + CCPage.gotoChinese2Enlgish() + case .recordTranslate: + CCPage.gotoTcty() + case .dialogTranslate: + CCPage.gotoDialogTranslate() + case .textTranslate: + App.shared.goToPage(TextTranlateVC()) + case .recordHistory: + App.shared.goToPage(HistoryRecordVC()) + } +// } + } +} + +fileprivate class AiFunctionHeadView: BaseView { + let icon = CurrentDeviceView() + let bottonView = UIView() + let tipsIcon = UIImageView() + let titleLabel = UILabel() + let valueLabel = UILabel() + let arrowIcon = UIImageView() + var enable:Bool = false{ + didSet{ + if enable { + self.alpha = 1 + } + else{ + self.alpha = 0.5 + } + } + } + + override func setupViews() { + addSubviews([icon,bottonView]) + bottonView.addSubviews([titleLabel,valueLabel,tipsIcon,arrowIcon]) + // backgroundColor = .blue + icon.do { v in + // v.backgroundColor = .lightGray + } + bottonView.do { v in + v.backgroundColor = .color(.cellBg) + v.yc.setCornerRadius(8) + } + tipsIcon.do { v in + v.image = UIImage(named: "home_chat") + } + titleLabel.do { (v) in + v.textColor = .color(.first) + v.font = .bold(16) + v.text = "AI" + "智能对话".l10n + } + valueLabel.do { (v) in + v.textColor = .rgb(0x8d8d8d) + v.font = .regular(12) + v.text = "AI" + "伙伴，随叫随到".l10n + } + self.enable = CCBleManager.shared.isConnetd + } + + override func setupLayout() { + icon.snp.makeConstraints { make in + make.top.width.left.equalToSuperview() + } + bottonView.snp.makeConstraints { make in + make.left.right.equalToSuperview().inset(15) + make.top.equalTo(icon.snp.bottom).offset(20) + make.bottom.equalToSuperview() + make.height.equalTo(90) + } + titleLabel.snp.makeConstraints { make in + make.left.equalToSuperview().inset(15) + make.top.equalTo(23) + } + valueLabel.snp.makeConstraints { make in + make.left.equalTo(titleLabel) + make.bottom.equalToSuperview().inset(24) + } + arrowIcon.snp.makeConstraints { make in + make.width.equalTo(7) + make.height.equalTo(13) + make.centerY.equalTo(valueLabel) + make.left.equalTo(valueLabel.snp.right).offset(2) + } + tipsIcon.snp.makeConstraints { make in + make.size.equalTo(50) + make.right.equalToSuperview().inset(16) + make.centerY.equalToSuperview() + } + + } +} +fileprivate class AiFunctionView: BaseView { + let list:[HomeCellType] = [.fileRecord,.callRecord,.recordTranslate,.dialogTranslate,.textTranslate,.recordHistory] + var enable:Bool = false{ + didSet{ + for item in self.subviews{ + if let view = item as? HomeCell { + view.enable = enable + if view.type == .recordHistory { + view.enable = true + } + } + } + } + } + var tapCallback:((HomeCellType)->Void)? + + override func setupViews() { + let h = 64.0 + var y = 0.0 + for (index, value) in list.enumerated() { + let view = HomeCell() + view.enable = CCBleManager.shared.isConnetd + view.yc.addTap(target: self, action: #selector(tapAction(_:))) + addSubview(view) + + view.type = value + view.snp.makeConstraints { make in + make.left.right.equalToSuperview().inset(18) + make.height.equalTo(h) + make.top.equalToSuperview().inset(y) + if index == list.count - 1 { + make.bottom.equalToSuperview() + } + } + y += h + 10 + } + } + @objc func tapAction(_ tap:UITapGestureRecognizer){ + if let view = tap.view as? HomeCell{ + if view.enable { + tapCallback?(view.type) + } + } + } +} +fileprivate class HomeCell: BaseView { + let bgView = UIView() + let icon = UIImageView() + let titleLabel = UILabel() + let valueLabel = UILabel() + let arrowIcon = UIImageView() + var type = HomeCellType.callRecord{ + didSet{ + titleLabel.text = type.title + valueLabel.text = type.subTitle + icon.image = UIImage(named: type.icon) + } + } + var enable:Bool = false{ + didSet{ + if enable || type == .recordHistory { + alpha = 1 + } + else{ + alpha = 0.5 + } + } + } + + override func setupViews() { + addSubview(bgView) + bgView.addSubviews([titleLabel,icon,valueLabel,arrowIcon]) + bgView.do { v in + v.backgroundColor = .color(.cellBg) + v.yc.setCornerRadius(8) + } + icon.do { v in + // v.backgroundColor = .lightGray + } + titleLabel.do { (v) in + v.textColor = .color(.first) + v.font = .bold(14) + v.numberOfLines = 2 + } + valueLabel.do { (v) in + v.textColor = .rgb(0x8d8d8d) + v.font = .regular(10) + v.numberOfLines = 2 + } + arrowIcon.image = UIImage(named: "arrow_2") + } + + override func setupLayout() { + bgView.snp.makeConstraints { make in + make.left.right.top.bottom.equalToSuperview() + } + icon.snp.makeConstraints { (m) in + m.size.equalTo(36) + m.left.equalToSuperview().inset(14) + m.top.equalToSuperview().inset(14) + } + titleLabel.snp.makeConstraints { (m) in + m.top.equalToSuperview().inset(14) + m.left.equalToSuperview().offset(61) + m.right.lessThanOrEqualTo(arrowIcon.snp.left) + } + valueLabel.snp.makeConstraints { (m) in + m.bottom.equalToSuperview().inset(15) + m.left.equalTo(titleLabel) + m.right.lessThanOrEqualTo(arrowIcon.snp.left) + } + arrowIcon.snp.makeConstraints { make in + make.width.equalTo(7) + make.height.equalTo(13) + make.centerY.equalToSuperview() + make.right.equalToSuperview().inset(14) + } + } + +} diff --git a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift index 2251ded..7894b8f 100644 --- a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift +++ b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift @@ -11,10 +11,6 @@ class CurrentDeviceView: BaseView { // backgroundColor = .blue addSubviews([imageView]) imageView.do { v in - //v.backgroundColor = .lightGray -// v.image = UIImage(named: "home_header") - - } NotificationManager.add(self, selector: #selector(deviceChange(_:)), forName: .deviceValidChange) updateUI() @@ -26,7 +22,7 @@ class CurrentDeviceView: BaseView { make.height.equalTo(138) make.centerX.equalToSuperview() make.top.equalToSuperview().inset(20) - make.bottom.equalToSuperview() + make.bottom.equalToSuperview().inset(20) } } @objc func deviceChange(_ noti:Notification){ @@ -40,10 +36,9 @@ class CurrentDeviceView: BaseView { alpha = 1 } else{ - alpha = 0.3 + alpha = 0.5 } } - } } diff --git a/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift b/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift index 96f68f0..e0d72f8 100644 --- a/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift +++ b/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift @@ -14,6 +14,7 @@ public enum HomeCellType: Int { case recordTranslate case dialogTranslate case textTranslate + case recordHistory var title:String{ @@ -30,6 +31,8 @@ public enum HomeCellType: Int { return "对话翻译".l10n case .textTranslate: return "文本翻译".l10n + case .recordHistory: + return "历史记录".l10n } } var subTitle:String{ @@ -46,6 +49,8 @@ public enum HomeCellType: Int { return "会议讲座，同步翻译".l10n case .textTranslate: return "即打即译，多语支持".l10n + case .recordHistory: + return "所有记录，一目了然".l10n } } var icon:String{ @@ -62,6 +67,8 @@ public enum HomeCellType: Int { return "home_dialogTranslate" case .textTranslate: return "home_textTranslate" + case .recordHistory: + return "home_history" } } } @@ -104,7 +111,7 @@ class HomeFunctionView: BaseView { } } } -class HomeCell: BaseView { +fileprivate class HomeCell: BaseView { let bgView = UIView() let icon = UIImageView() let titleLabel = UILabel() @@ -123,7 +130,7 @@ class HomeCell: BaseView { alpha = 1 } else{ - alpha = 0.3 + alpha = 0.5 } } } @@ -196,6 +203,8 @@ class HomeCell: BaseView { CCPage.gotoDialogTranslate() case .textTranslate: App.shared.goToPage(TextTranlateVC()) + case .recordHistory: + return } } } diff --git a/ShenYin/ShenYin/UI/Home/Root/HomeHeadView.swift b/ShenYin/ShenYin/UI/Home/Root/HomeHeadView.swift index 93d3bf7..2596de6 100644 --- a/ShenYin/ShenYin/UI/Home/Root/HomeHeadView.swift +++ b/ShenYin/ShenYin/UI/Home/Root/HomeHeadView.swift @@ -20,7 +20,7 @@ class HomeHeadView: BaseView { bottonView.alpha = 1 } else{ - bottonView.alpha = 0.3 + bottonView.alpha = 0.5 } } } diff --git a/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift b/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift index e89fee9..2641460 100644 --- a/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift +++ b/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift @@ -74,7 +74,7 @@ class ModeEffectsView: BaseView { alpha = 1 } else{ - alpha = 0.3 + alpha = 0.5 } } diff --git a/ShenYin/ShenYin/UI/Mode/ModeVC.swift b/ShenYin/ShenYin/UI/Mode/ModeVC.swift index 87899a1..c6ff1a9 100644 --- a/ShenYin/ShenYin/UI/Mode/ModeVC.swift +++ b/ShenYin/ShenYin/UI/Mode/ModeVC.swift @@ -21,8 +21,7 @@ class ModeVC:BaseVC{ } override func setupViews() { - self.navBar.title = CCBleManager.shared.connectPeripheral?.device.name ?? "" - navBar.backgroundColor = .clear +// navBar.backgroundColor = .red view.backgroundColor = .color(.bgColor) view.addSubview(bgView) @@ -75,10 +74,6 @@ class ModeVC:BaseVC{ effectsView.mode = type ?? .normal } } - - override func navRightViewTapped() { - - } } extension ModeVC{ @@ -86,7 +81,9 @@ extension ModeVC{ updateState() } func updateState(){ - self.findView.alpha = CCBleManager.shared.isConnetd ? 1:0.3 + self.findView.alpha = CCBleManager.shared.isConnetd ? 1:0.5 + self.navBar.title = CCBleManager.shared.connectPeripheral?.device.name ?? "" + } func selectedModeAction(_ mode:ModeEffectsType){ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Contents.json index 12d064a..2ccebff 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-5 1.png", + "filename" : "Slice 91@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-5.png", + "filename" : "Slice 91@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png deleted file mode 100644 index 810d154..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5.png b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5.png deleted file mode 100644 index db4131a..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Frame 2255-5.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@2x.png new file mode 100644 index 0000000..65f3bd4 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@3x.png new file mode 100644 index 0000000..dfa0bf9 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_callRecord.imageset/Slice 91@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Contents.json index 87408f5..eead1e1 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 2401.png", + "filename" : "Slice 89@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 2400.png", + "filename" : "Slice 89@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2400.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2400.png deleted file mode 100644 index 407a752..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2400.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2401.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2401.png deleted file mode 100644 index a303e99..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Group 2401.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@2x.png new file mode 100644 index 0000000..cfc6f51 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@3x.png new file mode 100644 index 0000000..ca2b20b Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_chat.imageset/Slice 89@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Contents.json index faccd17..a19a549 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Contents.json @@ -5,12 +5,10 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-1 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-1.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png deleted file mode 100644 index ef717a2..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png deleted file mode 100644 index 1b78a63..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Contents.json index 3cd4574..88a7c54 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-2 1.png", + "filename" : "Slice 92@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-2.png", + "filename" : "Slice 92@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png deleted file mode 100644 index d16c6b6..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png deleted file mode 100644 index fba1eec..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@2x.png new file mode 100644 index 0000000..278684c Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@3x.png new file mode 100644 index 0000000..d58a818 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_dialogTranslate.imageset/Slice 92@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Contents.json index 12b1907..0f813a1 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2256.png", + "filename" : "Slice 90@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255.png", + "filename" : "Slice 90@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2255.png b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2255.png deleted file mode 100644 index 2eacb70..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2255.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2256.png b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2256.png deleted file mode 100644 index 708df37..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Frame 2256.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@2x.png new file mode 100644 index 0000000..ae20a2e Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@3x.png new file mode 100644 index 0000000..0ba0be8 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_fileRecord.imageset/Slice 90@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Contents.json new file mode 100644 index 0000000..552b39e --- /dev/null +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Slice 94@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Slice 94@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@2x.png new file mode 100644 index 0000000..cc835ad Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@3x.png new file mode 100644 index 0000000..de46b5b Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_history.imageset/Slice 94@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Contents.json index 31a4f66..435d500 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-3 1.png", + "filename" : "Slice 93@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-3.png", + "filename" : "Slice 93@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png deleted file mode 100644 index 663451c..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png deleted file mode 100644 index 7c8d93c..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@2x.png new file mode 100644 index 0000000..c21f709 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@3x.png new file mode 100644 index 0000000..18cd37c Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_recordTranslate.imageset/Slice 93@3x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Contents.json index 3b267a7..552b39e 100644 --- a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-4 1.png", + "filename" : "Slice 94@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-4.png", + "filename" : "Slice 94@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png deleted file mode 100644 index 402036a..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png deleted file mode 100644 index 8ba3bed..0000000 Binary files a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png and /dev/null differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@2x.png new file mode 100644 index 0000000..80d8bd8 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@2x.png differ diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@3x.png new file mode 100644 index 0000000..dbc59f1 Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_textTranslate.imageset/Slice 94@3x.png differ