Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -441,6 +441,7 @@
 		A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */; };
 		A592FE952BA6D23C0062FACA /* YHCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */; };
 		A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */; };
+		A59CCBCE2C241FCB001910FE /* YHApplyActivityAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */; };
 		A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */; };
 		A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */; };
 		A5ACE92C2B4564F7002C94D2 /* YHLoginStyleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */; };
@@ -992,6 +993,7 @@
 		A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryBottomView.swift; sourceTree = "<group>"; };
 		A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryCell.swift; sourceTree = "<group>"; };
 		A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateViewModel.swift; sourceTree = "<group>"; };
+		A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityAlert.swift; sourceTree = "<group>"; };
 		A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeView.swift; sourceTree = "<group>"; };
 		A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeInputView.swift; sourceTree = "<group>"; };
 		A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHLoginStyleButton.swift; sourceTree = "<group>"; };
@@ -2356,6 +2358,7 @@
 				A5787E3B2C23DEE500B021D7 /* YHAcitivityTitleItemView.swift */,
 				A5787E3D2C23DF8C00B021D7 /* YHAcitivityDetailItemView.swift */,
 				A5787E3F2C23DFD000B021D7 /* YHAcitivityTipsItemView.swift */,
+				A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -3440,6 +3443,7 @@
 				045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
 				044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */,
 				04FD856A2C21362300BEF9C5 /* YHMyIntroductionCell.swift in Sources */,
+				A59CCBCE2C241FCB001910FE /* YHApplyActivityAlert.swift in Sources */,
 				045EEEE62B9F171A0022A143 /* YHMySignatureListViewController.swift in Sources */,
 				049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */,
 				A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */,

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

@@ -75,6 +75,11 @@ class YHActivityDetailViewController: YHBaseViewController {
         //2.
 //        addTopView()
 //        topView.backgroundColor = .red
+        
+        
+        YHApplyActivityAlert.showApplyActivityAlertView { tag in
+            
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift

@@ -30,6 +30,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
     var bottomRightLineView: UIView!
     var fileImageView: UIImageView!
     var fileNameLabel: UILabel!
+    var shareButton: UIButton!
     var editButton: UIButton!
     var submitButton: UIButton!
     var lookButton: UIButton!
@@ -109,6 +110,20 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
             make.top.equalTo(52)
         }
         
+        shareButton = {
+            let button = UIButton(type: .custom)
+            button.setBackgroundImage(UIImage(named: "share_mini_program"), for: .normal)
+            button.addTarget(self, action: #selector(shareButtonClick), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(shareButton)
+        shareButton.snp.makeConstraints { make in
+            make.top.equalTo(18)
+            make.right.equalTo(-24)
+            make.height.equalTo(20)
+            make.width.equalTo(80)
+        }
+        
         bottomView = {
             let view = UIView()
             view.backgroundColor = UIColor.separatorColor
@@ -265,6 +280,10 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
         }
     }
     
+    @objc func shareButtonClick() {
+        YHShareManager.shared.sendMiniProgram()
+    }
+    
     func updataButton() {
         if isSign {
             bottomLeftLineView.isHidden = true

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_red_star.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_add_0.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_add_1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "步进器-加号&增加@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "步进器-加号&增加@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_sub_0.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_sub_1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "步进器-减号&减少@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "步进器-减号&减少@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的文书/share_mini_program.imageset/Contents.json

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