// 活动

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -9195,7 +9195,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9344,7 +9344,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9555,7 +9555,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9606,7 +9606,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -88,12 +88,37 @@ extension YHActivityDetailViewController {
 //                YHHUD.flash(message: "活动已结束")
             case .soldout:
                 printLog("已下架")
+            case .scanSign:
+                printLog("扫码签到")
+                goToScanVC()
+            case .signed:
+                printLog("已签到")
             default:
                 printLog("")
             }
         }
     }
     
+    func goToScanVC() {
+        let checkInVC = YHScanViewController.create(types: .checkIn) { [weak self] result in
+            guard let self = self else {
+                return
+            }
+            print("签到码: \(result.code)")
+            print("识别类型: \(result.recognizedType)")
+            if let type = result.recognizedType, type == YHScanType.checkIn { // 活动扫码签到
+                if !type.prefixString.isEmpty, result.code.contains(type.prefixString) {
+                    let signId = result.code.replacingOccurrences(of: type.prefixString, with: "")
+                    let vc = YHActivitySignSuccessViewController()
+                    vc.activityId = self.activityId
+                    self.navigationController?.pushViewController(vc)
+                    return
+                }
+            }
+        }
+        navigationController?.pushViewController(checkInVC, animated: true)
+    }
+
     func gotoActivityTravelVC() {
         if let nav = navigationController {
             let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -34,7 +34,7 @@ enum YHActivityStatus: Int {
         case .soldout:
             return "已下架"
         case .scanSign:
-            return "扫码签到"
+            return "去签到"
         case .signed:
             return "已签到"
         default:
@@ -55,7 +55,7 @@ enum YHActivityStatus: Int {
         case .soldout:
             return "已下架"
         case .scanSign:
-            return "扫码签到"
+            return "去签到"
         case .signed:
             return "已签到"
         default:
@@ -75,6 +75,10 @@ enum YHActivityStatus: Int {
             return "立即报名"
         case .soldout:
             return "已下架"
+        case .scanSign:
+            return "扫码签到"
+        case .signed:
+            return "已签到"
         default:
             return ""
         }
@@ -92,6 +96,10 @@ enum YHActivityStatus: Int {
             return UIColor.brandMainColor
         case .soldout:
             return UIColor.mainTextColor30
+        case .scanSign:
+            return UIColor.successColor
+        case .signed:
+            return UIColor.mainTextColor30
         default:
             return UIColor.clear
         }
@@ -109,6 +117,10 @@ enum YHActivityStatus: Int {
             return UIColor.mainTextColor30
         case .soldout:
             return UIColor.mainTextColor30
+        case .scanSign:
+            return UIColor.successColor
+        case .signed:
+            return UIColor.mainTextColor30
         default:
             return UIColor.clear
         }
@@ -126,6 +138,10 @@ enum YHActivityStatus: Int {
             return UIColor.brandGrayColor8
         case .soldout:
             return UIColor.mainTextColor30
+        case .scanSign:
+            return UIColor.brandGrayColor8
+        case .signed:
+            return UIColor.mainTextColor30
         default:
             return UIColor.clear
         }
@@ -326,7 +342,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
         if indexPath.section < viewModel.arrActivityListData.count {
             let model = viewModel.arrActivityListData[indexPath.section]
 
-            if type == 1 {
+            if type == 1 { // 我的活动
                 if model.status.int == 2 {
                     gotoActivityTravelVC(checkId: model.checkId)
                     return

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivitySignSuccessViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class YHActivitySignSuccessViewController: YHBaseViewController {
     
-    var activityId: String = "75"
+    var activityId: String = ""
     let viewModel: YHActivityViewModel = YHActivityViewModel()
     
     private let tableView = UITableView(frame: .zero, style: .grouped)
@@ -123,7 +123,7 @@ class YHActivitySignSuccessViewController: YHBaseViewController {
             self.signFailBgView.isHidden = success
             self.result = self.viewModel.signActivityModel
             self.hasPrize = false
-            if let gift = self.viewModel.signActivityModel?.gift {
+            if let _ = self.viewModel.signActivityModel?.gift {
                 self.hasPrize = true
             }
             self.tableView.reloadData()

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailBottomView.swift

@@ -48,6 +48,17 @@ private extension YHActivityDetailBottomView {
         if let status = Int(model.status) {
             isHidden = false
             saveButton.setTitle(YHActivityStatus.init(rawValue: status)?.titleForDetail, for: .normal)
+            if let status = YHActivityStatus.init(rawValue: status) {
+                if status == YHActivityStatus.scanSign {
+                    saveButton.setImage(UIImage(named: "salon_scan"), for: .normal)
+                    saveButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 4, bottom: 0, right: 0)
+                    saveButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 4)
+                } else {
+                    saveButton.setImage(UIImage(named: ""), for: .normal)
+                    saveButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+                    saveButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+                }
+            }
             saveButton.backgroundColor = YHActivityStatus.init(rawValue: status)?.activityBottomColor
         } else {
             isHidden = true

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift

@@ -294,7 +294,7 @@ extension YHActivityViewModel {
             "appId": 1
         ]
         
-        var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.sign
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.sign
         _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
             guard let self = self else { return }
             

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -765,12 +765,6 @@ extension YHMyNewViewController {
     
     func clickItem(_ item: PersonalModuleItem) {
         
-        if true {
-            let vc = YHActivitySignSuccessViewController()
-            self.navigationController?.pushViewController(vc)
-            return
-        }
-        
         if !checkLogin() {
             return
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHScanViewController.swift

@@ -98,8 +98,9 @@ class YHScanViewController: LBXScanViewController {
         
         // 回调处理
         if let completion = scanCompletion {
-            completion(result)
             navigationController?.popViewController(animated: true)
+            completion(result)
+            
         } else {
             // 如果没有设置回调,使用默认处理
             handleDefaultResult(result)

galaxy/galaxy/Res/Assets.xcassets/Salon/salon_scan.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "02-图标.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "02-图标-1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}