Steven 4 years ago
parent
commit
304e65b497

+ 10 - 0
MusicGradeExam/MusicGradeExam.xcodeproj/project.pbxproj

@@ -27,6 +27,8 @@
 		2729F7F924C8425E00E1F3C4 /* RecordTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2729F7F824C8425E00E1F3C4 /* RecordTipsView.m */; };
 		2729F7FB24C8427200E1F3C4 /* RecordTipsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2729F7FA24C8427100E1F3C4 /* RecordTipsView.xib */; };
 		2729F7FE24C851FA00E1F3C4 /* BaseExamModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2729F7FC24C851F900E1F3C4 /* BaseExamModel.m */; };
+		273EFB4A24DCF5850069DB4D /* ExamSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = 273EFB4924DCF5850069DB4D /* ExamSearchView.m */; };
+		273EFB4C24DCF5920069DB4D /* ExamSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273EFB4B24DCF5920069DB4D /* ExamSearchView.xib */; };
 		27476F4824BBFB5900181362 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 27476F4724BBFB5900181362 /* AppDelegate.m */; };
 		27476F4E24BBFB5900181362 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27476F4D24BBFB5900181362 /* ViewController.m */; };
 		27476F5124BBFB5900181362 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 27476F4F24BBFB5900181362 /* Main.storyboard */; };
@@ -431,6 +433,9 @@
 		2729F7FA24C8427100E1F3C4 /* RecordTipsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RecordTipsView.xib; sourceTree = "<group>"; };
 		2729F7FC24C851F900E1F3C4 /* BaseExamModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseExamModel.m; sourceTree = "<group>"; };
 		2729F7FD24C851FA00E1F3C4 /* BaseExamModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseExamModel.h; sourceTree = "<group>"; };
+		273EFB4824DCF5850069DB4D /* ExamSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExamSearchView.h; sourceTree = "<group>"; };
+		273EFB4924DCF5850069DB4D /* ExamSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExamSearchView.m; sourceTree = "<group>"; };
+		273EFB4B24DCF5920069DB4D /* ExamSearchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ExamSearchView.xib; sourceTree = "<group>"; };
 		27476F4324BBFB5900181362 /* 酷乐秀.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "酷乐秀.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		27476F4624BBFB5900181362 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		27476F4724BBFB5900181362 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -2435,6 +2440,9 @@
 				2729F7DB24C81FA200E1F3C4 /* LibraryTipsView.h */,
 				2729F7DC24C81FA200E1F3C4 /* LibraryTipsView.m */,
 				2729F7DE24C81FB000E1F3C4 /* LibraryTipsView.xib */,
+				273EFB4824DCF5850069DB4D /* ExamSearchView.h */,
+				273EFB4924DCF5850069DB4D /* ExamSearchView.m */,
+				273EFB4B24DCF5920069DB4D /* ExamSearchView.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2838,6 +2846,7 @@
 				278D114324CFD59B00599421 /* GuideNextPageView.xib in Resources */,
 				27476F5124BBFB5900181362 /* Main.storyboard in Resources */,
 				2729F7D324C8175E00E1F3C4 /* FileNameView.xib in Resources */,
+				273EFB4C24DCF5920069DB4D /* ExamSearchView.xib in Resources */,
 				27EF3EF324BEE885002068A2 /* NotifyMessageCell.xib in Resources */,
 				27EF3F0024BF016B002068A2 /* WaitExamBodyView.xib in Resources */,
 				27A008A924BD96C50002452B /* KSNetworkAlert.xib in Resources */,
@@ -3056,6 +3065,7 @@
 				2747718724BC0C0500181362 /* JYEqualCellSpaceFlowLayout.m in Sources */,
 				274771E624BC0C0500181362 /* LoginViewController.m in Sources */,
 				2747726424BC0C0500181362 /* LLPhoto.m in Sources */,
+				273EFB4A24DCF5850069DB4D /* ExamSearchView.m in Sources */,
 				27A008C924BD9D550002452B /* KSNetTypeManager.m in Sources */,
 				27EF3F2124C02B68002068A2 /* KSNormalAlertView.m in Sources */,
 				2747723524BC0C0500181362 /* JXPagerListRefreshView.m in Sources */,

+ 22 - 0
MusicGradeExam/MusicGradeExam/Assets.xcassets/search_image.imageset/Contents.json

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

BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/search_image.imageset/search_image@2x.png


BIN
MusicGradeExam/MusicGradeExam/Assets.xcassets/search_image.imageset/search_image@3x.png


+ 17 - 0
MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamSearchView.h

@@ -0,0 +1,17 @@
+//
+//  ExamSearchView.h
+//  MusicGradeExam
+//
+//  Created by Kyle on 2020/8/7.
+//  Copyright © 2020 DayaMusic. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ExamSearchView : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 21 - 0
MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamSearchView.m

@@ -0,0 +1,21 @@
+//
+//  ExamSearchView.m
+//  MusicGradeExam
+//
+//  Created by Kyle on 2020/8/7.
+//  Copyright © 2020 DayaMusic. All rights reserved.
+//
+
+#import "ExamSearchView.h"
+
+@implementation ExamSearchView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

+ 72 - 0
MusicGradeExam/MusicGradeExam/UI/ExamLibrary/View/ExamSearchView.xib

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ExamSearchView">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="62"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vb9-bA-uy0">
+                    <rect key="frame" x="12" y="12" width="334" height="38"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_image" translatesAutoresizingMaskIntoConstraints="NO" id="6sV-Ib-Vsi">
+                            <rect key="frame" x="12" y="10.5" width="17" height="17"/>
+                        </imageView>
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="R4H-3o-UJy">
+                            <rect key="frame" x="34" y="0.0" width="283" height="38"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstItem="6sV-Ib-Vsi" firstAttribute="centerY" secondItem="vb9-bA-uy0" secondAttribute="centerY" id="0O4-Et-vR2"/>
+                        <constraint firstItem="6sV-Ib-Vsi" firstAttribute="leading" secondItem="vb9-bA-uy0" secondAttribute="leading" constant="12" id="BLO-dp-dJf"/>
+                        <constraint firstItem="R4H-3o-UJy" firstAttribute="top" secondItem="vb9-bA-uy0" secondAttribute="top" id="CJa-gi-LaD"/>
+                        <constraint firstAttribute="trailing" secondItem="R4H-3o-UJy" secondAttribute="trailing" constant="17" id="WTn-RJ-DVT"/>
+                        <constraint firstItem="R4H-3o-UJy" firstAttribute="leading" secondItem="6sV-Ib-Vsi" secondAttribute="trailing" constant="5" id="rsF-5G-eK1"/>
+                        <constraint firstAttribute="bottom" secondItem="R4H-3o-UJy" secondAttribute="bottom" id="yef-d4-rya"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="17"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oCc-vr-fcM">
+                    <rect key="frame" x="358" y="12" width="44" height="38"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="44" id="kI8-Og-7uc"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                    <state key="normal" title="取消">
+                        <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                    </state>
+                </button>
+            </subviews>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <constraints>
+                <constraint firstItem="oCc-vr-fcM" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="2wD-Ng-2nL"/>
+                <constraint firstItem="vb9-bA-uy0" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="57b-V5-hGU"/>
+                <constraint firstItem="oCc-vr-fcM" firstAttribute="leading" secondItem="vb9-bA-uy0" secondAttribute="trailing" constant="12" id="CcR-ef-7FQ"/>
+                <constraint firstAttribute="bottom" secondItem="oCc-vr-fcM" secondAttribute="bottom" constant="12" id="Deb-Iw-5mB"/>
+                <constraint firstAttribute="bottom" secondItem="vb9-bA-uy0" secondAttribute="bottom" constant="12" id="NH7-ej-h6L"/>
+                <constraint firstAttribute="trailing" secondItem="oCc-vr-fcM" secondAttribute="trailing" constant="12" id="Xt7-wr-wT7"/>
+                <constraint firstItem="vb9-bA-uy0" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="nvn-Wv-XKM"/>
+            </constraints>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="162.31884057971016" y="-496.20535714285711"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="search_image" width="17" height="17"/>
+    </resources>
+</document>

+ 1 - 1
MusicGradeExam/MusicGradeExam/UI/RecordExam/Controller/RecordExamViewController.m

@@ -304,7 +304,7 @@
     
     // 是否确认提交
     MJWeakSelf;
-    [KSNormalAlertView ks_showAlertWithTitle:@"确认已提交所有曲目\n提交之后无法修改" leftTitle:@"取消" rightTitle:@"确定" cancel:^{
+    [KSNormalAlertView ks_showAlertWithTitle:@"确认已提交所有曲目\n提交之后无法修改" leftTitle:@"取消" rightTitle:@"确定" cancel:^{
         
     } confirm:^{
         [weakSelf submitService];