改了英文UI适配

diff --git a/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift b/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift
index 71b1247..2ae67bc 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift
+++ b/ShenYin/ShenYin/UI/Home/Root/HomeFunctionView.swift
@@ -141,11 +141,15 @@ fileprivate class HomeCell: BaseView {
             v.textColor = .color(.level1)
             v.font = .bold(14)
             v.numberOfLines = 2
+//            v.backgroundColor = .blue
+            v.adjustsFontSizeToFitWidth = true
         }
         valueLabel.do { (v) in
             v.textColor = .rgb(0x8d8d8d)
             v.font = .regular(10)
             v.numberOfLines = 2
+//            v.backgroundColor = .red
+            v.adjustsFontSizeToFitWidth = true
         }
         arrowIcon.image = UIImage(named: "arrow_2")
         yc.addTap(target: self, action: #selector(tapAction))
@@ -165,6 +169,7 @@ fileprivate class HomeCell: BaseView {
             m.top.equalToSuperview().inset(60)
             m.left.equalToSuperview().offset(15)
             m.right.lessThanOrEqualTo(arrowIcon.snp.left)
+            m.height.equalTo(30)
         }
         valueLabel.snp.makeConstraints { (m) in
             m.top.equalToSuperview().inset(90)

diff --git a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
index 11ff449..a9c40f7 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
+++ b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift
@@ -212,7 +212,7 @@ class ScanStateCell: BaseTableViewCell {
         }
         desLabel.snp.makeConstraints { make in
             make.top.equalTo(titleLabel.snp.bottom).offset(10)
-            make.centerX.equalToSuperview()
+            make.left.right.equalToSuperview().inset(20)
         }
     }
     

diff --git a/ShenYin/ShenYin/UI/Home/SubTitle/SubTitleSetVC.swift b/ShenYin/ShenYin/UI/Home/SubTitle/SubTitleSetVC.swift
index 8eaf70d..7c5c581 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/SubTitle/SubTitleSetVC.swift
+++ b/ShenYin/ShenYin/UI/Home/SubTitle/SubTitleSetVC.swift
@@ -126,7 +126,7 @@ extension SubTitleSetVC{
     @objc func fontAction(){
         let cache = SubTitleCache.shared.get()
         let list:[SubTitleFontType] = [.min,.stand,.big]
-        let picker = CustomPicker(title: "字体大小".l10n, list: list.map{$0.title})
+        let picker = CustomPicker(title: "字号大小".l10n, list: list.map{$0.title})
         picker.selectedIndex = list.firstIndex(where: {cache.fontType.title == $0.title})!
         picker.show()
         picker.didSelected = {[weak self] (index,value) in

diff --git a/ShenYin/ShenYin/UI/Mine/MoreSetVC.swift b/ShenYin/ShenYin/UI/Mine/MoreSetVC.swift
index 4868577..fb3d835 100644 (file)
--- a/ShenYin/ShenYin/UI/Mine/MoreSetVC.swift
+++ b/ShenYin/ShenYin/UI/Mine/MoreSetVC.swift
@@ -129,12 +129,14 @@ fileprivate class SwitchCell: BaseView {
             v.font = .bold(14)
             v.textAlignment = .left
             v.text = "录音结束后提示重命名".l10n
+            v.adjustsFontSizeToFitWidth = true
         }
         detailLabel.do { (v) in
             v.textColor = .color(.level2)
             v.font = .regular(10)
             v.textAlignment = .left
             v.text = "关闭后自动命名并保存".l10n
+            v.adjustsFontSizeToFitWidth = true
         }
         iSwitch.do { v in
             v.onTintColor = .color(.theme)
@@ -149,18 +151,22 @@ fileprivate class SwitchCell: BaseView {
             m.top.equalToSuperview()
             m.bottom.equalToSuperview()
         }
+        iSwitch.snp.makeConstraints { (m) in
+            m.right.equalToSuperview()
+            m.centerY.equalToSuperview()
+        }
+        
         titleLabel.snp.makeConstraints { (m) in
             m.top.equalToSuperview().inset(16)
             m.left.equalToSuperview()
+            m.right.equalTo(iSwitch.snp_leftMargin).offset(-10)
         }
         detailLabel.snp.makeConstraints { (m) in
             m.bottom.equalToSuperview().inset(16)
             m.left.equalToSuperview()
+            m.right.equalTo(iSwitch.snp_leftMargin).offset(-10)
         }
-        iSwitch.snp.makeConstraints { (m) in
-            m.right.equalToSuperview()
-            m.centerY.equalToSuperview()
-        }
+
     }
   
     @objc func swicthAction(){

diff --git a/ShenYin/ShenYin/UI/Mode/FindVC.swift b/ShenYin/ShenYin/UI/Mode/FindVC.swift
index 6a2dc64..152b844 100644 (file)
--- a/ShenYin/ShenYin/UI/Mode/FindVC.swift
+++ b/ShenYin/ShenYin/UI/Mode/FindVC.swift
@@ -168,6 +168,7 @@ fileprivate class ButtonItem: BaseView {
         yc.setCornerRadius(12)
         titleLabel.do { v in
             v.font = .regular(14)
+            v.adjustsFontSizeToFitWidth = true
         }
         valueLabel.do { v in
             v.font = .regular(14)
@@ -177,15 +178,17 @@ fileprivate class ButtonItem: BaseView {
     }
     
     override func setupLayout() {
-        titleLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().inset(14)
-            make.centerY.equalToSuperview()
-        }
+
         valueLabel.snp.makeConstraints { make in
             make.size.equalTo(18)
             make.right.equalToSuperview().inset(14)
             make.centerY.equalToSuperview()
         }
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().inset(14)
+            make.right.equalToSuperview().inset(36)
+            make.centerY.equalToSuperview()
+        }
     }
 }
 

diff --git a/ShenYin/ShenYin/lan/TraditionalChinese.swift b/ShenYin/ShenYin/lan/TraditionalChinese.swift
index c4d2596..dfcc953 100644 (file)
--- a/ShenYin/ShenYin/lan/TraditionalChinese.swift
+++ b/ShenYin/ShenYin/lan/TraditionalChinese.swift
@@ -112,7 +112,6 @@ let chineseTraditionalMap:[String:String] =
     "收藏錄音" : "收藏錄音",
     "多選" : "多選",
     "匯出" : "匯出",
-    "雲端儲存空間":"雲端儲存空間",
     "您要刪除這些錄音嗎?" : "您要刪除這些錄音嗎?",
     "刪除後，這些記錄將無法復原。" : "刪除後，這些記錄將無法復原。",
     "刪除後，此記錄將無法復原":"刪除後，此記錄將無法復原",

diff --git a/ShenYin/ShenYin/lan/chinese.swift b/ShenYin/ShenYin/lan/chinese.swift
index 8912c59..1169ff9 100644 (file)
--- a/ShenYin/ShenYin/lan/chinese.swift
+++ b/ShenYin/ShenYin/lan/chinese.swift
@@ -562,6 +562,17 @@ let chineseMap:[String:String] =
     "关闭后自动命名并保存":"",
     "字幕翻译":"",
     "看视频，实时字幕翻译":"",
+    "语言":"",
+    "声源":"",
+    "字幕展示内容":"",
+    "字号大小":"",
+    "双语":"",
+    "耳机外部声音":"",
+    "耳机内部声音":"",
+    "声音源":"",
+    "适用于参加现场讲座、会议等线下场景":"",
+    "适用于看视频时实时翻译字幕":"",
+    
     "用户须知":"",
     "首次使用请先开启手机蓝牙，搜索并配对设备。然后打开 APP，点击“添加设备”，找到对应产品完成连接，即可正常使用全部功能。":"",
     "了解并继续":"",