palyboy UI调整

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/VC/AiFunctionVC.swift b/ShenYin/ShenYin/Sdk/DcSdk/VC/AiFunctionVC.swift
index 258d5c2..df4e4bf 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/VC/AiFunctionVC.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/VC/AiFunctionVC.swift
@@ -96,6 +96,7 @@ class AiFunctionVC:BaseVC{
 }
 
 fileprivate class AiFunctionHeadView: BaseView {
+    let connetedView = UIImageView(image: UIImage(named: "device_conneted_bg"))
     let icon = CurrentDeviceView()
     let bottonView = UIView()
     let tipsIcon = UIImageView()
@@ -106,20 +107,26 @@ fileprivate class AiFunctionHeadView: BaseView {
         didSet{
             if enable {
                 self.alpha = 1
+                connetedView.isHidden = false
             }
             else{
                 self.alpha = 0.5
+                connetedView.isHidden = true
             }
         }
     }
     
     override func setupViews() {
         addSubviews([icon,bottonView])
+        icon.addSubviews([connetedView])
         bottonView.addSubviews([titleLabel,valueLabel,tipsIcon,arrowIcon])
         //        backgroundColor = .blue
         icon.do { v in
             //            v.backgroundColor = .lightGray
         }
+        connetedView.do { v in
+            v.isHidden = true
+        }
         bottonView.do { v in
             v.backgroundColor = .color(.cellBg)
             v.yc.setCornerRadius(8)
@@ -168,7 +175,9 @@ fileprivate class AiFunctionHeadView: BaseView {
             make.right.equalToSuperview().inset(16)
             make.centerY.equalToSuperview()
         }
-        
+        connetedView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
     }
 }
 fileprivate class AiFunctionView: BaseView {

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
index 2aa0043..d240c47 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/VC/DcStereoCallVC.swift
@@ -68,13 +68,13 @@ class DcStereoCallVC:BaseVC{
             v.backgroundColor = .color(.separateLine)
         }
         selfLabel.do { v in
-            v.label.text = "你："
+            v.label.text = "你" + "："
             v.label.textColor = .hexString("#B9B9B9")
             v.dot.backgroundColor = v.label.textColor
             //            v.backgroundColor = .red
         }
         otherLabel.do { v in
-            v.label.text = "对方："
+            v.label.text = "对方" + "："
             v.label.textColor = .color(.theme)
             v.dot.backgroundColor = v.label.textColor
             //            v.backgroundColor = .red
@@ -229,7 +229,7 @@ extension DcStereoCallVC:FieldRecordBarDelegate{
         model.name = fileName
         model.path = wavPath
         model.duration = YLToos.getDuration(model.path)
-        model.origin = "你：".l10n + "\n" + selfTextView.text + "\n\n" + "对方：".l10n + "\n" + otherTextView.text
+        model.origin = "你".l10n + "：" + "\n" + selfTextView.text + "\n\n" + "对方".l10n + "：" + "\n" + otherTextView.text
         model.translate = ""
         App.shared.popPage(animated: false)
         App.shared.goToPage(RecordDetailVC(record: model))

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
index 7950009..886600f 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
@@ -68,13 +68,13 @@ class JoyStereoCallVC:BaseVC{
             v.backgroundColor = .color(.separateLine)
         }
         selfLabel.do { v in
-            v.label.text = "你："
+            v.label.text = "你" + "："
             v.label.textColor = .hexString("#B9B9B9")
             v.dot.backgroundColor = v.label.textColor
 //            v.backgroundColor = .red
         }
         otherLabel.do { v in
-            v.label.text = "对方："
+            v.label.text = "对方" + "："
             v.label.textColor = .color(.theme)
             v.dot.backgroundColor = v.label.textColor
 //            v.backgroundColor = .red
@@ -236,7 +236,7 @@ extension JoyStereoCallVC:FieldRecordBarDelegate{
         model.name = fileName
         model.path = wavPath
         model.duration = YLToos.getDuration(model.path)
-        model.origin = "你：".l10n + "\n" + selfTextView.text + "\n\n" + "对方：".l10n + "\n" + otherTextView.text
+        model.origin = "你：".l10n + "\n" + selfTextView.text + "\n\n" + "对方".l10n + "：" + "\n" + otherTextView.text
         model.translate = ""
         App.shared.popPage(animated: false)
         App.shared.goToPage(RecordDetailVC(record: model))

diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/CloudRecordVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/CloudRecordVC.swift
index be972b5..6125c74 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/CloudRecordVC.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/CloudRecordVC.swift
@@ -118,7 +118,7 @@ class CloudRecordVC: BaseVC{
         v.contentTop = top
         v.show()
         v.hidenCallback = {
-            cell.bgView.backgroundColor = .white
+            cell.bgView.backgroundColor = .color(.cellBg)
         }
         v.shareCallback = {
             App.shared.goToPage(RecordShareVC(cloudList: [model]))

diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
index e855382..49960c4 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/VC/HistoryRecordVC.swift
@@ -102,7 +102,7 @@ class HistoryRecordVC: BaseVC{
         v.contentTop = top
         v.show()
         v.hidenCallback = {
-            cell.bgView.backgroundColor = .white
+            cell.bgView.backgroundColor = .color(.cellBg)
         }
         v.shareCallback = {
             App.shared.goToPage(RecordShareVC(localList: [model]))
@@ -140,7 +140,7 @@ class HistoryRecordVC: BaseVC{
         }
     }
     func deleteAction(_ model:RecordDetailModel){
-        CustomAlert.showWith(title: "您要删除这条录音吗?".l10n, messgage: "删除后，此记录将无法恢复。".l10n, cancelCallback: {}) {[weak self] in
+        CustomAlert.showWith(title: "您要删除这条录音吗?".l10n, messgage: "删除后，此记录将无法恢复".l10n, cancelCallback: {}) {[weak self] in
             guard let self = self else{return}
             list.removeAll(where: {$0 === model})
             RecordCache.shared.remove(model)

diff --git a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
index d6434c8..8cc27a1 100644 (file)
--- a/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
+++ b/ShenYin/ShenYin/UI/common/pop/RecordTipsView.swift
@@ -73,7 +73,7 @@ enum RecordTipsType:Int{
             case .chinese2english:
                 return "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy戴一只耳机讲英文，双方耳机播报中文翻译".l10n
             case .tongchuan:
-                return "- æ\83\85æ\99¯ç¤ºä¾\8b -\nå¼ å¼ é\9d è¿\91æ\89\8bæ\9cºè®²ä¸­æ\96\87ï¼\8cå°\8få¾\90ç\9c¼é\95\9cæ\92­æ\94¾è\8b±è¯­".l10n
+                return "- æ\83\85æ\99¯ç¤ºä¾\8b -\nå°\8få¼ å¯¹ç\9d\80æ\89\8bæ\9cºè®²è\8b±è¯­ï¼\8cå°\8få¾\90ç\9c¼é\95\9c中æ\92­æ\94¾ä¸­æ\96\87".l10n
             }
         }
     }

diff --git a/ShenYin/ShenYin/lan/chinese.swift b/ShenYin/ShenYin/lan/chinese.swift
index 12ffad4..9625f10 100644 (file)
--- a/ShenYin/ShenYin/lan/chinese.swift
+++ b/ShenYin/ShenYin/lan/chinese.swift
@@ -17,6 +17,7 @@ let chineseMap:[String:String] =
     "已连接" : "",
     "未连接" : "",
     "添加新设备":"",
+    "搜索":"",
     
     "现场录音" : "",
     "随时随地，一键开录" : "",
@@ -40,12 +41,15 @@ let chineseMap:[String:String] =
     "对话模式使用介绍" : "",
     "中英互译模式使用介绍" : "",
     "一方手持手机，一方戴上耳机，对手机发言时,耳机播放译文，对耳机发言时，手机播放译文" : "",
+    "一方手持手机，一方戴上眼镜，对手机发言时,眼镜播放译文，对眼镜发言时，手机播放译文":"",
     "手机靠近音源，两人各佩戴一只耳机，双方耳机中播放目标语言" : "",
     "手机靠近音源收音，佩戴耳机收听译文" : "",
+    "手机靠近音源收音，佩戴眼镜收听译文":"",
     "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语" : "",
     "- 情景示例 -\n张张靠近手机讲中文，对方眼镜播放英语":"",
     "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy戴一只耳机讲英文，双方耳机播报中文翻译" : "",
     "- 情景示例 -\nLisa对着手机讲英语，小徐耳机中播放中文" : "",
+    "- 情景示例 -\n小张对着手机讲英语，小徐眼镜中播放中文":"",
     "开始体验" : "",
     "下次不再提示":"",
     "当前正在录音，确定放弃当前录音吗":"",
@@ -81,7 +85,7 @@ let chineseMap:[String:String] =
     "斯瓦希里文":"",
     "土耳其文":"",
 
-    
+    "暂停":"",
     "保存录音" : "",
     "原文" : "",
     "译文" : "",

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Contents.json
new file mode 100644 (file)
index 0000000..12b0e19
--- /dev/null
+++ b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Slice 88@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Slice 88@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@2x.png
new file mode 100644 (file)
index 0000000..aa518b4
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@2x.png differ

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@3x.png
new file mode 100644 (file)
index 0000000..f67def8
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/home/device_conneted_bg.imageset/Slice 88@3x.png differ