添加启动图

liushiyu
1 parent 50bf41b0
Showing 7 changed files with 72 additions and 18 deletions
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Supporting Files/Assets.xcassets/LaunchImageScreen.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/LaunchImageScreen.imageset/LaunchImageScreen.png
metaCode/Supporting Files/Base.lproj/LaunchScreen.storyboard
@@ -10,7 +10,6 @@ import YYCategories
 import CNLiveRequestBastKit
 import HandyJSON
  
-import MJExtension
  
 //验证码发送成功回调
 typealias resultCodeBlock = () -> Void
@@ -59,7 +59,10 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }()
  
     lazy var photoView: MinePhotoUploadView = {
-        let pView = MinePhotoUploadView.init(frame: .zero)
+        let pView = MinePhotoUploadView.init(frame: .zero) { [self] index in
+            let mString = NSMutableAttributedString(string: "上传截图 (选填 \(index)/3)")
+            photoLabel.attributedText = mString
+        }
         pView.backgroundColor = .clear
         return pView
     }()
@@ -109,11 +112,12 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }
  
     override func viewWillAppear(_ animated: Bool) {
-        navigationBarHidden = false
+        
     }
  
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationBarHidden = false
         switch _show_type {
         case .problem:
             titleName = "问题反馈"
@@ -208,6 +212,7 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }
 }
  
+
 extension CNLiveInputFeedBackViewController {
     func textViewDidEndEditing(_ textView: UITextView) {
         if textView.text.lengthOfBytes(using: .utf8) < 1 {
@@ -139,18 +139,19 @@ class MineAboutHeaderView: UIView {
 }
  
  
-typealias ClickResultBlock = (_ array: NSMutableArray) ->Void
+typealias ClickResultBlock = (_ index: String) ->Void
 class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
  
     lazy var imageView01: UIImageView = {
         let imageView = UIImageView.init()
         imageView.backgroundColor = .white
         imageView.image = UIImage(named: "mine_sub_quest_addd_image")
-        imageView.contentMode = .scaleAspectFit
+        imageView.contentMode = .scaleAspectFill
         imageView.isUserInteractionEnabled = true
         imageView.tag = 1000
         imageView.layer.cornerRadius = 7
         imageView.layer.masksToBounds = true
+        imageView.clipsToBounds = true
         let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
         imageView.addGestureRecognizer(tapGes)
         return imageView
@@ -160,10 +161,11 @@ class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
         let imageView = UIImageView.init()
         imageView.backgroundColor = .white
         imageView.image = UIImage(named: "mine_sub_quest_addd_image")
-        imageView.contentMode = .scaleAspectFit
+        imageView.contentMode = .scaleAspectFill
         imageView.isUserInteractionEnabled = true
         imageView.tag = 1001
         imageView.isHidden = true
+        imageView.clipsToBounds = true
         imageView.layer.cornerRadius = 7
         imageView.layer.masksToBounds = true
         let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
@@ -175,10 +177,11 @@ class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
         let imageView = UIImageView.init()
         imageView.backgroundColor = .white
         imageView.image = UIImage(named: "mine_sub_quest_addd_image")
-        imageView.contentMode = .scaleAspectFit
+        imageView.contentMode = .scaleAspectFill
         imageView.isUserInteractionEnabled = true
         imageView.tag = 1002
         imageView.isHidden = true
+        imageView.clipsToBounds = true
         imageView.layer.cornerRadius = 7
         imageView.layer.masksToBounds = true
         let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
@@ -196,12 +199,13 @@ class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
         return tempArrray
     }()
  
-    var resutBlock : ClickResultBlock?
  
-    override init(frame: CGRect) {
+    var _resutBlock : ClickResultBlock?
+    init(frame: CGRect, resutBlock: @escaping ClickResultBlock) {
         super.init(frame: frame)
         backgroundColor = .white
  
+        _resutBlock = resutBlock
         addSubview(imageView01)
         imageView01.snp.makeConstraints { make in
             make.size.height.equalTo((KSreenWidth - 40)/3)
@@ -254,13 +258,16 @@ extension MinePhotoUploadView {
                 if temp_imageView == imageView01 {
                     imageView02.isHidden = false
                     selectedImages.replaceObject(at: 0, with: image)
+                    _resutBlock!("1")
                 }
                 if temp_imageView == imageView02 {
                     imageView03.isHidden = false
                     selectedImages.replaceObject(at: 1, with: image)
+                    _resutBlock!("2")
                 }
                 if temp_imageView == imageView03 {
                     selectedImages.replaceObject(at: 2, with: image)
+                    _resutBlock!("3")
                 }
             }else {
                 print("failed")
@@ -119,7 +119,7 @@ class CNLiveMineViewModel: NSObject {
         //当前时间大于最大允许时间则表明当前access_token已经过期需要重新请求
         if CNLiveMineViewModel.timeStamp > NSNumber(string: UserInfoManager.shared.userInfo.expires_in)?.intValue ?? 0 {
             let param = NSMutableDictionary.init()
-            param.setValue("802_li40qhp922", forKey: "appId")
+            param.setValue(APPId, forKey: "appId")
             param.setValue("3cc9f12db322a3d3656012ef929604cf6d6847471535f9", forKey: "secret")
             showLoading(message: "")
             CNLiveNetworking.setAllowRequestDefaultArgument(false)
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LaunchImageScreen.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -10,16 +12,36 @@
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="AQe-8w-1dv"/>
+                        <viewControllerLayoutGuide type="bottom" id="8ZX-t7-A97"/>
+                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImageScreen" translatesAutoresizingMaskIntoConstraints="NO" id="fg7-DY-Got">
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="fg7-DY-Got" secondAttribute="bottom" id="OZo-0h-6rD"/>
+                            <constraint firstAttribute="trailing" secondItem="fg7-DY-Got" secondAttribute="trailing" id="Uc5-q8-o2M"/>
+                            <constraint firstItem="fg7-DY-Got" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="lS8-Sn-Eno"/>
+                            <constraint firstItem="fg7-DY-Got" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="vn3-9b-mYR"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="LaunchImageScreen" width="621" height="1344"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>