Browse Source

文案和部分样式

Kyle Smart 6 months ago
parent
commit
aabc243d5c
17 changed files with 121 additions and 74 deletions
  1. 2 2
      KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme
  2. 22 0
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/Contents.json
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/warning_image_platform@2x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/warning_image_platform@3x.png
  5. 1 1
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/Controller/TenantNotiferCenterController.m
  6. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/Controller/KSChatListViewController.m
  7. 2 2
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m
  8. 6 7
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Model/GroupNoticeDetailModel.h
  9. 40 47
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Model/GroupNoticeDetailModel.m
  10. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeDetailBodyView.m
  11. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Course/Controller/CourseViewController.m
  12. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Controller/NotiferMessageViewController.m
  13. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackListViewController.m
  14. 4 0
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m
  15. 2 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.h
  16. 24 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.m
  17. 13 8
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.xib

+ 2 - 2
KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

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

+ 22 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/Contents.json

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

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/warning_image_platform@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/warning_image_platform.imageset/warning_image_platform@3x.png


+ 1 - 1
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/Controller/TenantNotiferCenterController.m

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

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/Controller/KSChatListViewController.m

@@ -49,7 +49,7 @@
         make.left.right.top.bottom.mas_equalTo(self.view);
     }];
     self.listVC.tableViewForAll.backgroundColor = [UIColor clearColor];
-    self.listVC.tableViewForAll.tipsMsgWhenNoConversation = @"暂无内容";
+    self.listVC.tableViewForAll.tipsMsgWhenNoConversation = @"暂无内容";
     [self.listVC.tableViewForAll.tipsView setImage:[UIImage imageNamed:CLIENT_EMPTY_IMG]];
     [self.listVC.tableViewContainer mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.left.right.mas_equalTo(self.listVC.view);

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m

@@ -42,7 +42,7 @@
 
 - (void)configUI {
     [self.view addSubview:self.tableView];
-    [self setPromptString:@"暂无群公告" imageName:CLIENT_EMPTY_IMG inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:CLIENT_EMPTY_IMG inView:self.tableView];
     MJWeakSelf;
     self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
         [weakSelf resetParamenter];
@@ -80,7 +80,7 @@
     self.rows = 10;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无群公告" imageName:CLIENT_EMPTY_IMG inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:CLIENT_EMPTY_IMG inView:self.tableView];
     [self.tableView reloadData];
 }
 

+ 6 - 7
KulexiuForStudent/KulexiuForStudent/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;

+ 40 - 47
KulexiuForStudent/KulexiuForStudent/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;

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/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];

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Course/Controller/CourseViewController.m

@@ -169,7 +169,7 @@
 }
 
 - (void)configEmptyView {
-    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
+    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
 //    MJWeakSelf;
 //    self.actionStatusView = [self setActionPromptString:@"暂无预约课程" buttonTitlle:@"发现课程" imageName:@"no_course" inView:self.tableView actionBlock:^{
 //        [weakSelf findCourse];

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Controller/NotiferMessageViewController.m

@@ -148,7 +148,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];
 }
 

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackListViewController.m

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

+ 4 - 0
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

@@ -58,6 +58,10 @@
     if ([UserDefault(TENANT_ID) integerValue] > 0) {
         CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
         [self.bodyView.sureButton.layer addSublayer:colorLayer];
+        self.bodyView.isTenant = YES;
+    }
+    else {
+        self.bodyView.isTenant = NO;
     }
 }
 

+ 2 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface DeleteAccountBodyView : UIView
 
+@property (nonatomic, assign) BOOL isTenant;
+
 @property (weak, nonatomic) IBOutlet UIView *lineView;
 
 @property (weak, nonatomic) IBOutlet UIButton *codeButton;
@@ -27,7 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)deleteAccountCallback:(DeleteAccountBlock)callback;
 
-
 @end
 
 NS_ASSUME_NONNULL_END

+ 24 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.m

@@ -8,6 +8,10 @@
 #import "DeleteAccountBodyView.h"
 
 @interface DeleteAccountBodyView ()<UITextFieldDelegate>
+
+@property (weak, nonatomic) IBOutlet UIImageView *warnImage;
+@property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
+
 @property (weak, nonatomic) IBOutlet UIView *container;
 
 @property (weak, nonatomic) IBOutlet UILabel *phoneDescLabel;
@@ -21,7 +25,7 @@
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *containerWidth;
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *containerHeight;
+@property (strong, nonatomic) IBOutletCollection(UIView) NSArray *dotsView;
 
 @end
 
@@ -35,6 +39,14 @@
     NSString *phoneDim = [self.phoneNo stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
     self.phoneDescLabel.text = [NSString stringWithFormat:@"将%@所绑定的账号注销",phoneDim];
     self.containerWidth.constant = KPortraitWidth - 26;
+    [self configDefault];
+}
+
+- (void)configDefault {
+    self.tipsLabel.textColor = CLIENT_THEMECOLOR;
+    for (UIView *subView in self.dotsView) {
+        subView.backgroundColor = CLIENT_THEMECOLOR;
+    }
 }
 
 + (instancetype)shareInstance {
@@ -93,4 +105,15 @@
     return YES;
 }
 
+- (void)setIsTenant:(BOOL)isTenant {
+    _isTenant = isTenant;
+    NSString *tipsImageName = @"";
+    if (isTenant) {
+        tipsImageName = @"warning_image";
+    }
+    else {
+        tipsImageName = @"warning_image_platform";
+    }
+    [self.warnImage setImage:[UIImage imageNamed:tipsImageName]];
+}
 @end

+ 13 - 8
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="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" 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="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <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="767"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TEx-cD-ZR6">
-                                    <rect key="frame" x="0.0" y="0.0" width="388" height="525"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="388" height="505.5"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1nG-sZ-TOw">
-                                            <rect key="frame" x="0.0" y="0.0" width="388" height="525"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="388" height="505.5"/>
                                             <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="386"/>
+                                                    <rect key="frame" x="0.0" y="139" width="388" height="366.5"/>
                                                     <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"/>
@@ -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="327.5" width="334" height="43.5"/>
+                                                            <rect key="frame" x="34" y="308" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="3">
                                                                     <attributes>
@@ -209,7 +209,7 @@
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mjk-vg-mYk">
-                                                            <rect key="frame" x="20" y="335.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="316" 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="213.5" width="334" height="94"/>
+                                                            <rect key="frame" x="34" y="213.5" width="334" height="74.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="( 1 ) ">
                                                                     <attributes>
@@ -532,6 +532,11 @@
                 <outlet property="phoneDescLabel" destination="KTf-hd-DqL" id="RxJ-6p-d9V"/>
                 <outlet property="scroll" destination="DMY-bn-wxE" id="d2d-a3-V91"/>
                 <outlet property="sureButton" destination="Qi7-Np-SbU" id="umV-3R-JTp"/>
+                <outlet property="tipsLabel" destination="1D8-dQ-4Em" id="egO-gC-5tj"/>
+                <outlet property="warnImage" destination="vNh-eW-Ega" id="ndy-ll-hhS"/>
+                <outletCollection property="dotsView" destination="GBy-Z1-n96" id="mxa-uf-QQB"/>
+                <outletCollection property="dotsView" destination="oHG-NB-zvk" id="Yeg-CP-6OL"/>
+                <outletCollection property="dotsView" destination="mjk-vg-mYk" id="4ko-9w-Z7A"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="96.763392857142847"/>
         </view>