nothing

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -8335,7 +8335,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.2;
+				CURRENT_PROJECT_VERSION = 1.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8391,7 +8391,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (
@@ -8521,7 +8521,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForStudent/KulexiuForStudent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.5.2;
+				CURRENT_PROJECT_VERSION = 1.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8577,7 +8577,7 @@
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/SocialLibraries/Sina/SinaSDK",
 					"$(PROJECT_DIR)/KulexiuForStudent/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.5/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				OTHER_LDFLAGS = (

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.m

@@ -9,6 +9,8 @@
 #import "UIImageView+DisplayImage.h"
 
 @interface INSSettingBodyView ()
+@property (weak, nonatomic) IBOutlet UIView *groupView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *groupViewHeight;
 
 @property (weak, nonatomic) IBOutlet UILabel *tenantGroupName;
 
@@ -65,7 +67,15 @@
         subjectName = @"请选择乐器";
     }
     self.subjectLabel.text = subjectName;
-    self.tenantGroupName.text = [NSString returnNoNullStringWithString:info.tenantGroupName];
+    if ([NSString isEmptyString:info.tenantGroupName]) {
+        self.groupView.hidden = YES;
+        self.groupViewHeight.constant = 0.0f;
+    }
+    else {
+        self.tenantGroupName.text = info.tenantGroupName;
+        self.groupView.hidden = NO;
+        self.groupViewHeight.constant = 58.0f;
+    }
 }
 
 - (void)refreshSubject:(NSString *)subjectName {

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.xib

@@ -536,6 +536,8 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="birthdayLabel" destination="a8f-sc-JaW" id="3Sr-XC-gUb"/>
+                <outlet property="groupView" destination="aqA-az-HLB" id="q75-NV-HB1"/>
+                <outlet property="groupViewHeight" destination="p0l-TO-vbh" id="cBy-qN-9aN"/>
                 <outlet property="phoneLabel" destination="oE2-cd-RmM" id="NTX-Bp-9xc"/>
                 <outlet property="subjectLabel" destination="71s-LD-PL3" id="hr1-27-LHc"/>
                 <outlet property="tenantGroupName" destination="DSF-WC-P7q" id="2AX-aI-FJ8"/>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferMessageCell.m

@@ -69,13 +69,7 @@
     
     NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:messgage attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x7a7a7a)}];
     self.descMessageLabel.attributedText = attrStr;
-    
-//    if (![NSString isEmptyString:imgName]) {
-//        [self.messageTypeView setImage:[UIImage imageNamed:imgName]];
-//    }
-//    else {
-//        [self.messageTypeView setImage:[UIImage imageNamed:@"notifer_unknow"]];
-//    }
+    [self.messageTypeView sd_setImageWithURL:[NSURL URLWithString:[model.img getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"notifer_unknow"]];
 }
 
 - (void)setIsRead:(BOOL)isRead {

KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/Controller/GroupMemberViewController.m

@@ -65,7 +65,6 @@
 }
 
 - (void)evaluateMessge {
-    [LOADING_MANAGER MBShowInWindow:@"数据加载中......"];
     // 异步线程处理数据
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSMutableArray *sortArr = [NSMutableArray array];
@@ -100,7 +99,6 @@
         self.sourceIndexArray = sortArr;
         // 主线程刷新
         dispatch_async(dispatch_get_main_queue(), ^{
-            [LOADING_MANAGER removeHUD];
             self.tableView.sc_indexViewDataSource = self.sourceIndexArray;
             [self.tableView reloadData];
             [self changePromptLabelState];

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Model/NotiferMessageModel.h

@@ -27,6 +27,7 @@
 @property (nonatomic, assign) double readStatus;
 @property (nonatomic, strong) NSString *status;
 @property (nonatomic, strong) NSString *subType;
+@property (nonatomic, strong) NSString *img;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Model/NotiferMessageModel.m

@@ -24,6 +24,8 @@ NSString *const kNotiferMessageModelGroup = @"group";
 NSString *const kNotiferMessageModelReadStatus = @"readStatus";
 NSString *const kNotiferMessageModelStatus = @"status";
 NSString *const kNotiferMessageModelSubType = @"subType";
+NSString *const kNotiferMessageModelImg = @"img";
+
 
 @interface NotiferMessageModel ()
 
@@ -49,6 +51,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
 @synthesize readStatus = _readStatus;
 @synthesize status = _status;
 @synthesize subType = _subType;
+@synthesize img = _img;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -78,6 +81,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
             self.readStatus = [[self objectOrNilForKey:kNotiferMessageModelReadStatus fromDictionary:dict] doubleValue];
             self.status = [self objectOrNilForKey:kNotiferMessageModelStatus fromDictionary:dict];
         self.subType = [self objectOrNilForKey:kNotiferMessageModelSubType fromDictionary:dict];
+        self.img = [self objectOrNilForKey:kNotiferMessageModelImg fromDictionary:dict];
     }
     
     return self;
@@ -103,6 +107,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
     [mutableDict setValue:[NSNumber numberWithDouble:self.readStatus] forKey:kNotiferMessageModelReadStatus];
     [mutableDict setValue:self.status forKey:kNotiferMessageModelStatus];
     [mutableDict setValue:self.subType forKey:kNotiferMessageModelSubType];
+    [mutableDict setValue:self.img forKey:kNotiferMessageModelImg];
 
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
@@ -146,6 +151,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
     self.readStatus = [aDecoder decodeDoubleForKey:kNotiferMessageModelReadStatus];
     self.status = [aDecoder decodeObjectForKey:kNotiferMessageModelStatus];
     self.subType = [aDecoder decodeObjectForKey:kNotiferMessageModelSubType];
+    self.img = [aDecoder decodeObjectForKey:kNotiferMessageModelImg];
     return self;
 }
 
@@ -168,6 +174,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
     [aCoder encodeDouble:_readStatus forKey:kNotiferMessageModelReadStatus];
     [aCoder encodeObject:_status forKey:kNotiferMessageModelStatus];
     [aCoder encodeObject:_subType forKey:kNotiferMessageModelSubType];
+    [aCoder encodeObject:_img forKey:kNotiferMessageModelImg];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -192,6 +199,7 @@ NSString *const kNotiferMessageModelSubType = @"subType";
         copy.readStatus = self.readStatus;
         copy.status = [self.status copyWithZone:zone];
         copy.subType = [self.subType copyWithZone:zone];
+        copy.img = [self.img copyWithZone:zone];
     }
     
     return copy;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Controller/TXClassroomViewController.m

@@ -306,6 +306,7 @@
 
 -(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{
     if ([touch.view isDescendantOfView:self.chatAreaView] || [touch.view isDescendantOfView:self.videoListView] || [touch.view isDescendantOfView:self.maskView] || [touch.view isDescendantOfView:self.wBoardCtrl.customWebView.refreshButton] || [touch.view isDescendantOfView:self.danView] || [touch.view isDescendantOfView:self.titleView]) {
+        [self.danView resetInputStatus];
         return NO;
     }
     return YES;

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/ClassroomTitleView/TXClassTitleView.h

@@ -58,6 +58,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updateUserVolume:(NSInteger)volume;
 
+- (void)closeDanButton;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/ClassroomTitleView/TXClassTitleView.m

@@ -406,6 +406,9 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (void)closeDanButton {
+    self.danButton.isSelected = YES;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.