桂欢 1 год назад
Родитель
Сommit
f6f547d14d

+ 0 - 36
SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj

@@ -127,18 +127,11 @@
 		3D3BC1922A247C2A00AEEE8E /* 音波_00006.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17A2A247C2600AEEE8E /* 音波_00006.png */; };
 		3D3BC1932A247C2A00AEEE8E /* 音波_00015.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17B2A247C2600AEEE8E /* 音波_00015.png */; };
 		3D3BC1942A247C2A00AEEE8E /* 音波_00008.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17C2A247C2700AEEE8E /* 音波_00008.png */; };
-		3D3BC1952A247C2A00AEEE8E /* 音波_00017.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17D2A247C2700AEEE8E /* 音波_00017.png */; };
 		3D3BC1962A247C2A00AEEE8E /* 音波_00011.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17E2A247C2700AEEE8E /* 音波_00011.png */; };
-		3D3BC1972A247C2A00AEEE8E /* 音波_00024.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC17F2A247C2700AEEE8E /* 音波_00024.png */; };
-		3D3BC1982A247C2A00AEEE8E /* 音波_00016.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1802A247C2700AEEE8E /* 音波_00016.png */; };
-		3D3BC1992A247C2A00AEEE8E /* 音波_00018.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1812A247C2700AEEE8E /* 音波_00018.png */; };
 		3D3BC19A2A247C2A00AEEE8E /* 音波_00002.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1822A247C2800AEEE8E /* 音波_00002.png */; };
-		3D3BC19B2A247C2A00AEEE8E /* 音波_00019.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1832A247C2800AEEE8E /* 音波_00019.png */; };
-		3D3BC19C2A247C2A00AEEE8E /* 音波_00022.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1842A247C2800AEEE8E /* 音波_00022.png */; };
 		3D3BC19D2A247C2A00AEEE8E /* 音波_00012.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1852A247C2800AEEE8E /* 音波_00012.png */; };
 		3D3BC19E2A247C2A00AEEE8E /* 音波_00005.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1862A247C2800AEEE8E /* 音波_00005.png */; };
 		3D3BC19F2A247C2A00AEEE8E /* 音波_00004.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1872A247C2800AEEE8E /* 音波_00004.png */; };
-		3D3BC1A02A247C2A00AEEE8E /* 音波_00023.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1882A247C2900AEEE8E /* 音波_00023.png */; };
 		3D3BC1A12A247C2A00AEEE8E /* 音波_00014.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1892A247C2900AEEE8E /* 音波_00014.png */; };
 		3D3BC1A22A247C2A00AEEE8E /* 音波_00003.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC18A2A247C2900AEEE8E /* 音波_00003.png */; };
 		3D3BC1A32A247C2A00AEEE8E /* 音波_00010.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC18B2A247C2900AEEE8E /* 音波_00010.png */; };
@@ -146,8 +139,6 @@
 		3D3BC1A52A247C2A00AEEE8E /* 音波_00001.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC18D2A247C2900AEEE8E /* 音波_00001.png */; };
 		3D3BC1A62A247C2A00AEEE8E /* 音波_00009.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC18E2A247C2A00AEEE8E /* 音波_00009.png */; };
 		3D3BC1A72A247C2A00AEEE8E /* 音波_00013.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC18F2A247C2A00AEEE8E /* 音波_00013.png */; };
-		3D3BC1A82A247C2A00AEEE8E /* 音波_00020.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1902A247C2A00AEEE8E /* 音波_00020.png */; };
-		3D3BC1A92A247C2A00AEEE8E /* 音波_00021.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1912A247C2A00AEEE8E /* 音波_00021.png */; };
 		3D3BC1B42A247DA800AEEE8E /* 音波 3_00003.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1AA2A247DA600AEEE8E /* 音波 3_00003.png */; };
 		3D3BC1B52A247DA800AEEE8E /* 音波 3_00007.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1AB2A247DA600AEEE8E /* 音波 3_00007.png */; };
 		3D3BC1B62A247DA800AEEE8E /* 音波 3_00004.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D3BC1AC2A247DA700AEEE8E /* 音波 3_00004.png */; };
@@ -519,18 +510,11 @@
 		3D3BC17A2A247C2600AEEE8E /* 音波_00006.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00006.png"; sourceTree = "<group>"; };
 		3D3BC17B2A247C2600AEEE8E /* 音波_00015.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00015.png"; sourceTree = "<group>"; };
 		3D3BC17C2A247C2700AEEE8E /* 音波_00008.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00008.png"; sourceTree = "<group>"; };
-		3D3BC17D2A247C2700AEEE8E /* 音波_00017.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00017.png"; sourceTree = "<group>"; };
 		3D3BC17E2A247C2700AEEE8E /* 音波_00011.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00011.png"; sourceTree = "<group>"; };
-		3D3BC17F2A247C2700AEEE8E /* 音波_00024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00024.png"; sourceTree = "<group>"; };
-		3D3BC1802A247C2700AEEE8E /* 音波_00016.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00016.png"; sourceTree = "<group>"; };
-		3D3BC1812A247C2700AEEE8E /* 音波_00018.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00018.png"; sourceTree = "<group>"; };
 		3D3BC1822A247C2800AEEE8E /* 音波_00002.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00002.png"; sourceTree = "<group>"; };
-		3D3BC1832A247C2800AEEE8E /* 音波_00019.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00019.png"; sourceTree = "<group>"; };
-		3D3BC1842A247C2800AEEE8E /* 音波_00022.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00022.png"; sourceTree = "<group>"; };
 		3D3BC1852A247C2800AEEE8E /* 音波_00012.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00012.png"; sourceTree = "<group>"; };
 		3D3BC1862A247C2800AEEE8E /* 音波_00005.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00005.png"; sourceTree = "<group>"; };
 		3D3BC1872A247C2800AEEE8E /* 音波_00004.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00004.png"; sourceTree = "<group>"; };
-		3D3BC1882A247C2900AEEE8E /* 音波_00023.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00023.png"; sourceTree = "<group>"; };
 		3D3BC1892A247C2900AEEE8E /* 音波_00014.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00014.png"; sourceTree = "<group>"; };
 		3D3BC18A2A247C2900AEEE8E /* 音波_00003.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00003.png"; sourceTree = "<group>"; };
 		3D3BC18B2A247C2900AEEE8E /* 音波_00010.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00010.png"; sourceTree = "<group>"; };
@@ -538,8 +522,6 @@
 		3D3BC18D2A247C2900AEEE8E /* 音波_00001.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00001.png"; sourceTree = "<group>"; };
 		3D3BC18E2A247C2A00AEEE8E /* 音波_00009.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00009.png"; sourceTree = "<group>"; };
 		3D3BC18F2A247C2A00AEEE8E /* 音波_00013.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00013.png"; sourceTree = "<group>"; };
-		3D3BC1902A247C2A00AEEE8E /* 音波_00020.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00020.png"; sourceTree = "<group>"; };
-		3D3BC1912A247C2A00AEEE8E /* 音波_00021.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波_00021.png"; sourceTree = "<group>"; };
 		3D3BC1AA2A247DA600AEEE8E /* 音波 3_00003.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波 3_00003.png"; sourceTree = "<group>"; };
 		3D3BC1AB2A247DA600AEEE8E /* 音波 3_00007.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波 3_00007.png"; sourceTree = "<group>"; };
 		3D3BC1AC2A247DA700AEEE8E /* 音波 3_00004.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "音波 3_00004.png"; sourceTree = "<group>"; };
@@ -1359,15 +1341,6 @@
 				3D3BC18F2A247C2A00AEEE8E /* 音波_00013.png */,
 				3D3BC1892A247C2900AEEE8E /* 音波_00014.png */,
 				3D3BC17B2A247C2600AEEE8E /* 音波_00015.png */,
-				3D3BC1802A247C2700AEEE8E /* 音波_00016.png */,
-				3D3BC17D2A247C2700AEEE8E /* 音波_00017.png */,
-				3D3BC1812A247C2700AEEE8E /* 音波_00018.png */,
-				3D3BC1832A247C2800AEEE8E /* 音波_00019.png */,
-				3D3BC1902A247C2A00AEEE8E /* 音波_00020.png */,
-				3D3BC1912A247C2A00AEEE8E /* 音波_00021.png */,
-				3D3BC1842A247C2800AEEE8E /* 音波_00022.png */,
-				3D3BC1882A247C2900AEEE8E /* 音波_00023.png */,
-				3D3BC17F2A247C2700AEEE8E /* 音波_00024.png */,
 				3D3BC1B12A247DA700AEEE8E /* 音波 3_00001.png */,
 				3D3BC1AE2A247DA700AEEE8E /* 音波 3_00002.png */,
 				3D3BC1AA2A247DA600AEEE8E /* 音波 3_00003.png */,
@@ -2023,7 +1996,6 @@
 				3DB97D6C29D6ABC100B12754 /* sdRefeshView_arrow@2x.png in Resources */,
 				3D25106129AC95A9000AE530 /* SLRetrievePWViewController.xib in Resources */,
 				3D8EBBC82A131FA40008B0C1 /* SLHomeMsgTableViewCell.xib in Resources */,
-				3D3BC1A02A247C2A00AEEE8E /* 音波_00023.png in Resources */,
 				3DF3DAA829B9A6AA00CAD3AB /* SLBaseCellView.xib in Resources */,
 				3DF3DAE529BAFCCA00CAD3AB /* SLMySpeedCollectionViewCell.xib in Resources */,
 				3D3BC1B92A247DA800AEEE8E /* 音波 3_00005.png in Resources */,
@@ -2034,14 +2006,11 @@
 				3D3BC1BB2A247DA800AEEE8E /* 音波 3_00001.png in Resources */,
 				3D1B987329BEB35B0008D01A /* SLHorScrBtnsCell.xib in Resources */,
 				3D3BC1A72A247C2A00AEEE8E /* 音波_00013.png in Resources */,
-				3D3BC1992A247C2A00AEEE8E /* 音波_00018.png in Resources */,
-				3D3BC1A92A247C2A00AEEE8E /* 音波_00021.png in Resources */,
 				3D25105729AC8FE1000AE530 /* SLRegistViewController.xib in Resources */,
 				3D8C9F8A29AC57F300678283 /* LaunchScreen.storyboard in Resources */,
 				3D3BC1A22A247C2A00AEEE8E /* 音波_00003.png in Resources */,
 				3D1B9CED29C038280008D01A /* SLTargetViewController.xib in Resources */,
 				3DE9968429EE72D300C50A83 /* SLAddFriendVc.xib in Resources */,
-				3D3BC19C2A247C2A00AEEE8E /* 音波_00022.png in Resources */,
 				3D1B987B29BEE6800008D01A /* SLLxTopView.xib in Resources */,
 				3DA5AF6229B8875A009E4925 /* SLHomeViewController.xib in Resources */,
 				3DBC3BC42A0B644600E8C766 /* SLNearbyPeopleVc.xib in Resources */,
@@ -2053,7 +2022,6 @@
 				3D8C9F8729AC57F300678283 /* Assets.xcassets in Resources */,
 				3D25108A29ADD490000AE530 /* SLRoleLabelView.xib in Resources */,
 				3DF3DAE029BAFA4B00CAD3AB /* SLMySpeedView.xib in Resources */,
-				3D3BC1972A247C2A00AEEE8E /* 音波_00024.png in Resources */,
 				3D5BC39029E3F87100748197 /* SLFriensInfoVc.xib in Resources */,
 				3D2D8BD629DE5402009392DA /* AddressBookCell.xib in Resources */,
 				3D8C9F8529AC57F200678283 /* Main.storyboard in Resources */,
@@ -2068,12 +2036,10 @@
 				3DA5AF6A29B88875009E4925 /* SLLxViewController.xib in Resources */,
 				3D3BC1A62A247C2A00AEEE8E /* 音波_00009.png in Resources */,
 				3D1B986929BEAFEB0008D01A /* SLHorScrBtns.xib in Resources */,
-				3D3BC1952A247C2A00AEEE8E /* 音波_00017.png in Resources */,
 				3D3BC1932A247C2A00AEEE8E /* 音波_00015.png in Resources */,
 				3DF3DAFB29BB187D00CAD3AB /* SLHomeTopCollectionViewCell.xib in Resources */,
 				3DF3DAAE29B9AA3400CAD3AB /* SLMyListCollectionViewCell.xib in Resources */,
 				3DB97D9529D6ABF000B12754 /* MLEmoji_Expression.plist in Resources */,
-				3D3BC1982A247C2A00AEEE8E /* 音波_00016.png in Resources */,
 				3D3BC1A42A247C2A00AEEE8E /* 音波_00007.png in Resources */,
 				3DB97D9729D6ABF000B12754 /* MLEmoji_ExpressionImage.plist in Resources */,
 				3D2510A829AEF4F0000AE530 /* SLMessageViewController.xib in Resources */,
@@ -2093,7 +2059,6 @@
 				3D3BC19F2A247C2A00AEEE8E /* 音波_00004.png in Resources */,
 				3D3BC1BD2A247DA800AEEE8E /* 音波 3_00006.png in Resources */,
 				3DB97D9A29D6ABF000B12754 /* LICENSE in Resources */,
-				3D3BC1A82A247C2A00AEEE8E /* 音波_00020.png in Resources */,
 				3D1B989029BEF1AC0008D01A /* SLVocabularyCell.xib in Resources */,
 				3D1B988029BEEA670008D01A /* SLVocabularyView.xib in Resources */,
 				3D6EE45429F2568000B02EBB /* SLRecomFriendsVc.xib in Resources */,
@@ -2102,7 +2067,6 @@
 				3D3BC1B72A247DA800AEEE8E /* 音波 3_00009.png in Resources */,
 				3D25105C29AC9475000AE530 /* SLForgetPWViewController.xib in Resources */,
 				3DB97DA529D6ABF000B12754 /* README.md in Resources */,
-				3D3BC19B2A247C2A00AEEE8E /* 音波_00019.png in Resources */,
 				3DB97D9629D6ABF000B12754 /* MLEmoji_Expression.bundle in Resources */,
 				3D3BC1942A247C2A00AEEE8E /* 音波_00008.png in Resources */,
 			);

+ 22 - 0
SLAiELTS/SLAiELTS/Assets.xcassets/other/icon_mike_dh_bg_sel.imageset/Contents.json

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

BIN
SLAiELTS/SLAiELTS/Assets.xcassets/other/icon_mike_dh_bg_sel.imageset/icon_mike_dh_bg_sel@2x.png


BIN
SLAiELTS/SLAiELTS/Assets.xcassets/other/icon_mike_dh_bg_sel.imageset/icon_mike_dh_bg_sel@3x.png


+ 1 - 1
SLAiELTS/SLAiELTS/Tool/NetWorking/SLHttpCenter.m

@@ -249,7 +249,7 @@ static SLHttpCenter *handle;
         handle.responseSerializer = [AFHTTPResponseSerializer serializer];
         handle.requestSerializer = [AFJSONRequestSerializer serializer];
         handle.requestSerializer.timeoutInterval = KTimeoutInterval;
-        [handle.requestSerializer setValue:@"IOS" forHTTPHeaderField:@"OS"];
+        [handle.requestSerializer setValue:@"iOS" forHTTPHeaderField:@"OS"];
         handle.NetWorkIsOK = YES;
         [handle startMonitorNetWork];
         handle.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/plain", @"multipart/form-data", @"application/json", @"text/html", @"image/jpeg", @"image/png",@"application/octet-stream", @"text/json",@"application/x-www-form-urlencoded", nil];

BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00016.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00017.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00018.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00019.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00020.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00021.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00022.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00023.png


BIN
SLAiELTS/SLAiELTS/Vendor/音波/音波_00024.png


+ 7 - 1
SLAiELTS/SLAiELTS/ViewControllers/LoginVC/SLRegistViewController.m

@@ -22,6 +22,8 @@
 @property (weak, nonatomic) IBOutlet UITextField *pwTextField;
 @property (weak, nonatomic) IBOutlet UIButton *protocolBtn;
 
+@property (weak, nonatomic) IBOutlet UITextField *inviteTextField;
+
 @end
 
 @implementation SLRegistViewController
@@ -92,11 +94,15 @@
         [ZFToast ShowWithMessage:@"密码长度为6到16位"];
         return;
     }
+    if (!self.inviteTextField.text.length) {
+        [ZFToast ShowWithMessage:@"请输入邀请码"];
+        return;
+    }
     if (!self.protocolBtn.selected) {
         [ZFToast ShowWithMessage:@"请勾选协议"];
         return;
     }
-    NSDictionary *parameter = @{@"phone" : phoneStr, @"password" : pwStr, @"code" : codeStr, @"deviceBrand" : @"iPhone", @"deviceModel" : [NSString deviceModel]};
+    NSDictionary *parameter = @{@"phone" : phoneStr, @"password" : pwStr, @"code" : codeStr, @"deviceBrand" : @"iPhone", @"deviceModel" : [NSString deviceModel], @"invitation" : self.inviteTextField.text};
     [[SLHttpCenter SharedInstance] postWithUrl:@"/api/Token/isPhoneCode" parameter:parameter success:^(id responseObject) {
         NSDictionary *dataDict = [responseObject objectForKey:@"data"];
         SLLoginInfo *loginModel = [SLLoginInfo mj_objectWithKeyValues:dataDict];

+ 38 - 2
SLAiELTS/SLAiELTS/ViewControllers/LoginVC/SLRegistViewController.xib

@@ -13,6 +13,7 @@
             <connections>
                 <outlet property="codeBtn" destination="joL-K1-4Ad" id="62j-oW-fhi"/>
                 <outlet property="codeTextField" destination="p8e-CM-QHR" id="0Jr-93-ucS"/>
+                <outlet property="inviteTextField" destination="MYa-PF-OfT" id="yjK-S6-jGS"/>
                 <outlet property="phoneTextField" destination="ikY-tv-tJd" id="vLG-zT-Gbp"/>
                 <outlet property="protocolBtn" destination="uax-k7-pSM" id="dYM-Ar-n9T"/>
                 <outlet property="pwTextField" destination="jrR-aU-X5s" id="nmo-8Q-Q1A"/>
@@ -147,8 +148,40 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ly2-Er-5iY">
+                    <rect key="frame" x="20" y="433.33333333333331" width="350" height="58"/>
+                    <subviews>
+                        <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入邀请码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MYa-PF-OfT">
+                            <rect key="frame" x="35" y="0.0" width="295" height="58"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                            <textInputTraits key="textInputTraits"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="30"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <outlet property="delegate" destination="-1" id="axB-zX-YMa"/>
+                            </connections>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" red="0.96078431369999995" green="0.97254901959999995" blue="0.96862745100000003" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstItem="MYa-PF-OfT" firstAttribute="top" secondItem="Ly2-Er-5iY" secondAttribute="top" id="0Aj-Mj-03f"/>
+                        <constraint firstItem="MYa-PF-OfT" firstAttribute="centerY" secondItem="Ly2-Er-5iY" secondAttribute="centerY" id="EIo-9P-zbh"/>
+                        <constraint firstAttribute="height" constant="58" id="eoH-rq-7EU"/>
+                        <constraint firstAttribute="trailing" secondItem="MYa-PF-OfT" secondAttribute="trailing" constant="20" id="pHa-XV-vF3"/>
+                        <constraint firstItem="MYa-PF-OfT" firstAttribute="leading" secondItem="Ly2-Er-5iY" secondAttribute="leading" constant="35" id="wmb-3B-r08"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <integer key="value" value="30"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
                 <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uRR-vN-J97">
-                    <rect key="frame" x="20" y="440.33333333333331" width="350" height="58"/>
+                    <rect key="frame" x="20" y="510.33333333333326" width="350" height="58"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="58" id="JI4-J3-TNe"/>
                     </constraints>
@@ -255,6 +288,9 @@
                 <constraint firstItem="YNl-WE-VrE" firstAttribute="leading" secondItem="FjC-8z-a07" secondAttribute="leading" id="Fgc-NK-BXh"/>
                 <constraint firstItem="lwr-1K-Ahs" firstAttribute="leading" secondItem="DrS-SB-b8a" secondAttribute="leading" id="M08-RM-Xhl"/>
                 <constraint firstItem="IxA-O5-41R" firstAttribute="centerX" secondItem="YNl-WE-VrE" secondAttribute="centerX" id="T9l-vS-34v"/>
+                <constraint firstItem="Ly2-Er-5iY" firstAttribute="leading" secondItem="aQt-Lx-2x6" secondAttribute="leading" id="TVm-fh-gje"/>
+                <constraint firstItem="Ly2-Er-5iY" firstAttribute="top" secondItem="aQt-Lx-2x6" secondAttribute="bottom" constant="20" id="UP5-hH-2bt"/>
+                <constraint firstItem="Ly2-Er-5iY" firstAttribute="trailing" secondItem="aQt-Lx-2x6" secondAttribute="trailing" id="V8w-8p-yqI"/>
                 <constraint firstItem="lwr-1K-Ahs" firstAttribute="top" secondItem="DrS-SB-b8a" secondAttribute="bottom" priority="750" constant="18" id="ZZw-tX-eJz"/>
                 <constraint firstItem="CDt-c3-y2J" firstAttribute="leading" secondItem="Ogv-GR-erc" secondAttribute="leading" id="beu-rf-vB0"/>
                 <constraint firstItem="DrS-SB-b8a" firstAttribute="top" secondItem="Ogv-GR-erc" secondAttribute="bottom" constant="47" id="bvJ-td-wzv">
@@ -264,7 +300,7 @@
                 </constraint>
                 <constraint firstItem="DrS-SB-b8a" firstAttribute="leading" secondItem="FjC-8z-a07" secondAttribute="leading" constant="20" id="c6w-Qc-YA9"/>
                 <constraint firstItem="aQt-Lx-2x6" firstAttribute="top" secondItem="lwr-1K-Ahs" secondAttribute="bottom" constant="20" id="cfm-rT-Ze2"/>
-                <constraint firstItem="uRR-vN-J97" firstAttribute="top" secondItem="aQt-Lx-2x6" secondAttribute="bottom" constant="27" id="dnI-PE-v7h"/>
+                <constraint firstItem="uRR-vN-J97" firstAttribute="top" secondItem="aQt-Lx-2x6" secondAttribute="bottom" constant="97" id="dnI-PE-v7h"/>
                 <constraint firstItem="YNl-WE-VrE" firstAttribute="top" secondItem="FjC-8z-a07" secondAttribute="top" id="gMX-oU-F96"/>
                 <constraint firstItem="aQt-Lx-2x6" firstAttribute="centerX" secondItem="lwr-1K-Ahs" secondAttribute="centerX" id="jTf-Tt-CMD"/>
                 <constraint firstItem="uRR-vN-J97" firstAttribute="leading" secondItem="lwr-1K-Ahs" secondAttribute="leading" id="lwY-PP-r3u"/>

+ 12 - 6
SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Views/SLMikeInputView.m

@@ -10,6 +10,7 @@
 @interface SLMikeInputView()
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *imgHeightConst;
+@property (weak, nonatomic) IBOutlet UIImageView *mikeDhBg;
 
 @end
 
@@ -55,19 +56,22 @@
         if (sendTime * 1000 - bSendTime > 160) {
             bSendTime = sendTime * 1000;
             NSInteger v = 0;
-            if (volume + 160 < 96) {
-                v = (volume + 160) / 4;
+            if (volume + 160 < 90) {
+                v = (volume + 160) / 6;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    weakSelf.mikeTipImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"音波_000%02ld.png",v]];
+                    weakSelf.mikeTipImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"音波_000%02ld.png",v + 1]];
                 });
+//                NSLog(@"===%ld==%f-%@---%f",v,volume,[NSString stringWithFormat:@"音波_000%02ld",v],sendTime);
+
             }else {
-                v = (volume + 60) / 6;
+                v = (volume + 70) / 7;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    weakSelf.mikeTipImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"音波3_000%02ld.png",v]];
+                    weakSelf.mikeTipImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"音波 3_000%02ld.png",v + 1]];
                 });
+//                NSLog(@"===%ld==%f-%@---%f",v,volume,[NSString stringWithFormat:@"音波 3_000%02ld",v],sendTime);
+
             }
     //        NSInteger v = MIN(36, (volume + 160) / 4);
-            NSLog(@"===%ld==%f-%@---%f",v,volume,[NSString stringWithFormat:@"音波_000%02ld",v],sendTime);
             
         }
     };
@@ -85,6 +89,7 @@
     if (isContainCancelPath) {
         self.mikeCancelImageView.image = ImageName(@"icon_mike_cancel_sel");
         self.mikeInputImageView.image = ImageName(@"icon_mike_input_bg_sel");
+        self.mikeDhBg.image = ImageName(@"icon_mike_dh_bg_sel");
         self.mikeLabel.text = @"松开 取消";
         if (paramSender.state == UIGestureRecognizerStateEnded){
             self.contentView.hidden = YES;
@@ -92,6 +97,7 @@
         }
     }else{
         self.mikeLabel.text = @"松开 发送";
+        self.mikeDhBg.image = ImageName(@"icon_mike_dh_bg");
         self.mikeInputImageView.image = ImageName(@"icon_mike_input_bg");
         self.mikeCancelImageView.image = ImageName(@"icon_mike_cancel_nor");
     }

+ 1 - 0
SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Views/SLMikeInputView.xib

@@ -13,6 +13,7 @@
                 <outlet property="contentView" destination="iN0-l3-epB" id="kDk-Gs-7bu"/>
                 <outlet property="imgHeightConst" destination="FLw-wn-43p" id="NtP-3Q-YAB"/>
                 <outlet property="mikeCancelImageView" destination="OVz-mu-onH" id="z9K-48-rRF"/>
+                <outlet property="mikeDhBg" destination="Q8R-sJ-vZY" id="eqZ-JT-Vva"/>
                 <outlet property="mikeInputImageView" destination="76w-rg-8wP" id="gaC-fG-EWv"/>
                 <outlet property="mikeLabel" destination="dkF-D7-cqe" id="l2f-4J-3LM"/>
                 <outlet property="mikeTipImageView" destination="ezu-uj-IG6" id="vRd-vF-6kh"/>