预览以及社区列表优化

galaxy/galaxy/Classes/Modules/Community(社区)/Circle(下属社区)/C/YHCircleViewController.swift

@@ -115,16 +115,15 @@ private extension YHCircleViewController {
             guard let self = self else {
                 return
             }
-            
+            let tempArr = self.viewModel.dynamicArr
             DispatchQueue.global().async {
-                let tempArr = self.viewModel.dynamicArr
-                for item in tempArr {
-                    item.calHeightParam()
+                // 并行计算（内部会自动跳过已计算的）
+                DispatchQueue.concurrentPerform(iterations: tempArr.count) { index in
+                    tempArr[index].calHeightParam()
                 }
                 
                 DispatchQueue.main.async {
-                    self.arr.removeAll()
-                    self.arr.append(contentsOf: tempArr)
+                    self.arr = tempArr
                     self.noDataView.isHidden = self.arr.count > 0
                     self.circleCollectView.reloadData()
                     self.circleCollectView.es.stopLoadingMore()

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHMediaBrowserViewController.swift

@@ -22,27 +22,26 @@ class YHMediaBrowserViewController: JXPhotoBrowser {
         let v = UIView()
         
         let backBtn = UIButton()
-        backBtn.setImage(UIImage(named: "nav_back_white"), for: .normal)
+        backBtn.setImage(UIImage(named: "preview_back")?.withRenderingMode(.alwaysOriginal), for: .normal)
         backBtn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
         v.addSubview(backBtn)
         
         let deleteBtn = UIButton()
-        let img = UIImage(named: "media_brower_delete")
-        let templateImage = img?.withRenderingMode(.alwaysTemplate)
+        let img = UIImage(named: "preview_delete")
+        let templateImage = img?.withRenderingMode(.alwaysOriginal)
         deleteBtn.setImage(templateImage, for: .normal)
-        deleteBtn.imageView?.tintColor = .white
         deleteBtn.addTarget(self, action: #selector(didDeleteBtnClicked), for: .touchUpInside)
         v.addSubview(deleteBtn)
         
         backBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(44)
-            make.left.equalToSuperview()
+            make.width.height.equalTo(36)
+            make.left.equalToSuperview().offset(16)
             make.bottom.equalToSuperview()
         }
         
         deleteBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(44)
-            make.right.equalToSuperview()
+            make.width.height.equalTo(36)
+            make.right.equalToSuperview().offset(-16)
             make.bottom.equalToSuperview()
         }
         

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHPictureBrowserViewController.swift

@@ -20,27 +20,26 @@ class YHPictureBrowserViewController: JXPhotoBrowser {
         let v = UIView()
         
         let backBtn = UIButton()
-        backBtn.setImage(UIImage(named: "nav_back_white"), for: .normal)
+        backBtn.setImage(UIImage(named: "preview_back")?.withRenderingMode(.alwaysOriginal), for: .normal)
         backBtn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
         v.addSubview(backBtn)
         
         let saveBtn = UIButton()
-        let img = UIImage(named: "photo_brower_save")
-        let templateImage = img?.withRenderingMode(.alwaysTemplate)
+        let img = UIImage(named: "preview_download")
+        let templateImage = img?.withRenderingMode(.alwaysOriginal)
         saveBtn.setImage(templateImage, for: .normal)
-        saveBtn.imageView?.tintColor = .white
         saveBtn.addTarget(self, action: #selector(didSaveBtnClicked), for: .touchUpInside)
         v.addSubview(saveBtn)
         
         backBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(44)
-            make.left.equalToSuperview()
+            make.width.height.equalTo(36)
+            make.left.equalToSuperview().offset(16)
             make.bottom.equalToSuperview()
         }
         
         saveBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(44)
-            make.right.equalToSuperview()
+            make.width.height.equalTo(36)
+            make.right.equalToSuperview().offset(-16)
             make.bottom.equalToSuperview()
         }
         

galaxy/galaxy/Res/Assets.xcassets/Community/Circle/media_brower_delete.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/NavigationBar/preview_back.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "media_brower_delete@2x.png",
+      "filename" : "preview_back@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "media_brower_delete@3x.png",
+      "filename" : "preview_back@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/NavigationBar/preview_delete.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "preview_delete@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "preview_delete@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/NavigationBar/preview_download.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "preview_download@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "preview_download@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}