版本1.7.0提交审核

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -8662,7 +8662,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.9;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8709,7 +8709,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.7.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -8842,7 +8842,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.9;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8889,7 +8889,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.7.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -9150,7 +9150,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.9;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9197,7 +9197,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.7.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -9425,7 +9425,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.9;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9472,7 +9472,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.6.9;
+				MARKETING_VERSION = 1.7.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "DEV"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -93,7 +93,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/UserDetail/View/KSUserDetailBodyView.m

@@ -50,28 +50,57 @@
     BOOL isTeacher = NO;
     if ([sourceModel.friendType isEqualToString:@"TEACHER"]) {
         isTeacher = YES;
-        self.birthdayView.hidden = YES;
-        self.birthdayHeight.constant = 0.0f;
+    }
+    
+    NSString *birthday = [[sourceModel.friendBirthdate componentsSeparatedByString:@" "] firstObject];
+    if ([NSString isEmptyString:birthday]) {
+        self.birthDay.text = @"--";
     }
     else {
-        self.birthdayView.hidden = NO;
-        self.birthdayHeight.constant = 59.0f;
-        NSString *birthday = [[sourceModel.friendBirthdate componentsSeparatedByString:@" "] firstObject];
         self.birthDay.text = [NSString returnNoNullStringWithString:birthday];
-        
     }
+    
+    
+    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.friendAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
+    
+    
     self.userName.text = [NSString returnNoNullStringWithString:sourceModel.friendNickname];
     NSString *roleTagImg = isTeacher ? @"user_tag_teacher" : @"user_tag_student";
+    
+    NSString *topViperImage = @"";
+    NSString *vipType = sourceModel.userVip.vipType;
+    if ([vipType isEqualToString:@"PERMANENT_SVIP"] || [vipType isEqualToString:@"SVIP"]) {
+        self.userAvatar.layer.borderColor = HexRGB(0xF0AF88).CGColor;
+        topViperImage = @"mine_svip";
+    }
+    else if ([vipType isEqualToString:@"VIP"]) {
+        self.userAvatar.layer.borderColor = HexRGB(0xFADA9B).CGColor;
+        topViperImage = @"mine_vip";
+    }
+    else {
+        self.userAvatar.layer.borderColor = HexRGB(0xffffff).CGColor;
+        topViperImage = @"";
+    }
+    
+    
+    [self.memberTag setImage:[UIImage imageNamed:topViperImage]];
+    
     [self.roleTag setImage:[UIImage imageNamed:roleTagImg]];
     
     
     
     NSString *subjectDesc = [NSString returnNoNullStringWithString:sourceModel.friendSubjectName];
-    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-    [paragraphStyle setLineSpacing:4];//调整行间距
-    paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
-    NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:subjectDesc attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium],NSForegroundColorAttributeName:HexRGB(0x131415)}];
-    self.subjectLabel.attributedText = attrStr;
+    if ([NSString isEmptyString:subjectDesc]) {
+        self.subjectLabel.text = @"--";
+    }
+    else {
+        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle setLineSpacing:4];//调整行间距
+        paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
+        NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:subjectDesc attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium],NSForegroundColorAttributeName:HexRGB(0x131415)}];
+        self.subjectLabel.attributedText = attrStr;
+    }
+    
     
     NSString *sexDesc = sourceModel.friendGender == 1 ? @"男" : @"女";
     self.sexLabel.text = sexDesc;
@@ -89,7 +118,7 @@
     
     NSMutableDictionary *vipParm = [self queryVipType:sourceModel.userVip isSvip:NO];
     BOOL isVipLight = [vipParm ks_boolValueForKey:@"isLight"];
-    NSString *viperImage = isVipLight ? @"mineCenter_tagSvip" : @"mineCenter_tagVipExpired";
+    NSString *viperImage = isVipLight ? @"mineCenter_tagVip" : @"mineCenter_tagVipExpired";
     [self.viptag setImage:[UIImage imageNamed:viperImage]];
     self.vipDesc.text = [vipParm ks_stringValueForKey:@"desc"];
     self.vipDesc.textColor = isVipLight ? HexRGB(0xFF623A) : HexRGB(0xAAAAAA);

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/UserDetail/View/KSUserDetailBodyView.xib

@@ -369,7 +369,7 @@
                     </userDefinedRuntimeAttributes>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ODi-J5-4mp">
-                    <rect key="frame" x="172.66666666666666" y="97" width="48" height="22"/>
+                    <rect key="frame" x="172.66666666666666" y="94" width="48" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="34x-jp-8gJ"/>
                         <constraint firstAttribute="width" secondItem="ODi-J5-4mp" secondAttribute="height" multiplier="48:22" id="TTY-YI-Fiy"/>
@@ -384,7 +384,7 @@
                 <constraint firstItem="CdP-UJ-hN8" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="65" id="TAv-Wr-vgL"/>
                 <constraint firstAttribute="trailing" secondItem="CdP-UJ-hN8" secondAttribute="trailing" constant="13" id="b3k-0E-OK7"/>
                 <constraint firstItem="Cdz-aI-d13" firstAttribute="centerY" secondItem="CdP-UJ-hN8" secondAttribute="top" id="rC2-LE-czP"/>
-                <constraint firstItem="ODi-J5-4mp" firstAttribute="centerY" secondItem="Cdz-aI-d13" secondAttribute="bottom" id="u5A-KG-Sr5"/>
+                <constraint firstItem="ODi-J5-4mp" firstAttribute="centerY" secondItem="Cdz-aI-d13" secondAttribute="bottom" constant="-3" id="u5A-KG-Sr5"/>
                 <constraint firstAttribute="bottom" secondItem="CdP-UJ-hN8" secondAttribute="bottom" id="zQb-Cu-WJV"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineHeadView.m

@@ -62,8 +62,8 @@
         viperImage = @"";
     }
     
-    
     [self.viperImage setImage:[UIImage imageNamed:viperImage]];
+    
     [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_nomal"]];
     [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_nomal"]];
     [self.liveImage setImage:[UIImage imageNamed:@"mineLive_nomal"]];