修改部分UI问题

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -1010,6 +1010,9 @@
 		BCEBB8E82840B87100A76BE8 /* KSLiveChatroomMemberUp.m in Sources */ = {isa = PBXBuildFile; fileRef = BCEBB8E72840B87100A76BE8 /* KSLiveChatroomMemberUp.m */; };
 		BCED1596293D941200266AEB /* banzou.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BCED1595293D941100266AEB /* banzou.mp3 */; };
 		BCED5CA7284F55A0009A42DE /* FriendListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCED5CA6284F55A0009A42DE /* FriendListModel.m */; };
+		BCF425DD2AB8665200BCD942 /* TenantHomeBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425DC2AB8665200BCD942 /* TenantHomeBannerView.m */; };
+		BCF425DF2AB8665900BCD942 /* TenantHomeBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCF425DE2AB8665900BCD942 /* TenantHomeBannerView.xib */; };
+		BCF425E22AB8793400BCD942 /* NSDate+DateDetail.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF425E12AB8793400BCD942 /* NSDate+DateDetail.m */; };
 		BCF472E72AB019CD0032BE16 /* TenantDarkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E62AB019CD0032BE16 /* TenantDarkViewController.m */; };
 		BCF472EA2AB01AEB0032BE16 /* TenantMoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF472E92AB01AEB0032BE16 /* TenantMoreViewController.m */; };
 		BCFCE44E28DD5C000051FED8 /* Low.wav in Resources */ = {isa = PBXBuildFile; fileRef = BCFCE44C28DD5C000051FED8 /* Low.wav */; };
@@ -2807,6 +2810,11 @@
 		BCED1595293D941100266AEB /* banzou.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = banzou.mp3; sourceTree = "<group>"; };
 		BCED5CA5284F55A0009A42DE /* FriendListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FriendListModel.h; sourceTree = "<group>"; };
 		BCED5CA6284F55A0009A42DE /* FriendListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FriendListModel.m; sourceTree = "<group>"; };
+		BCF425DB2AB8665200BCD942 /* TenantHomeBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantHomeBannerView.h; sourceTree = "<group>"; };
+		BCF425DC2AB8665200BCD942 /* TenantHomeBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenantHomeBannerView.m; sourceTree = "<group>"; };
+		BCF425DE2AB8665900BCD942 /* TenantHomeBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TenantHomeBannerView.xib; sourceTree = "<group>"; };
+		BCF425E02AB8793400BCD942 /* NSDate+DateDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+DateDetail.h"; sourceTree = "<group>"; };
+		BCF425E12AB8793400BCD942 /* NSDate+DateDetail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+DateDetail.m"; sourceTree = "<group>"; };
 		BCF472E52AB019CD0032BE16 /* TenantDarkViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantDarkViewController.h; sourceTree = "<group>"; };
 		BCF472E62AB019CD0032BE16 /* TenantDarkViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenantDarkViewController.m; sourceTree = "<group>"; };
 		BCF472E82AB01AEB0032BE16 /* TenantMoreViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenantMoreViewController.h; sourceTree = "<group>"; };
@@ -3729,6 +3737,8 @@
 				2779339127E3249D0010E277 /* NSArray+zh_SafeAccess.m */,
 				2779338627E3249D0010E277 /* NSDate+Extension.h */,
 				277933A327E3249D0010E277 /* NSDate+Extension.m */,
+				BCF425E02AB8793400BCD942 /* NSDate+DateDetail.h */,
+				BCF425E12AB8793400BCD942 /* NSDate+DateDetail.m */,
 				2779338127E3249D0010E277 /* NSDate+Transform.h */,
 				277933A627E3249D0010E277 /* NSDate+Transform.m */,
 				2779337C27E3249D0010E277 /* NSDictionary+Extension.h */,
@@ -6647,6 +6657,9 @@
 				BC89AC1B2AB08FE700B077AF /* TenantMusicCellView.h */,
 				BC89AC1C2AB08FE700B077AF /* TenantMusicCellView.m */,
 				BC89AC1E2AB08FF500B077AF /* TenantMusicCellView.xib */,
+				BCF425DB2AB8665200BCD942 /* TenantHomeBannerView.h */,
+				BCF425DC2AB8665200BCD942 /* TenantHomeBannerView.m */,
+				BCF425DE2AB8665900BCD942 /* TenantHomeBannerView.xib */,
 			);
 			path = MoreMusicPage;
 			sourceTree = "<group>";
@@ -7258,6 +7271,7 @@
 				BC2932F52AAEC44E0024D98E /* InstitutionMineNavView.xib in Resources */,
 				BCC0F6582A8CD8F500C4EFA4 /* TXChatAreaTopView.xib in Resources */,
 				BC542E40284079E300633781 /* UserAuthBodyView.xib in Resources */,
+				BCF425DF2AB8665900BCD942 /* TenantHomeBannerView.xib in Resources */,
 				BC542E5528409EC900633781 /* InstrumentHeaderView.xib in Resources */,
 				BC119215280ED6A900A716F7 /* MyLiveCourseCell.xib in Resources */,
 				BCC0F6672A8CD8F500C4EFA4 /* TXDanBottomView.xib in Resources */,
@@ -7529,6 +7543,7 @@
 				275FA22E27E7356B00CFEA2E /* MineViewController.m in Sources */,
 				BCC0F6AB2A8CDD4000C4EFA4 /* HTTPUtility.m in Sources */,
 				BC8A4597283DC33400094BBB /* CAudioUnit.m in Sources */,
+				BCF425E22AB8793400BCD942 /* NSDate+DateDetail.m in Sources */,
 				2779354627E324A60010E277 /* UIView+Animation.m in Sources */,
 				BCB908EF2850B08D00F5FF69 /* ShareMusicCellContentView.m in Sources */,
 				2723B68327F15D3D00E0B90B /* ModifyViewController.m in Sources */,
@@ -7911,6 +7926,7 @@
 				BC106C352A9338A7000759A9 /* TXUISeatMember.m in Sources */,
 				2779355427E324A70010E277 /* VoNetWorking.m in Sources */,
 				275FA1EE27E7351900CFEA2E /* KSBaseViewController.m in Sources */,
+				BCF425DD2AB8665200BCD942 /* TenantHomeBannerView.m in Sources */,
 				2723B63827F157D500E0B90B /* GroupApplyChooseCell.m in Sources */,
 				BC8B6DC62856CAF600866917 /* KSDocumentViewController.m in Sources */,
 				2723B66827F15CFC00E0B90B /* FeedbackBodyView.m in Sources */,

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/tenant_logo.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tetant_logo@2x.png",
+      "filename" : "tenant_logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tetant_logo@3x.png",
+      "filename" : "tenant_logo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

KulexiuForStudent/KulexiuForStudent/Common/Define/Common.h

@@ -26,6 +26,8 @@
 
 #define CLIENT_THEMECOLOR ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? THEMECOLOR : INS_THEMECOLOR)
 
+#define CLIENT_THEMEBUTTONCOLOR ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? THEMECOLOR : HexRGB(0xFF5993))
+
 #define CLIENT_SEARCH_IMG ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? @"search_green" : @"search_red")
 
 #define CLIENT_EMPTY_IMG ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0 ? @"wd_img_zwsj" : @"tenant_wd_img_zwsj")

KulexiuForStudent/KulexiuForStudent/Common/Tools/Custom/KSFullDatePicker.h

@@ -16,6 +16,7 @@ typedef NS_ENUM(NSInteger, KSDATEPICKER_MODE) {
     KSDATEPICKER_MODE_FULLTIME = 4,   // yyyy/MM/dd HH:mm:ss
     KSDATEPICKER_MODE_YEAR_MONTH = 5, // yyyy-MM
     KSDATEPICKER_MODE_HOUR_MINUTE = 6, // HH:mm
+    KSDATEPICKER_MODE_YEAR = 7,        // yyyy
 };
 
 

KulexiuForStudent/KulexiuForStudent/Common/Tools/Custom/KSFullDatePicker.m

@@ -7,7 +7,7 @@
 //
 
 #import "KSFullDatePicker.h"
-#import "NSDate+KSBaseDatePicker.h"
+#import "NSDate+DateDetail.h"
 #import "NSDate+Extension.h"
 
 
@@ -99,15 +99,15 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     self.block = block;
     self.cancleBlock = cancleBlock;
     self.pickMode = pickMode;
-    self.frame = CGRectMake(0, 0, kScreen_Width, kScreen_Height);
-    self.backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, kScreen_Height)];
-    self.backView.backgroundColor = HexRGBAlpha(0x363636, 0.55f);
-    
+    self.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight);
+    self.backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
+    self.backView.backgroundColor = HexRGBAlpha(0x000000, 0.6f);
+    self.date = date;
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction:)];
     tap.delegate = self;
     [self.backView addGestureRecognizer:tap];
     
-    self.timeView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreen_Height, kScreen_Width, 266)];
+    self.timeView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight, kScreenWidth, 266)];
     self.timeView.backgroundColor = [UIColor whiteColor];
     self.timeView.layer.masksToBounds = YES;
     if (@available(iOS 11.0, *)) {
@@ -122,7 +122,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
         self.timeView.layer.mask = maskLayer;
     }
     /*创建显示View*/
-    _contentView = [[UIView alloc] initWithFrame:CGRectMake(0, 50, kScreen_Width, 216)];
+    _contentView = [[UIView alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, 216)];
     _contentView.backgroundColor = [UIColor whiteColor];
     [_timeView addSubview:_contentView];
     
@@ -131,18 +131,18 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     UIButton *cancelButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     UIButton *sureButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     [cancelButton setTitle:@"取消" forState:UIControlStateNormal];
-    [cancelButton setTitleColor:HexRGB(0x666666) forState:UIControlStateNormal];
+    [cancelButton setTitleColor:HexRGB(0x777777) forState:UIControlStateNormal];
     [sureButton setTitle:@"确定" forState:UIControlStateNormal];
     [sureButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
-    cancelButton.titleLabel.font = [UIFont systemFontOfSize:17.0f];
-    sureButton.titleLabel.font = [UIFont systemFontOfSize:17.0f];
+    cancelButton.titleLabel.font = [UIFont systemFontOfSize:16.0f];
+    sureButton.titleLabel.font = [UIFont systemFontOfSize:16.0f];
     
     [cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     [sureButton addTarget:self action:@selector(doneButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     
     
-    cancelButton.frame = CGRectMake(20, 10, 60, 30);
-    sureButton.frame = CGRectMake(kScreen_Width - 80, 10, 60, 30);
+    cancelButton.frame = CGRectMake(10, 10, 60, 30);
+    sureButton.frame = CGRectMake(kScreenWidth - 70, 10, 60, 30);
     [self.timeView addSubview:cancelButton];
     [self.timeView addSubview:sureButton];
     
@@ -153,6 +153,11 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     titleLabel.font = [UIFont systemFontOfSize:15];
     titleLabel.textAlignment = NSTextAlignmentCenter;
     [self.timeView addSubview:titleLabel];
+    
+    // lineView
+    UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(13, 50, KPortraitWidth - 26, 1)];
+    lineView.backgroundColor = HexRGB(0xF2F2F2);
+    [self.timeView addSubview:lineView];
     [self.backView addSubview:self.timeView];
     [self addSubview:self.backView];
     
@@ -173,6 +178,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 }
 
 - (void)initPickViews {
+
     /*添加PickerView*/
     NSMutableArray* tempArray1 = [[NSMutableArray alloc] initWithCapacity:0];
     NSMutableArray* tempArray2 = [[NSMutableArray alloc] initWithCapacity:0];
@@ -192,6 +198,14 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     [self createDataSource];
     CGRect frame = _contentView.frame;
     CGFloat height = CGRectGetHeight(frame);
+    
+    if (self.pickMode != KSDATEPICKER_MODE_YEAR) {
+        UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(0, (height - 44) / 2.0f, CGRectGetWidth(frame) , 44)];
+        lineView.backgroundColor = HexRGB(0xF2F2F2);
+        lineView.layer.cornerRadius = 8.0f;
+        [_contentView addSubview:lineView];
+    }
+    
     if (_pickMode == KSDATEPICKER_MODE_TIME) {  // 时分秒
         CGFloat width = CGRectGetWidth(frame) / 3.0f;
         
@@ -343,6 +357,16 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
         [_contentView addSubview:self.hourPicker];
         [_contentView addSubview:self.minutePicker];
     }
+    else if (_pickMode == KSDATEPICKER_MODE_YEAR) { // 年
+        CGFloat width = CGRectGetWidth(frame);
+        
+        UIPickerView* yearPickerTemp = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
+        [self setYearPicker:yearPickerTemp];
+        [yearPickerTemp setValue:[UIColor blackColor] forKey:@"textColor"];
+        [self.yearPicker setFrame:CGRectMake(0, 0, width, height)];
+        
+        [_contentView addSubview:self.yearPicker];
+    }
     [self.yearPicker setDataSource:self];
     [self.monthPicker setDataSource:self];
     [self.dayPicker setDataSource:self];
@@ -380,7 +404,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 - (void)cancelButtonAction:(UIButton *)sender
 {
     [UIView animateWithDuration:0.3f animations:^{
-        self.timeView.frame = CGRectMake(0, kScreen_Height,kScreen_Width, 266);
+        self.timeView.frame = CGRectMake(0, kScreenHeight,kScreenWidth, 266);
     } completion:^(BOOL finished) {
         [self removeFromSuperview];
     }];
@@ -424,6 +448,10 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
             date = [NSString stringWithFormat:@"%02ld:%02ld",_hourValue,_minuteValue];
         }
             break;
+        case KSDATEPICKER_MODE_YEAR:
+        {
+            date = [NSString stringWithFormat:@"%ld",_yearValue];
+        }
         default:
             break;
     }
@@ -433,7 +461,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     
     
     [UIView animateWithDuration:0.3 animations:^{
-        self.timeView.frame = CGRectMake(0, self.bounds.size.height, self.bounds.size.width, 230);
+        self.timeView.frame = CGRectMake(0, self.bounds.size.height, self.bounds.size.width, 266);
     } completion:^(BOOL finished) {
         [self removeFromSuperview];
     }];
@@ -442,7 +470,7 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 - (void)tapAction:(UITapGestureRecognizer *)tap
 {
     [UIView animateWithDuration:0.3f animations:^{
-        self.timeView.frame = CGRectMake(0, kScreen_Height,kScreen_Width, 266);
+        self.timeView.frame = CGRectMake(0, kScreenHeight,kScreenWidth, 266);
     } completion:^(BOOL finished) {
         [self removeFromSuperview];
     }];
@@ -451,13 +479,6 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     }
 }
 
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
-    if ([touch.view isDescendantOfView:self.timeView]) {
-        return NO;
-    }
-    return YES;
-}
-
 
 - (void)show
 {
@@ -465,14 +486,20 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     [window addSubview:self];
     
     [UIView animateWithDuration:0.3f animations:^{
-        self.timeView.frame = CGRectMake(0, kScreen_Height - 266, kScreen_Width, 266);
+        self.timeView.frame = CGRectMake(0, kScreenHeight - 266, kScreenWidth, 266);
     } completion:^(BOOL finished) {
         nil;
     }];
     
 }
 
+
+
 #pragma mark - UIPickerViewDataSource
+- (CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component {
+    return 46.0f;
+}
+
 - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{
     return 1;
 }
@@ -533,15 +560,15 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{
     if (ePickerViewTagYear == pickerView.tag) {
         self.yearValue = [[self.yearArray objectAtIndex:row] intValue];
-    } else if(ePickerViewTagMonth == pickerView.tag){
+    } else if(ePickerViewTagMonth == pickerView.tag) {
         self.monthValue = [[self.monthArray objectAtIndex:row] intValue];
-    }else if(ePickerViewTagDay == pickerView.tag){
+    }else if(ePickerViewTagDay == pickerView.tag) {
         self.dayValue = [[self.dayArray objectAtIndex:row] intValue];
-    }else if(ePickerViewTagHour == pickerView.tag){
+    }else if(ePickerViewTagHour == pickerView.tag) {
         self.hourValue = [[self.hourArray objectAtIndex:row] intValue];
-    } else if(ePickerViewTagMinute == pickerView.tag){
+    } else if(ePickerViewTagMinute == pickerView.tag) {
         self.minuteValue = [[self.minuteArray objectAtIndex:row] intValue];
-    } else if(ePickerViewTagSecond == pickerView.tag){
+    } else if(ePickerViewTagSecond == pickerView.tag) {
         self.secondValue = [[self.secondArray objectAtIndex:row] intValue];
     }
     if (ePickerViewTagMonth == pickerView.tag || ePickerViewTagYear == pickerView.tag) {
@@ -669,8 +696,8 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
 #pragma mark resetDateTo current date
 - (void)resetDateToCurrentDate {
     
-    NSDate* nowDate = [NSDate date];
-    [self.yearPicker selectRow:[self.yearArray count]-100 inComponent:0 animated:YES];
+    NSDate* nowDate = self.date;
+    [self.yearPicker selectRow:[self getYearRow:[nowDate getYear]] inComponent:0 animated:YES];
     [self.monthPicker selectRow:[nowDate getMonth]-1 inComponent:0 animated:YES];
     [self.dayPicker selectRow:[nowDate getDay]-1 inComponent:0 animated:YES];
     
@@ -686,6 +713,14 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
     [self setSecondValue:[nowDate getSeconds]];
 }
 
+- (NSInteger)getYearRow:(NSInteger)year {
+    NSInteger index = [self.yearArray indexOfObject:[NSString stringWithFormat:@"%zd",year]];
+    if (index > 0) {
+        return index;
+    }
+    return [self.yearArray count]-100;
+}
+
 #pragma mark -pickerViewDelegate
 -(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view
 {
@@ -695,15 +730,24 @@ typedef NS_ENUM(NSInteger, PickViewTag) {
         pickerLabel.adjustsFontSizeToFitWidth = YES;
         [pickerLabel setTextAlignment:NSTextAlignmentCenter];
         [pickerLabel setBackgroundColor:[UIColor clearColor]];
-        [pickerLabel setFont:[UIFont systemFontOfSize:16]];
-        [pickerLabel setTextColor:[UIColor blackColor]];
+        [pickerLabel setFont:[UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium]];
+        [pickerLabel setTextColor:HexRGB(0x333333)];
     }
     // Fill the label text here
     pickerLabel.text=[self pickerView:pickerView titleForRow:row forComponent:component];
+    if (self.subviews.count > 0 && self.pickMode != KSDATEPICKER_MODE_YEAR) {
+        pickerView.subviews[1].backgroundColor = [UIColor clearColor];
+    }
     return pickerLabel;
 }
 
 
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([touch.view isDescendantOfView:self.timeView]) {
+        return NO;
+    }
+    return YES;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForStudent/KulexiuForStudent/Common/Tools/Extension/NSDate+DateDetail.h

@@ -0,0 +1,30 @@
+//
+//  NSDate+DateDetail.h
+//  GuanYueTeam
+//
+//  Created by 王智 on 2022/11/14.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSDate (DateDetail)
+
+-(int)getYear;
+-(int)getMonth;
+-(int)getDay;
+-(int)getHours;
+-(int)getMinutes;
+-(int)getSeconds;
+
+- (NSString *)getPreMonthFirstDay:(NSDate *)currentMonth;
+
+- (NSString *)getNextMonthLastDay:(NSDate *)currentMonth;
+
++ (NSDate *)getCurrentWeakFirstDay;
+
++ (NSDate *)getCurrentWeakLastDay;
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/Common/Tools/Extension/NSDate+DateDetail.m

@@ -0,0 +1,143 @@
+//
+//  NSDate+DateDetail.m
+//  GuanYueTeam
+//
+//  Created by 王智 on 2022/11/14.
+//
+
+#import "NSDate+DateDetail.h"
+
+@implementation NSDate (DateDetail)
+
+- (int)getYear {
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.year;
+}
+
+-(int)getMonth{
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.month;
+}
+-(int)getDay{
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.day;
+}
+-(int)getHours{
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.hour;
+}
+-(int)getMinutes{
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.minute;
+}
+-(int)getSeconds{
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+    NSDateComponents *dateComponent = [calendar components:unitFlags fromDate:self];
+    return (int)dateComponent.second;
+}
+
+- (NSString *)getPreMonthFirstDay:(NSDate *)currentMonth {
+    NSDate *preMonth = [self getPriousorLaterDateFromDate:currentMonth withMonth:-1];
+    NSString *firstDay = [self getMonthFirstDayWithDate:preMonth format:@"yyyy-MM-dd"];
+    return firstDay;
+}
+
+- (NSString *)getNextMonthLastDay:(NSDate *)currentMonth {
+    NSDate *nextMonth = [self getPriousorLaterDateFromDate:currentMonth withMonth:1];
+    NSString *lastDay = [self getMonthLastDayWithDate:nextMonth format:@"yyyy-MM-dd"];
+    return lastDay;
+}
+
+-(NSDate *)getPriousorLaterDateFromDate:(NSDate *)date withMonth:(NSInteger)month {
+    NSDateComponents *comps = [[NSDateComponents alloc] init];
+    [comps setMonth:month];
+    NSCalendar *calender = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    NSDate *mDate = [calender dateByAddingComponents:comps toDate:date options:0];
+    return mDate;
+}
+
+-(NSString *)getMonthLastDayWithDate:(NSDate *)date format:(NSString *)aformat {
+    
+    NSDate * newDate = date;
+    double interval = 0;
+    NSDate * firstDate = nil;
+    NSDate * lastDate = nil;
+    NSCalendar * calendar = [NSCalendar currentCalendar];
+    BOOL bl = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&firstDate interval:&interval forDate:newDate];
+    if(bl) {
+        lastDate = [firstDate dateByAddingTimeInterval:interval -1];
+        NSDateFormatter * myDateFormatter = [[NSDateFormatter alloc]init];
+        [myDateFormatter setDateFormat:aformat];
+        NSString * lastString = [myDateFormatter stringFromDate:lastDate];
+        return lastString;
+    }
+    return @"";
+}
+
+-(NSString *)getMonthFirstDayWithDate:(NSDate *)date format:(NSString *)aformat{
+    
+    NSDate * newDate = date;
+    double interval = 0;
+    NSDate * firstDate = nil;
+    NSCalendar * calendar = [NSCalendar currentCalendar];
+    BOOL bl = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&firstDate interval:&interval forDate:newDate];
+    if(bl) {
+        NSDateFormatter * myDateFormatter = [[NSDateFormatter alloc]init];
+        [myDateFormatter setDateFormat:aformat];
+        NSString * firstString = [myDateFormatter stringFromDate: firstDate];
+        return firstString;
+    }
+    return @"";
+}
+
+
++ (NSDate *)getCurrentWeakFirstDay {
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSDateComponents *dateComponents = [calendar components:NSCalendarUnitWeekday | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]];
+    NSInteger weekday = [dateComponents weekday];   //第几天(从sunday开始)
+    NSInteger firstDiff,lastDiff;
+    if (weekday == 1) {
+        firstDiff = -6;
+        lastDiff = 0;
+    }else {
+        firstDiff =  - weekday + 2;
+        lastDiff = 8 - weekday;
+    }
+    NSInteger day = [dateComponents day];
+    NSDateComponents *firstComponents = [calendar components:NSCalendarUnitWeekday | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]];
+    [firstComponents setDay:day+firstDiff];
+    NSDate *firstDay = [calendar dateFromComponents:firstComponents];
+    return firstDay;
+}
+
++ (NSDate *)getCurrentWeakLastDay {
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSDateComponents *dateComponents = [calendar components:NSCalendarUnitWeekday | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]];
+    NSInteger weekday = [dateComponents weekday];   //第几天(从sunday开始)
+    NSInteger firstDiff,lastDiff;
+    if (weekday == 1) {
+        firstDiff = -6;
+        lastDiff = 0;
+    }else {
+        firstDiff =  - weekday + 2;
+        lastDiff = 8 - weekday;
+    }
+    NSInteger day = [dateComponents day];
+    NSDateComponents *lastComponents = [calendar components:NSCalendarUnitWeekday | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]];
+    [lastComponents setDay:day+lastDiff];
+    NSDate *lastDay = [calendar dateFromComponents:lastComponents];
+    return lastDay;
+}
+
+@end

KulexiuForStudent/KulexiuForStudent/Common/Tools/Extension/NSDictionary+Extension.m

@@ -11,7 +11,7 @@
 @implementation NSDictionary (Extension)
 
 - (NSInteger)ks_integerValueForKey:(id)key {
-    id value = [self valueForKey:key];
+    id value = [self notNullValueForKey:key];
     return value == nil ? 0 : [value integerValue];
 }
 

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantDarkViewController.m

@@ -42,6 +42,8 @@
 
 @property (nonatomic, assign) BOOL hasShowTipsView;
 
+@property (nonatomic, assign) BOOL isFirstLoad;
+
 @end
 
 @implementation TenantDarkViewController
@@ -56,14 +58,26 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self configUI];
+    self.isFirstLoad = YES;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self requestSource];
+    if (self.isFirstLoad == YES) {
+        self.isFirstLoad = NO;
+        [self requestTrackAuth];
+    }
+
+}
+
+- (void)requestTrackAuth {
     
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    [appDelegate appTrackActionAuth];
 }
 
+
 - (void)requestSource {
     [self requestData];
     [self requsetTicket];
@@ -173,7 +187,7 @@
     [self.pagerView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.searchView.mas_bottom);
         make.left.right.mas_equalTo(self.view);
-        make.bottom.mas_equalTo(self.view.mas_bottom);
+        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-16);
     }];
     
     
@@ -181,7 +195,7 @@
     [self.emptyAniView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.searchView.mas_bottom);
         make.left.right.mas_equalTo(self.view);
-        make.bottom.mas_equalTo(self.view.mas_bottom);
+        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-16);
     }];
     self.emptyAniView.hidden = YES;
     [self showFloatingWindow];
@@ -220,7 +234,7 @@
 - (TYCyclePagerViewLayout *)layoutForPagerView:(TYCyclePagerView *)pageView {
     CGFloat navHeight = [InstitutionNomalNavView getViewHeight];
     CGFloat searchHeight = [TenantDarkSearhView getViewHeight];
-    CGFloat height = (KPortraitHeight - navHeight - searchHeight - kTabBarHeight);
+    CGFloat height = (KPortraitHeight - navHeight - searchHeight - kTabBarHeight - 16);
     TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc] init];
     layout.itemSize = CGSizeMake(height/571*296, height);
     layout.itemSpacing = 16.0f;

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/Controller/TenantMoreViewController.m

@@ -9,7 +9,7 @@
 #import "MorePageNavView.h"
 #import "MorePageSearchView.h"
 
-#import "HomeBannerView.h"
+#import "TenantHomeBannerView.h"
 #import "TYCyclePagerView.h"
 #import "TYPageControl.h"
 #import "HomeBannerCell.h"
@@ -41,7 +41,7 @@
 
 // banner
 @property (nonatomic, strong) TYPageControl *pageControl;
-@property (nonatomic, strong) HomeBannerView *bannerView;  // banner container
+@property (nonatomic, strong) TenantHomeBannerView *bannerView;  // banner container
 @property (nonatomic, strong) TYCyclePagerView *bannerScroll; // 活动
 @property (nonatomic, strong) NSMutableArray *bannerArray; // banner 数据
 @property (nonatomic, assign) CGFloat bannerViewHeight; // banner 高度
@@ -206,7 +206,7 @@
 
 - (void)refreshHeader {
     self.navView.tenantName.text = [NSString returnNoNullStringWithString:self.mineInfo.tenantName];
-    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:self.mineInfo.subjectName];
+//    self.searchView.subjectLabel.text = [NSString returnNoNullStringWithString:self.mineInfo.subjectName];
 }
 // banner
 - (void)requestNewsList {
@@ -300,7 +300,7 @@
 - (void)refreshBannerView {
     if (self.bannerArray.count) {
         self.bannerView.hidden = NO;
-        CGFloat bannerViewHeight = [HomeBannerView getViewHeight];
+        CGFloat bannerViewHeight = [TenantHomeBannerView getViewHeight];
         [self.bannerView mas_updateConstraints:^(MASConstraintMaker *make) {
             make.height.mas_equalTo(bannerViewHeight);
         }];
@@ -575,9 +575,9 @@
     [self.navigationController pushViewController:ctrl animated:YES];
 }
 
-- (HomeBannerView *)bannerView {
+- (TenantHomeBannerView *)bannerView {
     if (!_bannerView) {
-        _bannerView = [HomeBannerView shareInstance];
+        _bannerView = [TenantHomeBannerView shareInstance];
         [_bannerView.bannerContentView addSubview:self.bannerScroll];
     }
     return _bannerView;

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantHomeBannerView.h

@@ -0,0 +1,22 @@
+//
+//  TenantHomeBannerView.h
+//  KulexiuForStudent
+//
+//  Created by 王智 on 2023/9/18.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TenantHomeBannerView : UIView
+
+@property (weak, nonatomic) IBOutlet UIView *bannerContentView;
+
++ (instancetype)shareInstance;
+
++ (CGFloat)getViewHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantHomeBannerView.m

@@ -0,0 +1,28 @@
+//
+//  TenantHomeBannerView.m
+//  KulexiuForStudent
+//
+//  Created by 王智 on 2023/9/18.
+//
+
+#import "TenantHomeBannerView.h"
+
+@implementation TenantHomeBannerView
+
++ (instancetype)shareInstance {
+    TenantHomeBannerView *view = [[[NSBundle mainBundle] loadNibNamed:@"TenantHomeBannerView" owner:nil options:nil] firstObject];
+    return view;
+}
+
++ (CGFloat)getViewHeight {
+    return (KPortraitWidth - 13 * 2) * 132 / 347;
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantHomeBannerView.xib

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21701"/>
+        <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="TenantHomeBannerView">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="198"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UEk-sO-ItO">
+                    <rect key="frame" x="13" y="0.0" width="367" height="198"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="UEk-sO-ItO" secondAttribute="bottom" id="NIt-hx-jSi"/>
+                <constraint firstItem="UEk-sO-ItO" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="rfe-OK-xXh"/>
+                <constraint firstAttribute="trailing" secondItem="UEk-sO-ItO" secondAttribute="trailing" constant="13" id="rpZ-6y-eSo"/>
+                <constraint firstItem="UEk-sO-ItO" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="v7U-oz-y0h"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="bannerContentView" destination="UEk-sO-ItO" id="TZF-eF-tn6"/>
+            </connections>
+            <point key="canvasLocation" x="72.51908396946564" y="-90.140845070422543"/>
+        </view>
+    </objects>
+</document>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.m

@@ -13,7 +13,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *songNameLabel;
 @property (weak, nonatomic) IBOutlet UIImageView *typeImage;
 
-@property (weak, nonatomic) IBOutlet UIImageView *qualityMusicTag;
+@property (weak, nonatomic) IBOutlet UIView *qualityTagView;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *qualityTagWidth;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *qualityTagLeft;
 
@@ -40,13 +40,13 @@
     }
     self.model = sourceModel;
     if (sourceModel.exquisiteFlag) {
-        self.qualityMusicTag.hidden = NO;
-        self.qualityTagWidth.constant = 14.0f;
-        self.qualityTagLeft.constant = 10.0f;
+        self.qualityTagView.hidden = NO;
+        self.qualityTagWidth.constant = 28.0f;
+        self.qualityTagLeft.constant = 6.0f;
 
     }
     else {
-        self.qualityMusicTag.hidden = NO;
+        self.qualityTagView.hidden = NO;
         self.qualityTagWidth.constant = 0.0f;
         self.qualityTagLeft.constant = 0.0f;
     }

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCellView.xib

@@ -55,15 +55,8 @@
                                 <constraint firstAttribute="height" constant="16" id="vDl-E6-262"/>
                             </constraints>
                         </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="quality_tag" translatesAutoresizingMaskIntoConstraints="NO" id="b6m-9W-OFg">
-                            <rect key="frame" x="98" y="45.666666666666664" width="14" height="17"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="17" id="7WS-b8-bXb"/>
-                                <constraint firstAttribute="width" constant="14" id="LYJ-6I-gI8"/>
-                            </constraints>
-                        </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一把剑走天涯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HxH-qD-mNB">
-                            <rect key="frame" x="118" y="47.666666666666664" width="79.666666666666686" height="13"/>
+                            <rect key="frame" x="128" y="47.666666666666664" width="79.666666666666686" height="13"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="13" id="hUh-q6-jav"/>
                             </constraints>
@@ -71,22 +64,51 @@
                             <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ze9-tw-OQ4">
+                            <rect key="frame" x="94" y="46" width="28" height="16"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v0o-8K-hKY">
+                                    <rect key="frame" x="4" y="2" width="20.666666666666668" height="12"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                    <color key="textColor" red="0.99607843137254903" green="0.14117647058823529" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="v0o-8K-hKY" firstAttribute="centerY" secondItem="Ze9-tw-OQ4" secondAttribute="centerY" id="2be-uN-voA"/>
+                                <constraint firstAttribute="width" constant="28" id="H63-Xt-B72"/>
+                                <constraint firstItem="v0o-8K-hKY" firstAttribute="leading" secondItem="Ze9-tw-OQ4" secondAttribute="leading" constant="4" id="O0h-4F-vzr"/>
+                                <constraint firstAttribute="height" constant="16" id="r1U-a2-VbM"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="3"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.99607843137254903" green="0.14117647058823529" blue="0.31764705882352939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="mJq-Wc-3s9" firstAttribute="leading" secondItem="cy6-V6-YsN" secondAttribute="leading" constant="12" id="1Gb-Rr-Pn4"/>
                         <constraint firstItem="mJq-Wc-3s9" firstAttribute="centerY" secondItem="cy6-V6-YsN" secondAttribute="centerY" id="2lo-2B-GW6"/>
+                        <constraint firstItem="Ze9-tw-OQ4" firstAttribute="leading" secondItem="GTK-mU-7zB" secondAttribute="trailing" constant="6" id="99h-bL-1Mn"/>
                         <constraint firstAttribute="trailing" secondItem="zZJ-rK-8xk" secondAttribute="trailing" constant="14" id="AON-rh-MaM"/>
-                        <constraint firstItem="HxH-qD-mNB" firstAttribute="centerY" secondItem="b6m-9W-OFg" secondAttribute="centerY" id="Cgf-g7-Hgo"/>
-                        <constraint firstItem="b6m-9W-OFg" firstAttribute="centerY" secondItem="GTK-mU-7zB" secondAttribute="centerY" id="HxA-7e-cHg"/>
+                        <constraint firstItem="HxH-qD-mNB" firstAttribute="leading" secondItem="Ze9-tw-OQ4" secondAttribute="trailing" constant="6" id="Ca5-XJ-Zmt"/>
                         <constraint firstItem="OTP-wJ-ueO" firstAttribute="leading" secondItem="mJq-Wc-3s9" secondAttribute="leading" id="IhZ-FI-HzB"/>
-                        <constraint firstItem="b6m-9W-OFg" firstAttribute="leading" secondItem="GTK-mU-7zB" secondAttribute="trailing" constant="10" id="Jgb-Bt-N7U"/>
                         <constraint firstItem="GTK-mU-7zB" firstAttribute="leading" secondItem="jKe-5h-r2a" secondAttribute="leading" id="Lga-3u-QiP"/>
-                        <constraint firstItem="HxH-qD-mNB" firstAttribute="leading" secondItem="b6m-9W-OFg" secondAttribute="trailing" constant="6" id="Qic-Ve-wPS"/>
+                        <constraint firstItem="HxH-qD-mNB" firstAttribute="centerY" secondItem="GTK-mU-7zB" secondAttribute="centerY" id="Pnb-co-DEn"/>
                         <constraint firstItem="jKe-5h-r2a" firstAttribute="top" secondItem="mJq-Wc-3s9" secondAttribute="top" constant="3" id="WwS-vx-6Ds"/>
                         <constraint firstItem="OTP-wJ-ueO" firstAttribute="top" secondItem="mJq-Wc-3s9" secondAttribute="top" id="fIC-7w-eSx"/>
                         <constraint firstItem="GTK-mU-7zB" firstAttribute="top" secondItem="jKe-5h-r2a" secondAttribute="bottom" constant="6" id="iVM-8J-WEI"/>
                         <constraint firstItem="jKe-5h-r2a" firstAttribute="leading" secondItem="mJq-Wc-3s9" secondAttribute="trailing" constant="10" id="m6m-Eg-7lx"/>
+                        <constraint firstItem="Ze9-tw-OQ4" firstAttribute="centerY" secondItem="GTK-mU-7zB" secondAttribute="centerY" id="ou6-vV-Z9a"/>
                         <constraint firstItem="zZJ-rK-8xk" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="jKe-5h-r2a" secondAttribute="trailing" constant="10" id="v6s-DZ-OV4"/>
                         <constraint firstItem="zZJ-rK-8xk" firstAttribute="centerY" secondItem="cy6-V6-YsN" secondAttribute="centerY" id="vAb-TU-vRK"/>
                         <constraint firstItem="zZJ-rK-8xk" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="HxH-qD-mNB" secondAttribute="trailing" constant="10" id="vjL-SD-tMA"/>
@@ -118,9 +140,9 @@
                 <outlet property="authLabel" destination="HxH-qD-mNB" id="YW6-pp-Bep"/>
                 <outlet property="likeImage" destination="GTK-mU-7zB" id="9um-Ej-XaA"/>
                 <outlet property="musicCoverImage" destination="mJq-Wc-3s9" id="gWo-Q9-r6p"/>
-                <outlet property="qualityMusicTag" destination="b6m-9W-OFg" id="GFq-aC-bq6"/>
-                <outlet property="qualityTagLeft" destination="Jgb-Bt-N7U" id="rx2-Xu-ODe"/>
-                <outlet property="qualityTagWidth" destination="LYJ-6I-gI8" id="2LX-Ff-O2s"/>
+                <outlet property="qualityTagLeft" destination="99h-bL-1Mn" id="tLr-KK-jxc"/>
+                <outlet property="qualityTagView" destination="Ze9-tw-OQ4" id="Bfp-rs-JC4"/>
+                <outlet property="qualityTagWidth" destination="H63-Xt-B72" id="shW-qA-i7F"/>
                 <outlet property="songNameLabel" destination="jKe-5h-r2a" id="crm-KM-Vpi"/>
                 <outlet property="typeImage" destination="OTP-wJ-ueO" id="YCR-uN-O3P"/>
             </connections>
@@ -131,7 +153,6 @@
         <image name="music_like_nomal" width="15" height="16"/>
         <image name="music_placeholder" width="76.5" height="76.5"/>
         <image name="music_vip" width="23" height="12"/>
-        <image name="quality_tag" width="14" height="17"/>
         <image name="tenant_homePlay" width="20" height="20"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Home/View/MoreMusicPage/TenantMusicCollectionViewCell.xib

@@ -23,7 +23,7 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="10"/>
+                                <real key="value" value="16"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </view>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/TabbarController/InstitutionTabBarController.m

@@ -30,7 +30,7 @@
 
 - (void)configItems {
     NSArray *controllerArray = @[@"KSTenantHomeViewController",@"ChatViewController",@"InsititutionMineViewController"];
-    NSArray *titleArray = @[@"首页",@"聊天",@"我的"];
+    NSArray *titleArray = @[@"首页",@"通讯",@"我的"];
     NSArray *imageArray = @[@"tenant_tab_home_unselected",@"tenant_tab_chat_unselected",@"tetant_tab_mine_unselected"];
     NSArray *selectedImgArray = @[@"tenant_tab_home_selected",@"tenant_tab_chat_selected",@"tetant_tab_mine_selected"];
     NSMutableArray *ctrlArray = [NSMutableArray array];

KulexiuForStudent/KulexiuForStudent/Module/Chat/Controller/TXCustom/KSTXBaseChatViewController.m

@@ -129,9 +129,6 @@ static UIView *gCustomTopView;
     [self.navigationController pushViewController:detailCtrl animated:YES];
 }
 
-- (void)displayLiveView:(NSString *)liveRoomId {
-    
-}
 
 - (void)displayTeacherInfo:(NSString *)teacherId {
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];

KulexiuForStudent/KulexiuForStudent/Module/Chat/Search/KSChatSearchBar.m

@@ -141,8 +141,8 @@
     if (!_cancelButton) {
         _cancelButton = [[UIButton alloc] initWithFrame:CGRectZero];
         [_cancelButton setTitle:@"取消" forState:UIControlStateNormal];
-        [_cancelButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
-        _cancelButton.titleLabel.font = [UIFont systemFontOfSize:18.];
+        [_cancelButton setTitleColor:HexRGB(0x000000) forState:UIControlStateNormal];
+        _cancelButton.titleLabel.font = [UIFont systemFontOfSize:15.];
         [_cancelButton addTarget:self
                           action:@selector(cancelButtonClicked)
                 forControlEvents:UIControlEventTouchUpInside];

KulexiuForStudent/KulexiuForStudent/Module/Chat/Search/KSSearchResultListController.m

@@ -185,13 +185,6 @@ static NSString *const HFId = @"HFId";
                 if (cellModel.title.length > 0) {
                     title = cellModel.title;
                 }
-                NSDictionary *param = @{
-                    TUICore_TUIChatObjectFactory_ChatViewController_Title : title ?: @"",
-                    TUICore_TUIChatObjectFactory_ChatViewController_UserID : message.userID ?: @"",
-                    TUICore_TUIChatObjectFactory_ChatViewController_GroupID : message.groupID ?: @"",
-                    TUICore_TUIChatObjectFactory_ChatViewController_HighlightKeyword : self.searchBar.mySearchBar.text ?: @"",
-                    TUICore_TUIChatObjectFactory_ChatViewController_LocateMessage : message,
-                };
                 if (![NSString isEmptyString:message.userID]) { // 单聊
                 KSChatConversationViewController *ctrl = [[KSChatConversationViewController alloc] init];
                 ctrl.highlightKeyword = self.searchBar.mySearchBar.text;
@@ -220,13 +213,7 @@ static NSString *const HFId = @"HFId";
         NSArray *msgs = convInfo[kSearchChatHistoryConversationMsgs];
         if (msgs.count == 1) {
             NSString *title = cellModel.title ?: cellModel.titleAttributeString.string;
-            NSDictionary *param = @{
-                TUICore_TUIChatObjectFactory_ChatViewController_Title : title ?: @"",
-                TUICore_TUIChatObjectFactory_ChatViewController_UserID : conversation.userID ?: @"",
-                TUICore_TUIChatObjectFactory_ChatViewController_GroupID : conversation.groupID ?: @"",
-                TUICore_TUIChatObjectFactory_ChatViewController_HighlightKeyword : self.searchBar.mySearchBar.text ?: @"",
-                TUICore_TUIChatObjectFactory_ChatViewController_LocateMessage : msgs.firstObject,
-            };
+
             if (![NSString isEmptyString:conversation.userID]) { // 单聊
                 KSChatConversationViewController *ctrl = [[KSChatConversationViewController alloc] init];
                 ctrl.highlightKeyword = self.searchBar.mySearchBar.text;

KulexiuForStudent/KulexiuForStudent/Module/Chat/View/KSChatListSearchView.m

@@ -22,7 +22,7 @@
     [super awakeFromNib];
     self.searchField.delegate = self;
     self.searchField.tintColor = CLIENT_THEMECOLOR;
-    [self.searchButton setBackgroundColor:CLIENT_THEMECOLOR];
+    [self.searchButton setBackgroundColor:CLIENT_THEMEBUTTONCOLOR];
     [self.searchImg setImage:[UIImage imageNamed:CLIENT_SEARCH_IMG]];
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" 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="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,10 +21,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="388" height="774"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TEx-cD-ZR6">
-                                    <rect key="frame" x="0.0" y="0.0" width="388" height="505"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="388" height="525"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1nG-sZ-TOw">
-                                            <rect key="frame" x="0.0" y="0.0" width="388" height="505"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="388" height="525"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="将***********所绑定的账号注销" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KTf-hd-DqL">
                                                     <rect key="frame" x="66.5" y="98" width="255" height="25"/>
@@ -36,7 +36,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5vd-tZ-CWT">
-                                                    <rect key="frame" x="0.0" y="139" width="388" height="366"/>
+                                                    <rect key="frame" x="0.0" y="139" width="388" height="386"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7e-F8-dgF">
                                                             <rect key="frame" x="20" y="0.0" width="348" height="58.5"/>
@@ -119,7 +119,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="plu-48-YfS">
-                                                            <rect key="frame" x="34" y="154" width="334" height="43.5"/>
+                                                            <rect key="frame" x="34" y="164" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="2">
                                                                     <attributes>
@@ -162,7 +162,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="czQ-5I-E7e">
-                                                            <rect key="frame" x="34" y="307.5" width="334" height="43.5"/>
+                                                            <rect key="frame" x="34" y="327.5" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="3">
                                                                     <attributes>
@@ -196,7 +196,7 @@
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oHG-NB-zvk">
-                                                            <rect key="frame" x="20" y="162" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="172" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.99607843139999996" green="0.14117647059999999" blue="0.31764705879999999" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="dA2-vz-Te6"/>
@@ -209,7 +209,7 @@
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mjk-vg-mYk">
-                                                            <rect key="frame" x="20" y="315.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="335.5" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.99607843139999996" green="0.14117647059999999" blue="0.31764705879999999" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="AsH-zk-onh"/>
@@ -231,7 +231,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R0B-8J-ehG">
-                                                            <rect key="frame" x="34" y="203.5" width="334" height="94"/>
+                                                            <rect key="frame" x="34" y="213.5" width="334" height="94"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="( 1 ) ">
                                                                     <attributes>
@@ -354,7 +354,7 @@
                                                         <constraint firstItem="R0B-8J-ehG" firstAttribute="top" secondItem="plu-48-YfS" secondAttribute="bottom" constant="6" id="Kmg-Sa-cXN"/>
                                                         <constraint firstItem="6u6-Ma-2KR" firstAttribute="top" secondItem="1D8-dQ-4Em" secondAttribute="bottom" constant="10" id="P9Z-vx-vNA"/>
                                                         <constraint firstAttribute="trailing" secondItem="czQ-5I-E7e" secondAttribute="trailing" constant="20" id="RGt-dD-6zV"/>
-                                                        <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="R0B-8J-ehG" secondAttribute="bottom" constant="10" id="UvX-8O-e5n"/>
+                                                        <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="R0B-8J-ehG" secondAttribute="bottom" constant="20" id="UvX-8O-e5n"/>
                                                         <constraint firstItem="oHG-NB-zvk" firstAttribute="top" secondItem="plu-48-YfS" secondAttribute="top" constant="8" id="Vit-1L-bCk"/>
                                                         <constraint firstItem="plu-48-YfS" firstAttribute="leading" secondItem="oHG-NB-zvk" secondAttribute="trailing" constant="8" id="WNJ-Eg-TYh"/>
                                                         <constraint firstItem="6u6-Ma-2KR" firstAttribute="leading" secondItem="GBy-Z1-n96" secondAttribute="trailing" constant="8" id="XfW-lU-uJB"/>
@@ -363,7 +363,7 @@
                                                         <constraint firstItem="oHG-NB-zvk" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="aee-FV-u0M"/>
                                                         <constraint firstItem="mjk-vg-mYk" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="e6v-6g-4aM"/>
                                                         <constraint firstItem="1D8-dQ-4Em" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="g7Z-bS-nt6"/>
-                                                        <constraint firstItem="plu-48-YfS" firstAttribute="top" secondItem="6u6-Ma-2KR" secondAttribute="bottom" constant="10" id="hzW-RT-JQz"/>
+                                                        <constraint firstItem="plu-48-YfS" firstAttribute="top" secondItem="6u6-Ma-2KR" secondAttribute="bottom" constant="20" id="hzW-RT-JQz"/>
                                                         <constraint firstAttribute="trailing" secondItem="1D8-dQ-4Em" secondAttribute="trailing" constant="20" id="jla-H3-bfX"/>
                                                         <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="mjk-vg-mYk" secondAttribute="top" constant="-8" id="k8V-jQ-GSL"/>
                                                         <constraint firstAttribute="trailing" secondItem="R0B-8J-ehG" secondAttribute="trailing" constant="20" id="nNc-cc-Nft"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/ModifyBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" 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="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,10 +15,10 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QOV-21-4Ka">
-                    <rect key="frame" x="0.0" y="20" width="414" height="50"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="68"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="186****8274" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7cd-iF-RgI">
-                            <rect key="frame" x="12" y="13" width="116.5" height="24"/>
+                            <rect key="frame" x="12" y="22" width="116.5" height="24"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
@@ -27,12 +27,12 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="7cd-iF-RgI" firstAttribute="leading" secondItem="QOV-21-4Ka" secondAttribute="leading" constant="12" id="1en-70-5Y2"/>
-                        <constraint firstAttribute="height" constant="50" id="VDF-40-d0i"/>
+                        <constraint firstAttribute="height" constant="68" id="VDF-40-d0i"/>
                         <constraint firstItem="7cd-iF-RgI" firstAttribute="centerY" secondItem="QOV-21-4Ka" secondAttribute="centerY" id="pZI-6t-3ar"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0fg-wD-Jne">
-                    <rect key="frame" x="13" y="70" width="388" height="116"/>
+                    <rect key="frame" x="13" y="68" width="388" height="116"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ro-MD-Yyv">
                             <rect key="frame" x="0.0" y="0.0" width="388" height="58"/>
@@ -116,12 +116,12 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N5y-5I-mvN">
-                    <rect key="frame" x="28" y="226" width="358" height="50"/>
+                    <rect key="frame" x="28" y="224" width="358" height="50"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="ai0-tb-Eqs"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                     <state key="normal" title="确定"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -137,7 +137,7 @@
             <constraints>
                 <constraint firstItem="N5y-5I-mvN" firstAttribute="top" secondItem="0fg-wD-Jne" secondAttribute="bottom" constant="40" id="PYH-66-o8g"/>
                 <constraint firstItem="0fg-wD-Jne" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="R6f-UT-nG4"/>
-                <constraint firstItem="QOV-21-4Ka" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="SOB-zR-bVu"/>
+                <constraint firstItem="QOV-21-4Ka" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="SOB-zR-bVu"/>
                 <constraint firstAttribute="trailing" secondItem="N5y-5I-mvN" secondAttribute="trailing" constant="28" id="UFD-uE-PL8"/>
                 <constraint firstItem="N5y-5I-mvN" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="afJ-6B-8Vu"/>
                 <constraint firstItem="QOV-21-4Ka" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fpT-wq-bym"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/ModifyNameBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" 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="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,16 +14,16 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Nv-ef-xne">
-                    <rect key="frame" x="0.0" y="20" width="414" height="56"/>
+                    <rect key="frame" x="13" y="20" width="388" height="56"/>
                     <subviews>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入昵称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OMl-cn-8aR">
-                            <rect key="frame" x="14" y="0.0" width="350" height="56"/>
-                            <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <rect key="frame" x="14" y="0.0" width="324" height="56"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nwh-W6-YBV">
-                            <rect key="frame" x="374" y="8" width="40" height="40"/>
+                            <rect key="frame" x="348" y="8" width="40" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="40" id="8LK-BQ-Wtw"/>
                                 <constraint firstAttribute="height" constant="40" id="gKf-pk-YfV"/>
@@ -54,9 +54,9 @@
             </subviews>
             <color key="backgroundColor" red="0.96470588235294119" green="0.97254901960784312" blue="0.97647058823529409" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="2Nv-ef-xne" secondAttribute="trailing" id="1Pb-BI-W2x"/>
+                <constraint firstAttribute="trailing" secondItem="2Nv-ef-xne" secondAttribute="trailing" constant="13" id="1Pb-BI-W2x"/>
                 <constraint firstItem="2Nv-ef-xne" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="Jh2-mK-xVn"/>
-                <constraint firstItem="2Nv-ef-xne" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="SZK-Ns-VCT"/>
+                <constraint firstItem="2Nv-ef-xne" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="SZK-Ns-VCT"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -68,6 +68,6 @@
         </view>
     </objects>
     <resources>
-        <image name="modify_cancel" width="15" height="15"/>
+        <image name="modify_cancel" width="18" height="18"/>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PhoneCheckBodyView.xib

@@ -88,7 +88,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="Ur1-jX-Eqx"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                     <state key="normal" title="确定"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">

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

@@ -308,9 +308,6 @@
     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]) {
         return NO;
     }
-//    if ([touch.view isDescendantOfView:self.wBoardCtrl.wbView] || [touch.view isDescendantOfView:self.wBoardCtrl.customWebView] || [touch.view isDescendantOfView:self.containerView]) {
-//        [self tapGesture:(UITapGestureRecognizer *)gestureRecognizer];
-//    }
     return YES;
 }
 
@@ -583,9 +580,12 @@
         }
     }
     else {
-        if (type == DeviceTypeHandup) { // 摄像头
+        if (type == DeviceTypeHandup) {
             [self.videoListView updateUserVideo:member.userId];
         }
+        else if (type == DeviceTypeCamera) { // 摄像头
+            [self refreshVideoView:member];
+        }
 //        else if (type == DeviceTypeMicrophone) { // 麦克风
 //
 //        }

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/Service/TRTC/TXRTCService.m

@@ -114,7 +114,7 @@
     videoEncParams.videoResolution = TRTCVideoResolution_640_480;
     [[TRTCCloud sharedInstance] setVideoEncoderParam:videoEncParams];
     [[TRTCCloud sharedInstance] setGSensorMode:TRTCGSensorMode_UIFixLayout];
-    [[TRTCCloud sharedInstance] setVideoMuteImage:[self generalCloseImage] fps:5];
+//    [[TRTCCloud sharedInstance] setVideoMuteImage:[self generalCloseImage] fps:5];
     [self config3AWithANS:self.ANS AEC:self.AEC AGC:self.AGC];
 }
 

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/MainContainerView/TXClassroomMainContainer.m

@@ -112,6 +112,7 @@
     }
     
     if (member.cameraEnable) {
+
         self.closeCameraView.hidden = YES;
     }
     else {

KulexiuForStudent/KulexiuForStudent/Module/TXLive/Controller/TXLiveRoomViewController.m

@@ -637,6 +637,7 @@ static int clickPraiseBtnTimes  = 0;
 #pragma mark -- 加入直播间和退出直播间回到服务
 - (void)notiferJoinSuccessToServiceCallback:(void(^)(void))callback {
     [LiveModuleService LiveroomJoinRequest:KS_GET roomId:self.roomId success:^(NSDictionary * _Nonnull dic) {
+       
         NSTimeInterval enterTime = [dic ks_integerValueForKey:@"data"];
         self.enterTime = enterTime;
         NSDate *currentDate = [NSDate date];