From: liangzhenying <867174124@qq.com>
Date: Thu, 8 Jan 2026 10:07:15 +0000 (+0800)
Subject: 眼镜完善UI
X-Git-Tag: mix-v1.0~20
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a2c8203d70b5443924d5855b7d6975f9e5dd788f;p=mirrors%2FShenYin.git

眼镜完善UI
---

diff --git a/ShenYin/ShenYin/Api/LogManager.swift b/ShenYin/ShenYin/Api/LogManager.swift
index 8735333..f61e054 100644
--- a/ShenYin/ShenYin/Api/LogManager.swift
+++ b/ShenYin/ShenYin/Api/LogManager.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /// 日记管理
 class Logger {
-    static var isDebug: Bool = true
+    static var isDebug: Bool = false
     
     fileprivate static let shared = Logger()
     private var fileHandle:FileHandle?
diff --git a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
index b540769..2aa0043 100644
--- a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
@@ -65,7 +65,7 @@ class DcStereoCallVC:BaseVC{
             //            v.backgroundColor = .yellow
         }
         line.do { v in
-            v.backgroundColor = .hexString("#E9E9E9")
+            v.backgroundColor = .color(.separateLine)
         }
         selfLabel.do { v in
             v.label.text = "你："
diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
index 1096b54..2679fc3 100644
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
@@ -65,7 +65,7 @@ class JoyStereoCallVC:BaseVC{
 //            v.backgroundColor = .yellow
         }
         line.do { v in
-            v.backgroundColor = .hexString("#E9E9E9")
+            v.backgroundColor = .color(.separateLine)
         }
         selfLabel.do { v in
             v.label.text = "你："
diff --git a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift
index 9e9fd95..115a63f 100644
--- a/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift
+++ b/ShenYin/ShenYin/UI/Home/Device/HomeDeviceVC.swift
@@ -10,7 +10,6 @@ import UIKit
 class HomeDeviceVC:BaseVC{
     private var collectionView:UICollectionView!
     let imgView = UIImageView()
-    let edtLabel = UILabel()
     var currentBg:BackgroundModel?
     
     override func viewDidLoad() {
@@ -23,11 +22,12 @@ class HomeDeviceVC:BaseVC{
     }
     
     override func setupViews() {
+        
         navBar.do { v in
             v.leftView.isHidden = true
             v.rightView.isHidden = false
-            v.rightView.setImage(UIImage(named: "add_icon"), for: .normal)
             v.backgroundColor = .clear
+            v.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
         }
 
         let layout = UICollectionViewFlowLayout()
@@ -35,7 +35,7 @@ class HomeDeviceVC:BaseVC{
         layout.minimumLineSpacing = 18
         layout.itemSize = CGSize(width: (kScreenWid-54)/2, height: 128)
         collectionView = UICollectionView(frame: CGRect.zero, collectionViewLayout: layout)
-        view.addSubviews([imgView,collectionView,edtLabel])
+        view.addSubviews([imgView,collectionView])
         self.view.bringSubviewToFront(navBar)
         
         collectionView.do { (v) in
@@ -50,20 +50,12 @@ class HomeDeviceVC:BaseVC{
         imgView.do { v in
 //            v.backgroundColor = .red
         }
-        edtLabel.do { v in
-            v.text = "设置壁纸".l10n
-            v.font = .regular(12)
-            v.backgroundColor = .hexString("#FAFAFA")
-            v.textColor = .hexString("#4E4E4E")
-            v.textAlignment = .center
-            v.yc.setCornerRadius(13)
-            v.yc.addTap(target: self, action: #selector(editAction))
-        }
-        
+
         currentBg = BackgroundCache.get()
         if (currentBg != nil) {
             imgView.kf.setImage(with: currentBg?.bgPath.yc.asUrl)
-            navBar.rightView.setImage(UIImage(named: "add_icon")?.tinted(with: UIColor.hexString(currentBg!.themeColor)), for: .normal)
+            navBar.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
+
         }
         else{
             imgView.image = UIImage(named: "home_bg")
@@ -77,12 +69,6 @@ class HomeDeviceVC:BaseVC{
         imgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
-        edtLabel.snp.makeConstraints { make in
-            make.width.equalTo(120)
-            make.height.equalTo(26)
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().inset(120)
-        }
     }
      func reloadData() {
         DeviceVM.shared.refresh {[weak self] result in
@@ -107,11 +93,8 @@ class HomeDeviceVC:BaseVC{
             self?.collectionView.reloadData()
         }
     }
-    override func navRightViewTapped() {
+    @objc func addAction() {
         App.shared.goToPage(BleScanVC())
-//        App.shared.goToPage(CalendarPickerVC())
-//        CCBleManager.shared.checkSettingsConnected()
-//        ChatCache.shared.LargeDateDemoSave()
     }
     @objc func editAction(){
         let vc = BackgroundVC()
@@ -122,7 +105,7 @@ class HomeDeviceVC:BaseVC{
             currentBg = model
             self.imgView.kf.setImage(with: model.bgPath.yc.asUrl)
             self.collectionView.reloadData()
-            navBar.rightView.setImage(UIImage(named: "add_icon")?.tinted(with: UIColor.hexString(currentBg!.themeColor)), for: .normal)
+            navBar.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
         }
         App.shared.goToPage(vc)
     }
diff --git a/ShenYin/ShenYin/UI/Home/Dialog/DialogSplitView.swift b/ShenYin/ShenYin/UI/Home/Dialog/DialogSplitView.swift
index d9c7acd..1a49f19 100644
--- a/ShenYin/ShenYin/UI/Home/Dialog/DialogSplitView.swift
+++ b/ShenYin/ShenYin/UI/Home/Dialog/DialogSplitView.swift
@@ -53,7 +53,7 @@ class DialogSplitView: BaseView {
             v.separatorStyle = .none
             v.register(DialogSplitCell.self, forCellReuseIdentifier: DialogSplitCell.reuseID)
         }
-        line.backgroundColor = .hexString("#E9E9E9")
+        line.backgroundColor = .color(.separateLine)
     }
     override func setupLayout() {
         tableView1.snp.makeConstraints { make in
@@ -120,7 +120,7 @@ class DialogSplitCell:BaseTableViewCell{
         
         bgView.do { v in
             v.yc.setCornerRadius(12)
-            v.backgroundColor = .white
+            v.backgroundColor = .color(.cellBg)
         }
         originalLabel.do { v in
             v.font = .regular(14)
@@ -176,7 +176,7 @@ class DialogSplitCell:BaseTableViewCell{
                     make.top.bottom.equalToSuperview().inset(10)
                     make.left.equalToSuperview().inset(18)
                 }
-                bgView.backgroundColor = .white
+                bgView.backgroundColor =  .color(.cellBg)
                 originalLabel.textColor = .color(.first)
             }
         }
@@ -196,7 +196,7 @@ class DialogSplitCell:BaseTableViewCell{
                     make.top.bottom.equalToSuperview().inset(10)
                     make.left.equalToSuperview().inset(18)
                 }
-                bgView.backgroundColor = .white
+                bgView.backgroundColor =  .color(.cellBg)
                 originalLabel.textColor = .color(.first)
             }
         }
diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/HistoryBottonView.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/HistoryBottonView.swift
deleted file mode 100644
index 8ea92b3..0000000
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/HistoryBottonView.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  HistoryBottonView.swift
-//  ShenYin
-//
-//  Created by liangshi on 2025/8/12.
-//
-
-class HistoryBottonView: BaseView {
-    let titleLabel = UILabel()
-    var type = ModeEffectsType.pop{
-        didSet{
-            titleLabel.text = type.title
-        }
-    }
-    
-    override func setupViews() {
-        addSubviews([titleLabel])
-        titleLabel.do { (v) in
-            v.textColor = .color(.secondary)
-            v.font = .regular(14)
-            v.numberOfLines = 0
-            
-            let attachment = NSTextAttachment()
-            attachment.image = UIImage(named: "tips_icon2")
-            attachment.bounds = CGRect(x: 0, y: 0, width: 12, height: 12)
-            let attachmentString = NSAttributedString(attachment: attachment)
-            
-            let text = " 由于录音文件存储在手机本地,因此软件卸载后,您的录音数据将全部丢失。耳机内置存储的录音文件可以通过APP下载到手机中,并支持备注和重命名等操作。".l10n
-            let textString = NSAttributedString(string: text)
-            
-            let mutableAttributedString = NSMutableAttributedString()
-            mutableAttributedString.append(attachmentString)
-            mutableAttributedString.append(textString)
-            v.attributedText = mutableAttributedString
-        }
-    }
-    
-    override func setupLayout() {
-        titleLabel.snp.makeConstraints { make in
-            make.left.right.equalToSuperview().inset(18)
-            make.top.equalToSuperview().inset(20)
-            make.bottom.equalToSuperview().inset(33)
-        }
-    }
-}
diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/RecordSearchBar.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/RecordSearchBar.swift
index 9f7941c..d9b7049 100644
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/RecordSearchBar.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/RecordSearchBar.swift
@@ -40,7 +40,7 @@ class RecordSearchBar:BaseView{
         
         bgView.do { v in
             v.yc.setCornerRadius(8)
-            v.backgroundColor = .white
+            v.backgroundColor = .color(.cellBg)
         }
         
         textField.do { v in
@@ -52,6 +52,7 @@ class RecordSearchBar:BaseView{
             v.addTarget(self, action: #selector(textFieldDidChange(_:)), for: .editingChanged)
         }
         
+        
         addSubviews([bgView,cancelBtn])
         bgView.addSubviews([icon,textField,calendarBtn])
     }
diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
index aa521cd..e855382 100644
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
@@ -25,7 +25,6 @@ class HistoryRecordVC: BaseVC{
         navBar.do { v in
             v.title = "历史记录".l10n
             let items = [NavigationRightItem(image: UIImage(named: "filter"),target: self, action: #selector(filterAction)),NavigationRightItem(image: UIImage(named: "search"), target: self,action: #selector(searchAction))]
-//            let items = [NavigationRightItem(image: UIImage(named: "filter"),target: self, action: #selector(filterAction))]
             v.setupRightViews(items)
         }
         
diff --git a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
index 8b1369a..13a68e2 100644
--- a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
+++ b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
@@ -122,7 +122,7 @@ class BleScanHeaderView: BaseView {
         rippleView.startAnimating()
         
         radarImageView.do { v in
-            v.image = UIImage(named: "device_logo")
+//            v.image = UIImage(named: "device_logo")
 //            v.backgroundColor = .lightGray
 //            
 //            let animation = CABasicAnimation.init(keyPath: "transform.rotation.z")
diff --git a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift
index 2b4f2fc..b0a7722 100644
--- a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift
+++ b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift
@@ -14,7 +14,7 @@ enum ForgetVCType{
 
 class ForgetVC:BaseVC{
     
-    let tipsLabel = UILabel()
+    let logoImg = UIImageView(image: UIImage(named: "logo_3"))
     let bgView = UIView()
     let titleLabel = UILabel()
     let phoneView = CustomInputView()
@@ -36,19 +36,7 @@ class ForgetVC:BaseVC{
     override func setupViews(){
         self.navBar.title = ""
         view.backgroundColor = .color(.bgColor)
-        tipsLabel.do { v in
-            v.numberOfLines = 0
-            v.font = .medium(22)
-            v.textColor = .color(.first)
-            let text = "您好， \n欢迎使用DeepChords".l10n
-            let stype = NSMutableParagraphStyle()
-            stype.lineSpacing = 10
-            let attrString = NSMutableAttributedString(string: text)
-            let attr: [NSAttributedString.Key : Any] = [.font: UIFont.medium(22),.paragraphStyle:stype]
-            attrString.addAttributes(attr, range: NSRange(location: 0, length: attrString.length))
-            v.attributedText = attrString
-        }
-        
+
         bgView.do { v in
             v.backgroundColor = .color(.bgColor)
             v.yc.setCorners(withRoundedRect: CGRect(x: 0, y: 0, width: kScreenWid, height: kScreenHei - 244), roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 50, height: 50))
@@ -70,13 +58,14 @@ class ForgetVC:BaseVC{
         }
         loginBtn.set(title: "确认".l10n,style: .theme1, target: self, action: #selector(loginAction))
         agreeView.isHidden = true
-        view.addSubviews([tipsLabel,bgView])
+        view.addSubviews([logoImg,bgView])
         bgView.addSubviews([titleLabel,phoneView,codeView,pwdView,loginBtn,agreeView])
         
     }
     override func setupLayout(){
-        tipsLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().inset(28)
+        logoImg.snp.makeConstraints { make in
+            make.width.equalTo(62)
+            make.height.equalTo(80)
             make.top.equalTo(kNavBtm + 20)
             make.centerX.equalToSuperview()
         }
diff --git a/ShenYin/ShenYin/UI/Login/Controller/LoginVC.swift b/ShenYin/ShenYin/UI/Login/Controller/LoginVC.swift
index 894bab3..0b14ff6 100644
--- a/ShenYin/ShenYin/UI/Login/Controller/LoginVC.swift
+++ b/ShenYin/ShenYin/UI/Login/Controller/LoginVC.swift
@@ -10,7 +10,7 @@ import DeviceKit
 
 class LoginVC:BaseVC{
     
-    let tipsLabel = UILabel()
+    let logoImg = UIImageView(image: UIImage(named: "logo_3"))
     let bgView = UIView()
     let titleLabel = UILabel()
     let phoneView = CustomInputView()
@@ -26,18 +26,6 @@ class LoginVC:BaseVC{
 //        self.navBar.title = ""
         navBar.isHidden = true
         view.backgroundColor = .color(.bgColor)
-        tipsLabel.do { v in
-            v.numberOfLines = 0
-            v.font = .medium(22)
-            v.textColor = .color(.first)
-            let text = "您好， \n欢迎使用DeepChords".l10n
-            let stype = NSMutableParagraphStyle()
-            stype.lineSpacing = 10
-            let attrString = NSMutableAttributedString(string: text)
-            let attr: [NSAttributedString.Key : Any] = [.font: UIFont.medium(22),.paragraphStyle:stype]
-            attrString.addAttributes(attr, range: NSRange(location: 0, length: attrString.length))
-            v.attributedText = attrString
-        }
         
         bgView.do { v in
             v.backgroundColor = .color(.bgColor)
@@ -59,13 +47,14 @@ class LoginVC:BaseVC{
         }
         
         loginBtn.set(title: "登录".l10n,style: .theme1, target: self, action: #selector(loginAction))
-        view.addSubviews([tipsLabel,bgView])
+        view.addSubviews([logoImg,bgView])
         bgView.addSubviews([titleLabel,phoneView,pwdView,loginBtn,agreeView,othersView])
         
     }
     override func setupLayout(){
-        tipsLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().inset(28)
+        logoImg.snp.makeConstraints { make in
+            make.width.equalTo(62)
+            make.height.equalTo(80)
             make.top.equalTo(kNavBtm + 20)
             make.centerX.equalToSuperview()
         }
diff --git a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift
index 4778d66..d4030ce 100644
--- a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift
+++ b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift
@@ -10,7 +10,7 @@ import DeviceKit
 
 class RegisterVC:BaseVC{
     
-    let tipsLabel = UILabel()
+    let logoImg = UIImageView(image: UIImage(named: "logo_3"))
     let bgView = UIView()
     let titleLabel = UILabel()
     let regionView = RegionView()
@@ -27,19 +27,7 @@ class RegisterVC:BaseVC{
         //        self.navBar.title = ""
         //        navBar.isHidden = true
         view.backgroundColor = .color(.bgColor)
-        tipsLabel.do { v in
-            v.numberOfLines = 0
-            v.font = .medium(22)
-            v.textColor = .color(.first)
-            let text = "您好， \n欢迎使用DeepChords".l10n
-            let stype = NSMutableParagraphStyle()
-            stype.lineSpacing = 10
-            let attrString = NSMutableAttributedString(string: text)
-            let attr: [NSAttributedString.Key : Any] = [.font: UIFont.medium(22),.paragraphStyle:stype]
-            attrString.addAttributes(attr, range: NSRange(location: 0, length: attrString.length))
-            v.attributedText = attrString
-        }
-        
+
         bgView.do { v in
             v.backgroundColor = .color(.bgColor)
             v.yc.setCorners(withRoundedRect: CGRect(x: 0, y: 0, width: kScreenWid, height: kScreenHei - 244), roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 50, height: 50))
@@ -65,13 +53,14 @@ class RegisterVC:BaseVC{
 //            v.textField.text = "19276672101"
         }
         registerBtn.set(title: "注册".l10n,style: .theme1, target: self, action: #selector(registerAction))
-        view.addSubviews([tipsLabel,bgView])
+        view.addSubviews([logoImg,bgView])
         bgView.addSubviews([titleLabel,regionView,phoneView,codeView,pwdView,registerBtn,agreeView])
         
     }
     override func setupLayout(){
-        tipsLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().inset(28)
+        logoImg.snp.makeConstraints { make in
+            make.width.equalTo(62)
+            make.height.equalTo(80)
             make.top.equalTo(kNavBtm + 20)
             make.centerX.equalToSuperview()
         }
diff --git a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift
index fda3548..439e876 100644
--- a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift
+++ b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift
@@ -10,7 +10,7 @@ import DeviceKit
 
 class SmsLoginVC:BaseVC{
     
-    let tipsLabel = UILabel()
+    let logoImg = UIImageView(image: UIImage(named: "logo_3"))
     let bgView = UIView()
     let titleLabel = UILabel()
     let regionView = RegionView()
@@ -25,18 +25,6 @@ class SmsLoginVC:BaseVC{
     }
     override func setupViews(){
         view.backgroundColor = .color(.bgColor)
-        tipsLabel.do { v in
-            v.numberOfLines = 0
-            v.font = .medium(22)
-            v.textColor = .color(.first)
-            let text = "您好， \n欢迎使用DeepChords".l10n
-            let stype = NSMutableParagraphStyle()
-            stype.lineSpacing = 10
-            let attrString = NSMutableAttributedString(string: text)
-            let attr: [NSAttributedString.Key : Any] = [.font: UIFont.medium(22),.paragraphStyle:stype]
-            attrString.addAttributes(attr, range: NSRange(location: 0, length: attrString.length))
-            v.attributedText = attrString
-        }
         
         bgView.do { v in
             v.backgroundColor = .color(.bgColor)
@@ -64,13 +52,14 @@ class SmsLoginVC:BaseVC{
         }
         loginBtn.set(title: "登录".l10n,style: .theme1, target: self, action: #selector(loginAction))
         pwdBtn.set(title: "密码登录".l10n, style: .theme2,target: self, action: #selector(pwdAction))
-        view.addSubviews([tipsLabel,bgView])
+        view.addSubviews([logoImg,bgView])
         bgView.addSubviews([titleLabel,regionView,phoneView,codeView,loginBtn,pwdBtn,agreeView])
         
     }
     override func setupLayout(){
-        tipsLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().inset(28)
+        logoImg.snp.makeConstraints { make in
+            make.width.equalTo(62)
+            make.height.equalTo(80)
             make.top.equalTo(kNavBtm + 20)
             make.centerX.equalToSuperview()
         }
diff --git a/ShenYin/ShenYin/UI/Mine/Device/DeviceInfoVC.swift b/ShenYin/ShenYin/UI/Mine/Device/DeviceInfoVC.swift
index ab5af1f..dc92434 100644
--- a/ShenYin/ShenYin/UI/Mine/Device/DeviceInfoVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/Device/DeviceInfoVC.swift
@@ -115,7 +115,7 @@ fileprivate class MyDeviceInfoCell: BaseTableViewCell {
             v.backgroundColor = .color(.cellBg)
         }
         titleLabel.do { (v) in
-            v.textColor = .rgb(0x21212)
+            v.textColor = .color(.first)
             v.font = .bold(14)
             v.textAlignment = .left
         }
diff --git a/ShenYin/ShenYin/UI/Mine/Device/MyDeviceListVC.swift b/ShenYin/ShenYin/UI/Mine/Device/MyDeviceListVC.swift
index dd5bac0..76f0b9d 100644
--- a/ShenYin/ShenYin/UI/Mine/Device/MyDeviceListVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/Device/MyDeviceListVC.swift
@@ -8,7 +8,6 @@
 import UIKit
 class MyDeviceListVC: BaseVC{
     let tableView = UITableView(frame: .zero, style: .plain)
-    let bottomView = HistoryBottonView()
     
     override func viewDidLoad() {
         super.viewDidLoad()
diff --git a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift
index f464e20..e435967 100644
--- a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift
@@ -23,17 +23,20 @@ class UpdateVC:BaseVC{
             v.text = "当前版本".l10n
             v.textAlignment = .center
             v.font = .regular(16)
-            v.textColor = .hexString("#232323")
+            v.textColor = .color(.first)
             v.numberOfLines = 0
         }
         btn.do { v in
             v.setTitle("检查更新".l10n, for: .normal)
             v.titleLabel?.font = .bold(14)
-            v.setTitleColor(.color(.theme), for: .normal)
+            v.setTitleColor(.black, for: .normal)
             v.addTarget(self, action: #selector(tapAction), for: .touchUpInside)
             v.backgroundColor = .hexString("#EDEDED")
             v.yc.setCornerRadius(12)
         }
+        icon.do { v in
+            v.contentMode = .center
+        }
     }
     override func setupLayout() {
         icon.snp.makeConstraints { make in
diff --git a/ShenYin/ShenYin/UI/Mode/FindVC.swift b/ShenYin/ShenYin/UI/Mode/FindVC.swift
index f1de807..6899ec8 100644
--- a/ShenYin/ShenYin/UI/Mode/FindVC.swift
+++ b/ShenYin/ShenYin/UI/Mode/FindVC.swift
@@ -25,7 +25,7 @@ class FindVC:BaseVC{
     }
     
     override func setupViews() {
-        self.navBar.title = "查找耳机".l10n
+        self.navBar.title = "查找眼镜".l10n
         navBar.backgroundColor = .clear
         view.backgroundColor = .color(.bgColor)
         view.addSubviews([titleLabel,desLabel,leftRadar,rightRadar,leftBtn,rightBtn])
diff --git a/ShenYin/ShenYin/UI/Mode/ModeFindView.swift b/ShenYin/ShenYin/UI/Mode/ModeFindView.swift
index 508b54d..2984c22 100644
--- a/ShenYin/ShenYin/UI/Mode/ModeFindView.swift
+++ b/ShenYin/ShenYin/UI/Mode/ModeFindView.swift
@@ -18,7 +18,7 @@ class ModeFindView: BaseView {
         
         icon.image = UIImage(named: "find_icon")
         titleLabel.do { v in
-            v.text = "查找耳机".l10n
+            v.text = "查找眼镜".l10n
             v.font = .bold(16)
             v.textColor = .color(.first)
             
diff --git a/ShenYin/ShenYin/UI/common/CustomButton.swift b/ShenYin/ShenYin/UI/common/CustomButton.swift
index 131ab1e..408ddbe 100644
--- a/ShenYin/ShenYin/UI/common/CustomButton.swift
+++ b/ShenYin/ShenYin/UI/common/CustomButton.swift
@@ -34,8 +34,8 @@ class CustomButton: UIButton {
             titleLabel?.font = .bold(14)
         }
         else if style == .theme3 {
-            setTitleColor(.color(.theme), for: .normal)
-            backgroundColor =  UIColor.white
+            setTitleColor(.color(.secondary), for: .normal)
+            backgroundColor =  .color(.cellBg)
             titleLabel?.font = .regular(14)
         }
         else{
diff --git a/ShenYin/ShenYin/UI/common/pop/ConnectPopView.swift b/ShenYin/ShenYin/UI/common/pop/ConnectPopView.swift
index b5978c6..ca4f74b 100644
--- a/ShenYin/ShenYin/UI/common/pop/ConnectPopView.swift
+++ b/ShenYin/ShenYin/UI/common/pop/ConnectPopView.swift
@@ -73,7 +73,7 @@ class ConnectPopView: BasePresentView2 {
     override func setupStyle() {
         super.setupStyle()
         contentView.do { (v) in
-            v.backgroundColor = .white
+            v.backgroundColor = .color(.cellBg)
             v.yc.setCornerRadius(20)
         }
         imageView.do { v in
diff --git a/ShenYin/ShenYin/UI/common/pop/PopMenu.swift b/ShenYin/ShenYin/UI/common/pop/PopMenu.swift
index 3845a09..212bcac 100644
--- a/ShenYin/ShenYin/UI/common/pop/PopMenu.swift
+++ b/ShenYin/ShenYin/UI/common/pop/PopMenu.swift
@@ -49,7 +49,7 @@ class PopMenu: BasePresentView2 {
     override func setupLayout() {
         super.setupLayout()
         contentView.do { (v) in
-            v.backgroundColor = .white
+            v.backgroundColor = .color(.cellBg)
             v.yc.setCornerRadius(20)
         }
         fontItem.snp.makeConstraints { make in
@@ -104,7 +104,7 @@ fileprivate class MenuItem: BaseView {
         addSubviews([label,icon])
         label.do { v in
             v.font = .regular(14)
-            v.textColor = .hexString("#232323")
+            v.textColor = .color(.first)
             
         }
         icon.do { v in
diff --git a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
index 9aa7e83..91981eb 100644
--- a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
+++ b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
@@ -34,23 +34,47 @@ enum RecordTipsType:Int{
         }
     }
     var des1:String{
-        switch self {
-        case .dialog:
-            return "一方手持手机，一方戴上耳机，对手机发言时,耳机播放译文，对耳机发言时，手机播放译文".l10n
-        case .chinese2english:
-            return "手机靠近音源，两人各佩戴一只耳机，双方耳机中播放目标语言".l10n
-        case .tongchuan:
-            return "手机靠近音源收音，佩戴耳机收听译文".l10n
+        if CCDevice.isJoy {
+            switch self {
+            case .dialog:
+                return "一方手持手机，一方戴上耳机，对手机发言时,耳机播放译文，对耳机发言时，手机播放译文".l10n
+            case .chinese2english:
+                return "手机靠近音源，两人各佩戴一只耳机，双方耳机中播放目标语言".l10n
+            case .tongchuan:
+                return "手机靠近音源收音，佩戴耳机收听译文".l10n
+            }
+        }
+        else{
+            switch self {
+            case .dialog:
+                return "一方手持手机，一方戴上眼镜，对手机发言时,眼镜播放译文，对眼镜发言时，手机播放译文".l10n
+            case .chinese2english:
+                return "手机靠近音源，两人各佩戴一只耳机，双方耳机中播放目标语言".l10n
+            case .tongchuan:
+                return "手机靠近音源收音，佩戴眼镜收听译文".l10n
+            }
         }
     }
     var des2:String{
-        switch self {
-        case .dialog:
-            return "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语".l10n
-        case .chinese2english:
-            return "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy戴一只耳机讲英文，双方耳机播报中文翻译".l10n
-        case .tongchuan:
-            return "- 情景示例 -\nLisa对着手机讲英语，小徐耳机中播放中文".l10n
+        if CCDevice.isJoy {
+            switch self {
+            case .dialog:
+                return "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语".l10n
+            case .chinese2english:
+                return "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy戴一只耳机讲英文，双方耳机播报中文翻译".l10n
+            case .tongchuan:
+                return "- 情景示例 -\nLisa对着手机讲英语，小徐耳机中播放中文".l10n
+            }
+        }
+        else{
+            switch self {
+            case .dialog:
+                return "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语".l10n
+            case .chinese2english:
+                return "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy戴一只耳机讲英文，双方耳机播报中文翻译".l10n
+            case .tongchuan:
+                return "- 情景示例 -\n张张靠近手机讲中文，小徐眼镜播放英语".l10n
+            }
         }
     }
 }
@@ -136,9 +160,9 @@ class RecordTipsView: BasePresentView {
     
     override func setupStyle() {
         super.setupStyle()
-        contentView.backgroundColor = .white
+        contentView.backgroundColor = .color(.cellBg)
         scorllView.do { v in
-            v.backgroundColor = .white
+            v.backgroundColor = .clear
         }
         titleLabel.do { (v) in
             v.textColor = .color(.first)
@@ -216,7 +240,7 @@ class RecordTipsView: BasePresentView {
                 v.setImage(UIImage(named: "tip_selected"), for: .selected)
             }
             agreeTitle.do { (v) in
-                v.textColor = .hexString("##999999")
+                v.textColor = .color(.tertiary)
                 v.font = .regular(12)
                 v.textAlignment = .left
                 v.text = "下次不再提示".l10n
diff --git a/ShenYin/ShenYin/lan/chinese.swift b/ShenYin/ShenYin/lan/chinese.swift
index 173e51b..e1e4137 100644
--- a/ShenYin/ShenYin/lan/chinese.swift
+++ b/ShenYin/ShenYin/lan/chinese.swift
@@ -253,5 +253,11 @@ let chineseMap:[String:String] =
     "ä½ ":"",
     "对方":"",
     "我可以帮你搜索、答疑、写作，请把你的任务交给 我吧~":"",
+    
+    "查找眼镜":"",
+    "一方手持手机，一方戴上眼镜，对手机发言时,眼镜播放译文，对眼镜发言时，手机播放译文":"",
+    "手机靠近音源收音，佩戴眼镜收听译文":"",
+    "- 情景示例 -\n张张靠近手机讲中文，小徐眼镜播放英语":"",
+    "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语":"",
 ]
 
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@2x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@2x.png"
index d6c429b..c02330c 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@2x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@2x.png" differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@3x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@3x.png"
index 9999f4f..c51c031 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@3x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/calendar_icon.imageset/\346\227\245\345\216\206_(1)@3x.png" differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@2x.png
index 275aaab..6901c41 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@3x.png
index 752bfa3..e634d23 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_ear.imageset/Group_2437@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@2x.png
index 1fe725e..b976926 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@3x.png
index 62a8eab..09f2e97 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/dialog_device_phone.imageset/Group_2435@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Contents.json
similarity index 77%
rename from ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Contents.json
rename to ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Contents.json
index df1a323..1faec04 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 1255@2x.png",
+      "filename" : "Slice 75@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 1255@3x.png",
+      "filename" : "Slice 75@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@2x.png
new file mode 100644
index 0000000..90e36ee
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@3x.png
new file mode 100644
index 0000000..f6fa0fa
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/home_bg_icon.imageset/Slice 75@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Contents.json
index c98d767..5c4d3b1 100644
--- a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame@2x(2).png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame@3x(2).png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x(2).png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x(2).png
deleted file mode 100644
index f8e63fe..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x(2).png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x.png
new file mode 100644
index 0000000..d049e46
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x(2).png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x(2).png
deleted file mode 100644
index 436718b..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x(2).png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x.png
new file mode 100644
index 0000000..5a72f90
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/language_switch.imageset/Frame@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@2x.png
index abcf38d..7ac8ae6 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@3x.png
index 9c25060..785b373 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/language_switch_gray.imageset/Frame@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@2x.png
index b7ec611..627a67e 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@3x.png
index ae0a706..988187e 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_delete.imageset/Frame 1938@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@2x.png
index 372d948..928d829 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@3x.png
index 5804bde..140b0f9 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_font.imageset/Frame 1938@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Contents.json
index fdf7abb..898c9dd 100644
--- a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame 1987@2x.png",
+      "filename" : "Frame 1938@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame 1987@3x.png",
+      "filename" : "Frame 1938@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@2x.png
new file mode 100644
index 0000000..ea3b5cc
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@3x.png
new file mode 100644
index 0000000..85db68c
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1938@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@2x.png
deleted file mode 100644
index 1994c8b..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@3x.png
deleted file mode 100644
index 78cdeac..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/record_detail_share.imageset/Frame 1987@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@2x.png
index 9c8b926..869e61f 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@2x.png and b/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@3x.png
index d5ecc95..d6c4f94 100644
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@3x.png and b/ShenYin/ShenYin/playboy.xcassets/home/scan_device.imageset/Slice 7@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Contents.json
new file mode 100644
index 0000000..5c4d3b1
--- /dev/null
+++ b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@2x.png
new file mode 100644
index 0000000..cf83bd8
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@3x.png
new file mode 100644
index 0000000..a2399dd
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/search_2.imageset/Frame@3x.png differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@2x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@2x.png"
index e647e2e..74c8edc 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@2x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@2x.png" differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@3x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@3x.png"
index e947155..067cbf3 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@3x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_1.imageset/\345\210\206\345\261\217_2@3x.png" differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@2x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@2x.png"
index 0a43345..3bb3f54 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@2x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@2x.png" differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@3x.png" "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@3x.png"
index 5cbb614..6e3eb50 100644
Binary files "a/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@3x.png" and "b/ShenYin/ShenYin/playboy.xcassets/home/split_screen_2.imageset/\345\210\206\345\261\217_2@3x.png" differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Contents.json
index b5ef55e..fe78bf5 100644
--- a/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "对话翻译@2x.png",
+      "filename" : "Slice 98@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "对话翻译@3x.png",
+      "filename" : "Slice 98@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@2x.png
new file mode 100644
index 0000000..cd39323
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@3x.png
new file mode 100644
index 0000000..2d51821
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/Slice 98@3x.png differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@2x.png" "b/ShenYin/ShenYin/playboy.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/playboy.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/playboy.xcassets/home/tips_dialog.imageset/\345\257\271\350\257\235\347\277\273\350\257\221@3x.png" "b/ShenYin/ShenYin/playboy.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/playboy.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/playboy.xcassets/home/tips_tongchuan.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Contents.json
index b14a288..558d763 100644
--- a/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "同传听译@2x.png",
+      "filename" : "Slice 99@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "同传听译@3x.png",
+      "filename" : "Slice 99@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@2x.png
new file mode 100644
index 0000000..3954516
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@3x.png
new file mode 100644
index 0000000..c3e53cc
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/Slice 99@3x.png differ
diff --git "a/ShenYin/ShenYin/playboy.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@2x.png" "b/ShenYin/ShenYin/playboy.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/playboy.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/playboy.xcassets/home/tips_tongchuan.imageset/\345\220\214\344\274\240\345\220\254\350\257\221@3x.png" "b/ShenYin/ShenYin/playboy.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/playboy.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/playboy.xcassets/logo_3.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Contents.json
new file mode 100644
index 0000000..6302b80
--- /dev/null
+++ b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Slice 69@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Slice 69@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@2x.png b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@2x.png
new file mode 100644
index 0000000..3291246
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@3x.png b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@3x.png
new file mode 100644
index 0000000..6550440
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/logo_3.imageset/Slice 69@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@2x.png b/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@2x.png
deleted file mode 100644
index 955a662..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@3x.png b/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@3x.png
deleted file mode 100644
index b142b7e..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/select_selected.imageset/Group 1255@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Contents.json
index df1a323..007eed1 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 1255@2x.png",
+      "filename" : "Slice 73@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 1255@3x.png",
+      "filename" : "Slice 73@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@2x.png b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@2x.png
deleted file mode 100644
index 955a662..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@3x.png b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@3x.png
deleted file mode 100644
index b142b7e..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Group 1255@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@2x.png b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@2x.png
new file mode 100644
index 0000000..7c735e0
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@3x.png b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@3x.png
new file mode 100644
index 0000000..8f95276
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mine/tip_selected.imageset/Slice 73@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Contents.json
index fa2d8d5..e7a9453 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2440@2x.png",
+      "filename" : "Slice 118@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2440@3x.png",
+      "filename" : "Slice 118@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@2x.png b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@2x.png
deleted file mode 100644
index 2e19cf9..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@3x.png b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@3x.png
deleted file mode 100644
index ae4a26e..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Group_2440@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@2x.png b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@2x.png
new file mode 100644
index 0000000..c89d9f5
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@3x.png b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@3x.png
new file mode 100644
index 0000000..a3b3d1d
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mine/update_icon.imageset/Slice 118@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Contents.json
index d215a52..44d6224 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2302.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2302@2x.png",
+      "filename" : "Slice 108@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2302@3x.png",
+      "filename" : "Slice 108@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302.png
deleted file mode 100644
index 2117bb4..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@2x.png
deleted file mode 100644
index 383788c..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@3x.png
deleted file mode 100644
index 68ad649..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Group_2302@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@2x.png
new file mode 100644
index 0000000..b6aeca6
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@3x.png
new file mode 100644
index 0000000..c965478
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_classic.imageset/Slice 108@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Contents.json
index 8cf83b6..e94f1d8 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2305.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2305@2x.png",
+      "filename" : "Slice 106@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2305@3x.png",
+      "filename" : "Slice 106@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305.png
deleted file mode 100644
index 1a551bb..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@2x.png
deleted file mode 100644
index 110ceb3..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@3x.png
deleted file mode 100644
index da04767..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Group_2305@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@2x.png
new file mode 100644
index 0000000..ed22e4b
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@3x.png
new file mode 100644
index 0000000..c5a6d7b
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_custom.imageset/Slice 106@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Contents.json
index 4dbfa7d..08c7bc1 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2300.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2300@2x.png",
+      "filename" : "Slice 111@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2300@3x.png",
+      "filename" : "Slice 111@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300.png
deleted file mode 100644
index 92c6cc8..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@2x.png
deleted file mode 100644
index de37702..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@3x.png
deleted file mode 100644
index 023a600..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Group_2300@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@2x.png
new file mode 100644
index 0000000..ed5c3ce
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@3x.png
new file mode 100644
index 0000000..db24b70
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_fashion.imageset/Slice 111@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Contents.json
index e998ac1..6b23c00 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2307.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2307@2x.png",
+      "filename" : "Slice 109@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2307@3x.png",
+      "filename" : "Slice 109@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307.png
deleted file mode 100644
index 6f55536..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@2x.png
deleted file mode 100644
index 9ac3ca0..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@3x.png
deleted file mode 100644
index 9815aa5..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Group_2307@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@2x.png
new file mode 100644
index 0000000..34d223b
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@3x.png
new file mode 100644
index 0000000..09b6698
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_jazz.imageset/Slice 109@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Contents.json
index 2d6859b..58c2de6 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2301.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2301@2x.png",
+      "filename" : "Slice 110@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2301@3x.png",
+      "filename" : "Slice 110@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301.png
deleted file mode 100644
index 306dba1..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@2x.png
deleted file mode 100644
index 6dc86c6..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@3x.png
deleted file mode 100644
index fe74fe3..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Group_2301@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@2x.png
new file mode 100644
index 0000000..e5bae9b
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@3x.png
new file mode 100644
index 0000000..ee31f87
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_normal.imageset/Slice 110@3x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Contents.json
index db7b555..a5bec34 100644
--- a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Contents.json
@@ -1,17 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "Group_2304.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group_2304@2x.png",
+      "filename" : "Slice 107@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group_2304@3x.png",
+      "filename" : "Slice 107@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304.png
deleted file mode 100644
index 11533a9..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@2x.png
deleted file mode 100644
index dca2d3a..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@2x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@3x.png
deleted file mode 100644
index 5d6e42b..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Group_2304@3x.png and /dev/null differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@2x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@2x.png
new file mode 100644
index 0000000..d70ac2b
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@2x.png differ
diff --git a/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@3x.png b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@3x.png
new file mode 100644
index 0000000..94a8425
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/mode/mode_rock.imageset/Slice 107@3x.png differ