改了录音，增加支持取消全选

diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj
index 6cf61ab..bcace1f 100644 (file)
--- a/ShenYin/ShenYin.xcodeproj/project.pbxproj
+++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj
@@ -1287,7 +1287,7 @@
                                CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 202603031420;
+                               CURRENT_PROJECT_VERSION = 202603031820;
                                DEVELOPMENT_TEAM = MAC46RQ4KH;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1342,7 +1342,7 @@
                                CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 202603031420;
+                               CURRENT_PROJECT_VERSION = 202603031820;
                                DEVELOPMENT_TEAM = MAC46RQ4KH;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1519,7 +1519,7 @@
                                CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 202603031403;
+                               CURRENT_PROJECT_VERSION = 202603031106;
                                DEVELOPMENT_TEAM = JKLJ58J33Q;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1575,7 +1575,7 @@
                                CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 202603031403;
+                               CURRENT_PROJECT_VERSION = 202603031106;
                                DEVELOPMENT_TEAM = JKLJ58J33Q;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",

diff --git a/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift b/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift
index c89ea32..7ab4ae7 100644 (file)
--- a/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift
+++ b/ShenYin/ShenYin/UI/Customer/CustomerHeaderView.swift
@@ -14,7 +14,7 @@ class CustomerHeaderView: BaseView {
     override func setupViews() {
         backgroundColor = .color(.bgColor)
         titleLabel.do { (v) in
-            v.data = FeedbackContentModel(content: "你好，请问有什么我可以帮助到您".l10n,isSend: false)
+            v.data = FeedbackContentModel(content: "你好，请问有什么我可以帮助到您".l10n + "?",isSend: false)
         }
         addSubviews([titleLabel,qaView])
     }

diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift
index 38e68d1..cbb62b6 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/CloudSelectedVC.swift
@@ -13,6 +13,7 @@ class CloudSelectedVC: BaseVC{
     var deleteList = [RecordHistoryModel]()
     var remainDeleteList = [RecordHistoryModel]()
     var deleteCallback:((_ list:[RecordHistoryModel])->Void)?
+    let leftLabel = UILabel()
     
     init(data:[RecordHistoryModel]) {
         var tempList = [CloudSelectedModel]()
@@ -39,8 +40,9 @@ class CloudSelectedVC: BaseVC{
             v.titleLabel.font = .bold(16)
             v.title = "已选择0项"
             //            v.leftView.backgroundColor = .red
-            v.leftView.setImage(nil, for: .normal)
+//            v.leftView.setImage(nil, for: .normal)
             v.rightView.isHidden = false
+            v.leftView.isHidden = true
             //            v.rightView.backgroundColor = .red
             
             v.leftView.snp.remakeConstraints { (m) in
@@ -55,19 +57,17 @@ class CloudSelectedVC: BaseVC{
                 m.bottom.equalToSuperview()
                 m.width.greaterThanOrEqualTo(58)
             }
-            
-            let leftLabel = UILabel()
-            leftLabel.text = "全选".l10n
+                        
             leftLabel.textColor = .color(.secondary)
             leftLabel.yc.setBorder(width: 1, color: .color(.secondary), radius: 11)
             leftLabel.font = .regular(12)
             leftLabel.textAlignment = .center
             leftLabel.yc.addTap(target: self, action: #selector(allSelctedAction))
-            v.leftView.addSubview(leftLabel)
+            v.addSubview(leftLabel)
             leftLabel.snp.remakeConstraints { (m) in
                 m.leading.equalToSuperview().inset(18)
                 m.height.equalTo(22)
-                m.centerY.equalToSuperview()
+                m.centerY.equalTo(v.titleLabel)
                 m.width.greaterThanOrEqualTo(40)
             }
             let rightLabel = UILabel()
@@ -114,11 +114,21 @@ class CloudSelectedVC: BaseVC{
             make.bottom.equalToSuperview().inset(95)
         }
     }
-    
+    override func setupData() {
+        selectedAction()
+    }
     
     @objc func allSelctedAction(){
-        for item in list {
-            item.isSelcted = true
+        let selectedList = list.filter({$0.isSelcted})
+        if selectedList.count == list.count{
+            for item in list {
+                item.isSelcted = false
+            }
+        }
+        else{
+            for item in list {
+                item.isSelcted = true
+            }
         }
         tableView.reloadData()
         selectedAction()
@@ -129,6 +139,13 @@ class CloudSelectedVC: BaseVC{
     func selectedAction(){
         let selectedList = list.filter({$0.isSelcted})
         navBar.title = "已选择\(selectedList.count)项"
+        
+        if selectedList.count == list.count {
+            leftLabel.text  = "取消".l10n
+        }
+        else{
+            leftLabel.text  = "全选".l10n
+        }
     }
     @objc func outputAction(){
         var tempList = [RecordHistoryModel]()

diff --git a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift
index bce6665..9aa9ac6 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift
+++ b/ShenYin/ShenYin/UI/Home/HistoryRecord/search/HistorySelectedVC.swift
@@ -11,7 +11,7 @@ class HistorySelectedVC: BaseVC{
     let bottomView = HistorySearchBottomView()
     var list = [RecordHistorySelectedModel]()
     var deleteCallback:((_ list:[RecordDetailModel])->Void)?
-    
+    let leftLabel = UILabel()
     init(data:[RecordDetailModel]) {
         var tempList = [RecordHistorySelectedModel]()
         for item in data {
@@ -39,6 +39,7 @@ class HistorySelectedVC: BaseVC{
 //            v.leftView.backgroundColor = .red
             v.leftView.setImage(nil, for: .normal)
             v.rightView.isHidden = false
+            v.leftView.isHidden = true
 //            v.rightView.backgroundColor = .red
             
             v.leftView.snp.remakeConstraints { (m) in
@@ -53,19 +54,17 @@ class HistorySelectedVC: BaseVC{
                 m.bottom.equalToSuperview()
                 m.width.greaterThanOrEqualTo(58)
             }
-            
-            let leftLabel = UILabel()
-            leftLabel.text = "全选"
+
             leftLabel.textColor = .color(.secondary)
             leftLabel.yc.setBorder(width: 1, color: .color(.secondary), radius: 11)
             leftLabel.font = .regular(12)
             leftLabel.textAlignment = .center
             leftLabel.yc.addTap(target: self, action: #selector(allSelctedAction))
-            v.leftView.addSubview(leftLabel)
+            v.addSubview(leftLabel)
             leftLabel.snp.remakeConstraints { (m) in
                 m.leading.equalToSuperview().inset(18)
                 m.height.equalTo(22)
-                m.centerY.equalToSuperview()
+                m.centerY.equalTo(v.titleLabel)
                 m.width.greaterThanOrEqualTo(40)
             }
             let rightLabel = UILabel()
@@ -113,10 +112,21 @@ class HistorySelectedVC: BaseVC{
         }
     }
 
+    override func setupData() {
+        selectedAction()
+    }
     
     @objc func allSelctedAction(){
-        for item in list {
-            item.isSelcted = true
+        let selectedList = list.filter({$0.isSelcted})
+        if selectedList.count == list.count{
+            for item in list {
+                item.isSelcted = false
+            }
+        }
+        else{
+            for item in list {
+                item.isSelcted = true
+            }
         }
         tableView.reloadData()
         selectedAction()
@@ -127,6 +137,13 @@ class HistorySelectedVC: BaseVC{
     func selectedAction(){
         let selectedList = list.filter({$0.isSelcted})
         navBar.title = "已选择\(selectedList.count)项"
+        
+        if selectedList.count == list.count {
+            leftLabel.text  = "取消".l10n
+        }
+        else{
+            leftLabel.text  = "全选".l10n
+        }
     }
     @objc func outputAction(){
         var tempList = [RecordDetailModel]()

diff --git a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift
index ec3d5d0..382ff53 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift
+++ b/ShenYin/ShenYin/UI/Home/Root/CurrentDeviceView.swift
@@ -10,8 +10,9 @@ class CurrentDeviceView: BaseView {
     let imageView = UIImageView()
     override func setupViews() {
 //        backgroundColor = .blue
-        addSubviews([imageView])
         addSubviews([connetedView])
+        addSubviews([imageView])
+        
         imageView.do { v in
             v.image = UIImage(named: "home_header")
         }

diff --git a/ShenYin/ShenYin/UI/common/ImagePickerManager.swift b/ShenYin/ShenYin/UI/common/ImagePickerManager.swift
index b5a14b7..baf8bdd 100644 (file)
--- a/ShenYin/ShenYin/UI/common/ImagePickerManager.swift
+++ b/ShenYin/ShenYin/UI/common/ImagePickerManager.swift
@@ -37,6 +37,7 @@ class ImagePickerManager: NSObject, TZImagePickerControllerDelegate {
         picker?.allowPickingOriginalPhoto = false
         picker?.allowPickingVideo = false
         picker?.allowPickingImage = true
+        picker?.preferredLanguage = (CCConfig.appLanguage == .chinse || CCConfig.appLanguage == .Traditional_Chinese ) ? "zh-Hans" :  "en"
         picker?.modalPresentationStyle = .overFullScreen
         viewController.present(picker!, animated: true, completion: nil)
     }
@@ -44,13 +45,11 @@ class ImagePickerManager: NSObject, TZImagePickerControllerDelegate {
         self.imageCallback = callback
         
         let picker = TZImagePickerController(maxImagesCount: 1, delegate: self)
-//        picker?.needCircleCrop = true
-//        picker?.circleCropRadius = Int(UIScreen.main.bounds.size.width/2)
-//        picker?.allowCrop = true
         picker?.showSelectBtn = false
         picker?.allowPickingOriginalPhoto = false
         picker?.allowPickingVideo = false
         picker?.allowPickingImage = true
+        picker?.preferredLanguage = (CCConfig.appLanguage == .chinse || CCConfig.appLanguage == .Traditional_Chinese ) ? "zh-Hans" :  "en"
         picker?.modalPresentationStyle = .overFullScreen
         viewController.present(picker!, animated: true, completion: nil)
     }

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json
index 8b4e60a..b4c5b6e 100644 (file)
--- a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Contents.json
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Polygon_2@2x.png",
+      "filename" : "Slice 130@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Polygon_2@3x.png",
+      "filename" : "Slice 130@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png
deleted file mode 100644 (file)
index 3467ca6..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@2x.png and /dev/null differ

diff --git a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@3x.png b/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@3x.png
deleted file mode 100644 (file)
index 9e427b4..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/home/polygon.imageset/Polygon_2@3x.png and /dev/null differ

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

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