文案

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 = "DEV"
+      buildConfiguration = "TEST"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeDetailViewController.m

@@ -72,7 +72,7 @@
     point.y = CGRectGetMaxY(pointViewRect) - 6.5;
     KSPopView *popView = [KSPopView shareInstance];
     GroupNoticeDetailModel *model = source;
-    popView.isNoticeTop = model.isTop;
+    popView.isNoticeTop = model.topFlag;
     MJWeakSelf;
     [popView showPopToView:point callBack:^(KSPOP_TAG tag) {
         [weakSelf popAction:tag source:source];
@@ -120,12 +120,12 @@
 - (void)editNotice:(id)source {
     GroupNoticeDetailModel *model = source;
     GroupNoticeEditController *editVC = [[GroupNoticeEditController alloc] init];
-    editVC.groupId = model.imGroupId;
+    editVC.groupId = model.groupId;
     editVC.isModify = YES;
     editVC.titles = model.title;
     editVC.content = model.content;
     editVC.noticeID = model.internalBaseClassIdentifier;
-    editVC.isOn = model.isTop == 1 ? YES : NO;
+    editVC.isOn = model.topFlag == 1 ? YES : NO;
     [self.navigationController pushViewController:editVC animated:YES];
 }
 
@@ -133,14 +133,14 @@
     GroupNoticeDetailModel *model = source;
     NSString *isTop = nil;
     // 取反
-    if (model.isTop == YES) {
+    if (model.topFlag == YES) {
         isTop = @"0";
     }
     else {
         isTop = @"1";
     }
     
-    [KSNetworkingManager imGroupNoticeUpdateRequest:KS_POST groupId:self.sourceModel.imGroupId title:model.title content:model.content isTop:isTop noticeID:model.internalBaseClassIdentifier success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager imGroupNoticeUpdateRequest:KS_POST groupId:self.sourceModel.groupId title:model.title content:model.content isTop:isTop noticeID:model.internalBaseClassIdentifier success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             [self requestData];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m

@@ -82,7 +82,7 @@
     self.rows = 10;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无群公告" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Model/GroupNoticeDetailModel.h

@@ -12,20 +12,19 @@
 @interface GroupNoticeDetailModel : NSObject <NSCoding, NSCopying>
 
 @property (nonatomic, strong) NSString *internalBaseClassIdentifier;
-@property (nonatomic, strong) NSString *updateTime;
+@property (nonatomic, strong) NSString *content;
 @property (nonatomic, assign) BOOL delFlag;
 @property (nonatomic, strong) NSString *clientType;
-@property (nonatomic, assign) BOOL isSentToNewMember;
-@property (nonatomic, strong) NSString *imGroupId;
-@property (nonatomic, assign) double tenantId;
+@property (nonatomic, assign) BOOL sentToNewMemberFlag;
 @property (nonatomic, strong) NSString *title;
 @property (nonatomic, strong) NSString *avatar;
 @property (nonatomic, strong) NSString *createTime;
 @property (nonatomic, strong) NSString *username;
-@property (nonatomic, assign) double operatorId;
-@property (nonatomic, assign) BOOL isTop;
+@property (nonatomic, strong) NSString *operatorId;
+@property (nonatomic, strong) NSString *groupId;
 @property (nonatomic, strong) NSString *messageSeqId;
-@property (nonatomic, strong) NSString *content;
+@property (nonatomic, assign) BOOL topFlag;
+@property (nonatomic, strong) NSString *updateTime;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/Model/GroupNoticeDetailModel.m

@@ -9,20 +9,19 @@
 
 
 NSString *const kGroupNoticeDetailModelId = @"id";
-NSString *const kGroupNoticeDetailModelUpdateTime = @"updateTime";
+NSString *const kGroupNoticeDetailModelContent = @"content";
 NSString *const kGroupNoticeDetailModelDelFlag = @"delFlag";
 NSString *const kGroupNoticeDetailModelClientType = @"clientType";
-NSString *const kGroupNoticeDetailModelIsSentToNewMember = @"isSentToNewMember";
-NSString *const kGroupNoticeDetailModelImGroupId = @"imGroupId";
-NSString *const kGroupNoticeDetailModelTenantId = @"tenantId";
+NSString *const kGroupNoticeDetailModelSentToNewMemberFlag = @"sentToNewMemberFlag";
 NSString *const kGroupNoticeDetailModelTitle = @"title";
 NSString *const kGroupNoticeDetailModelAvatar = @"avatar";
 NSString *const kGroupNoticeDetailModelCreateTime = @"createTime";
 NSString *const kGroupNoticeDetailModelUsername = @"username";
 NSString *const kGroupNoticeDetailModelOperatorId = @"operatorId";
-NSString *const kGroupNoticeDetailModelIsTop = @"isTop";
+NSString *const kGroupNoticeDetailModelGroupId = @"groupId";
 NSString *const kGroupNoticeDetailModelMessageSeqId = @"messageSeqId";
-NSString *const kGroupNoticeDetailModelContent = @"content";
+NSString *const kGroupNoticeDetailModelTopFlag = @"topFlag";
+NSString *const kGroupNoticeDetailModelUpdateTime = @"updateTime";
 
 
 @interface GroupNoticeDetailModel ()
@@ -34,20 +33,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
 @implementation GroupNoticeDetailModel
 
 @synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
-@synthesize updateTime = _updateTime;
+@synthesize content = _content;
 @synthesize delFlag = _delFlag;
 @synthesize clientType = _clientType;
-@synthesize isSentToNewMember = _isSentToNewMember;
-@synthesize imGroupId = _imGroupId;
-@synthesize tenantId = _tenantId;
+@synthesize sentToNewMemberFlag = _sentToNewMemberFlag;
 @synthesize title = _title;
 @synthesize avatar = _avatar;
 @synthesize createTime = _createTime;
 @synthesize username = _username;
 @synthesize operatorId = _operatorId;
-@synthesize isTop = _isTop;
+@synthesize groupId = _groupId;
 @synthesize messageSeqId = _messageSeqId;
-@synthesize content = _content;
+@synthesize topFlag = _topFlag;
+@synthesize updateTime = _updateTime;
 
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
@@ -63,20 +61,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
     // passed into the model class doesn't break the parsing.
     if(self && [dict isKindOfClass:[NSDictionary class]]) {
             self.internalBaseClassIdentifier = [self objectOrNilForKey:kGroupNoticeDetailModelId fromDictionary:dict];
-            self.updateTime = [self objectOrNilForKey:kGroupNoticeDetailModelUpdateTime fromDictionary:dict];
+            self.content = [self objectOrNilForKey:kGroupNoticeDetailModelContent fromDictionary:dict];
             self.delFlag = [[self objectOrNilForKey:kGroupNoticeDetailModelDelFlag fromDictionary:dict] boolValue];
             self.clientType = [self objectOrNilForKey:kGroupNoticeDetailModelClientType fromDictionary:dict];
-            self.isSentToNewMember = [[self objectOrNilForKey:kGroupNoticeDetailModelIsSentToNewMember fromDictionary:dict] boolValue];
-            self.imGroupId = [self objectOrNilForKey:kGroupNoticeDetailModelImGroupId fromDictionary:dict];
-            self.tenantId = [[self objectOrNilForKey:kGroupNoticeDetailModelTenantId fromDictionary:dict] doubleValue];
+            self.sentToNewMemberFlag = [[self objectOrNilForKey:kGroupNoticeDetailModelSentToNewMemberFlag fromDictionary:dict] boolValue];
             self.title = [self objectOrNilForKey:kGroupNoticeDetailModelTitle fromDictionary:dict];
             self.avatar = [self objectOrNilForKey:kGroupNoticeDetailModelAvatar fromDictionary:dict];
             self.createTime = [self objectOrNilForKey:kGroupNoticeDetailModelCreateTime fromDictionary:dict];
             self.username = [self objectOrNilForKey:kGroupNoticeDetailModelUsername fromDictionary:dict];
-            self.operatorId = [[self objectOrNilForKey:kGroupNoticeDetailModelOperatorId fromDictionary:dict] doubleValue];
-            self.isTop = [[self objectOrNilForKey:kGroupNoticeDetailModelIsTop fromDictionary:dict] boolValue];
+            self.operatorId = [self objectOrNilForKey:kGroupNoticeDetailModelOperatorId fromDictionary:dict];
+            self.groupId = [self objectOrNilForKey:kGroupNoticeDetailModelGroupId fromDictionary:dict];
             self.messageSeqId = [self objectOrNilForKey:kGroupNoticeDetailModelMessageSeqId fromDictionary:dict];
-            self.content = [self objectOrNilForKey:kGroupNoticeDetailModelContent fromDictionary:dict];
+            self.topFlag = [[self objectOrNilForKey:kGroupNoticeDetailModelTopFlag fromDictionary:dict] boolValue];
+            self.updateTime = [self objectOrNilForKey:kGroupNoticeDetailModelUpdateTime fromDictionary:dict];
 
     }
     
@@ -88,20 +85,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
 {
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setValue:self.internalBaseClassIdentifier forKey:kGroupNoticeDetailModelId];
-    [mutableDict setValue:self.updateTime forKey:kGroupNoticeDetailModelUpdateTime];
+    [mutableDict setValue:self.content forKey:kGroupNoticeDetailModelContent];
     [mutableDict setValue:[NSNumber numberWithBool:self.delFlag] forKey:kGroupNoticeDetailModelDelFlag];
     [mutableDict setValue:self.clientType forKey:kGroupNoticeDetailModelClientType];
-    [mutableDict setValue:[NSNumber numberWithBool:self.isSentToNewMember] forKey:kGroupNoticeDetailModelIsSentToNewMember];
-    [mutableDict setValue:self.imGroupId forKey:kGroupNoticeDetailModelImGroupId];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.tenantId] forKey:kGroupNoticeDetailModelTenantId];
+    [mutableDict setValue:[NSNumber numberWithBool:self.sentToNewMemberFlag] forKey:kGroupNoticeDetailModelSentToNewMemberFlag];
     [mutableDict setValue:self.title forKey:kGroupNoticeDetailModelTitle];
     [mutableDict setValue:self.avatar forKey:kGroupNoticeDetailModelAvatar];
     [mutableDict setValue:self.createTime forKey:kGroupNoticeDetailModelCreateTime];
     [mutableDict setValue:self.username forKey:kGroupNoticeDetailModelUsername];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.operatorId] forKey:kGroupNoticeDetailModelOperatorId];
-    [mutableDict setValue:[NSNumber numberWithBool:self.isTop] forKey:kGroupNoticeDetailModelIsTop];
+    [mutableDict setValue:self.operatorId forKey:kGroupNoticeDetailModelOperatorId];
+    [mutableDict setValue:self.groupId forKey:kGroupNoticeDetailModelGroupId];
     [mutableDict setValue:self.messageSeqId forKey:kGroupNoticeDetailModelMessageSeqId];
-    [mutableDict setValue:self.content forKey:kGroupNoticeDetailModelContent];
+    [mutableDict setValue:[NSNumber numberWithBool:self.topFlag] forKey:kGroupNoticeDetailModelTopFlag];
+    [mutableDict setValue:self.updateTime forKey:kGroupNoticeDetailModelUpdateTime];
 
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
@@ -130,20 +126,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
     self = [super init];
 
     self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelId];
-    self.updateTime = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelUpdateTime];
+    self.content = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelContent];
     self.delFlag = [aDecoder decodeBoolForKey:kGroupNoticeDetailModelDelFlag];
     self.clientType = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelClientType];
-    self.isSentToNewMember = [aDecoder decodeBoolForKey:kGroupNoticeDetailModelIsSentToNewMember];
-    self.imGroupId = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelImGroupId];
-    self.tenantId = [aDecoder decodeDoubleForKey:kGroupNoticeDetailModelTenantId];
+    self.sentToNewMemberFlag = [aDecoder decodeBoolForKey:kGroupNoticeDetailModelSentToNewMemberFlag];
     self.title = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelTitle];
     self.avatar = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelAvatar];
     self.createTime = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelCreateTime];
     self.username = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelUsername];
-    self.operatorId = [aDecoder decodeDoubleForKey:kGroupNoticeDetailModelOperatorId];
-    self.isTop = [aDecoder decodeBoolForKey:kGroupNoticeDetailModelIsTop];
+    self.operatorId = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelOperatorId];
+    self.groupId = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelGroupId];
     self.messageSeqId = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelMessageSeqId];
-    self.content = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelContent];
+    self.topFlag = [aDecoder decodeBoolForKey:kGroupNoticeDetailModelTopFlag];
+    self.updateTime = [aDecoder decodeObjectForKey:kGroupNoticeDetailModelUpdateTime];
     return self;
 }
 
@@ -151,20 +146,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
 {
 
     [aCoder encodeObject:_internalBaseClassIdentifier forKey:kGroupNoticeDetailModelId];
-    [aCoder encodeObject:_updateTime forKey:kGroupNoticeDetailModelUpdateTime];
+    [aCoder encodeObject:_content forKey:kGroupNoticeDetailModelContent];
     [aCoder encodeBool:_delFlag forKey:kGroupNoticeDetailModelDelFlag];
     [aCoder encodeObject:_clientType forKey:kGroupNoticeDetailModelClientType];
-    [aCoder encodeBool:_isSentToNewMember forKey:kGroupNoticeDetailModelIsSentToNewMember];
-    [aCoder encodeObject:_imGroupId forKey:kGroupNoticeDetailModelImGroupId];
-    [aCoder encodeDouble:_tenantId forKey:kGroupNoticeDetailModelTenantId];
+    [aCoder encodeBool:_sentToNewMemberFlag forKey:kGroupNoticeDetailModelSentToNewMemberFlag];
     [aCoder encodeObject:_title forKey:kGroupNoticeDetailModelTitle];
     [aCoder encodeObject:_avatar forKey:kGroupNoticeDetailModelAvatar];
     [aCoder encodeObject:_createTime forKey:kGroupNoticeDetailModelCreateTime];
     [aCoder encodeObject:_username forKey:kGroupNoticeDetailModelUsername];
-    [aCoder encodeDouble:_operatorId forKey:kGroupNoticeDetailModelOperatorId];
-    [aCoder encodeBool:_isTop forKey:kGroupNoticeDetailModelIsTop];
+    [aCoder encodeObject:_operatorId forKey:kGroupNoticeDetailModelOperatorId];
+    [aCoder encodeObject:_groupId forKey:kGroupNoticeDetailModelGroupId];
     [aCoder encodeObject:_messageSeqId forKey:kGroupNoticeDetailModelMessageSeqId];
-    [aCoder encodeObject:_content forKey:kGroupNoticeDetailModelContent];
+    [aCoder encodeBool:_topFlag forKey:kGroupNoticeDetailModelTopFlag];
+    [aCoder encodeObject:_updateTime forKey:kGroupNoticeDetailModelUpdateTime];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -174,20 +168,19 @@ NSString *const kGroupNoticeDetailModelContent = @"content";
     if (copy) {
 
         copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
-        copy.updateTime = [self.updateTime copyWithZone:zone];
+        copy.content = [self.content copyWithZone:zone];
         copy.delFlag = self.delFlag;
         copy.clientType = [self.clientType copyWithZone:zone];
-        copy.isSentToNewMember = self.isSentToNewMember;
-        copy.imGroupId = [self.imGroupId copyWithZone:zone];
-        copy.tenantId = self.tenantId;
+        copy.sentToNewMemberFlag = self.sentToNewMemberFlag;
         copy.title = [self.title copyWithZone:zone];
         copy.avatar = [self.avatar copyWithZone:zone];
         copy.createTime = [self.createTime copyWithZone:zone];
         copy.username = [self.username copyWithZone:zone];
-        copy.operatorId = self.operatorId;
-        copy.isTop = self.isTop;
+        copy.operatorId = [self.operatorId copyWithZone:zone];
+        copy.groupId = [self.groupId copyWithZone:zone];
         copy.messageSeqId = [self.messageSeqId copyWithZone:zone];
-        copy.content = [self.content copyWithZone:zone];
+        copy.topFlag = self.topFlag;
+        copy.updateTime = [self.updateTime copyWithZone:zone];
     }
     
     return copy;

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/GroupNotice/View/GroupNoticeDetailBodyView.m

@@ -39,7 +39,7 @@
         self.userName.text = [NSString returnNoNullStringWithString:model.username];
         [self.userLogo sd_setImageWithURL:[NSURL URLWithString:model.avatar] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
         self.noticeTitle.text = [NSString returnNoNullStringWithString:model.title];
-        self.focusLabel.hidden = model.isTop ? NO : YES;
+        self.focusLabel.hidden = model.topFlag ? NO : YES;
         self.modifyTime.text = [NSString returnNoNullStringWithString:model.updateTime];
         
         self.noticeContent.text = [NSString returnNoNullStringWithString:model.content];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m

@@ -127,7 +127,7 @@
     
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.tableView];
+    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.m

@@ -121,7 +121,7 @@
     
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.tableView];
+    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m

@@ -94,7 +94,7 @@
     self.audioStatus = @"PASS";
     self.dataArray = [NSMutableArray array];
     [self.collectionView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.collectionView];
+    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.collectionView];
     [self.collectionView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -155,7 +155,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无消息～" imageName:@"empty_message" inView:self.tableView];
+    [self setPromptString:@"暂无消息" imageName:@"empty_message" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Feedback/Controller/FeedbackListViewController.m

@@ -117,7 +117,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无内容～" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }