修正英语文案 调整公聊滚动展示区域首次展示的效果

YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m

@@ -69,13 +69,12 @@ static const CGFloat ktimerSec = 0.01;
 }
 
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
-    return UIEdgeInsetsMake(0, 0, 0, 0);;
+    return UIEdgeInsetsMake(0, 0, 0, 0);
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     if(indexPath.row == 0){
-        
-        return CGSizeMake(KScreenWidth, kGetScaleWidth(80));
+        return CGSizeMake(KScreenWidth/2, kGetScaleWidth(80));
     }
     MSSessionScrollingModel *model = [self.modelList xpSafeObjectAtIndex:indexPath.row-1];
     return CGSizeMake(model.width + kGetScaleWidth(32.5), kGetScaleWidth(27));
@@ -86,17 +85,8 @@ static const CGFloat ktimerSec = 0.01;
 }
 - (void)setModelList:(NSMutableArray *)modelList{
     _modelList = modelList;
-    @kWeakify(self);
-    _timer = [NSTimer timerWithTimeInterval:ktimerSec repeats:YES block:^(NSTimer * _Nonnull timer) {
-        @kStrongify(self);
-        self.collectionView.contentOffset = CGPointMake(self.collectionView.contentOffset.x + 0.5, 0);
-        CGFloat width = self.collectionView.contentSize.width + 5;
-        if(self.collectionView.contentOffset.x > width){
-            self.collectionView.contentOffset = CGPointMake(0, 0);
-        }
-    }];
-    [[NSRunLoop currentRunLoop]addTimer:_timer forMode:NSRunLoopCommonModes];
     [self.collectionView reloadData];
+    [self resumeAnimation];
 }
 #pragma mark -- 生命周期方法
 
@@ -105,7 +95,6 @@ static const CGFloat ktimerSec = 0.01;
         [self.timer invalidate];
         self.timer = nil;
     }
-   
 }
 #pragma mark -- 接口
 /// 暂停

YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m

@@ -77,7 +77,7 @@
         model.width = layout.textBoundingSize.width;
         model.attribute = attribute;
     }
-    
+
     self.scrollingView.modelList = [[NSMutableArray alloc]initWithArray:list];
 }
 #pragma mark - Private Method
@@ -170,8 +170,7 @@
     }else{
         return self.fansVC;
     }
-    
-    
+
     return (id <JXPagerViewListViewDelegate>)viewController;
 }
 - (NSArray<NSString *> *)titles {
@@ -189,11 +188,13 @@
     MSSessionPublicChatHallVC *vc =[MSSessionPublicChatHallVC new];
     [self.navigationController pushViewController:vc animated:YES];
 }
+
 -(NSTimeInterval)curTime {
     static double time = 0;
     time += 0.1 ;
     return time;
 }
+
 #pragma mark -懒加载
 - (JXCategoryTitleView *)titleView {
     if (!_titleView) {

YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m

@@ -37,7 +37,6 @@
     [super viewDidLoad];
     [self showLoading];
     if(self.type == 0){
-        
         [self.presenter getGuildListData];
     }else{
         [self.presenter getRoomListData];

YuMi/en.lproj/Localizable.strings

@@ -690,10 +690,10 @@
 "XPMineDressUpListViewController5" = "Nameplate used successfully";
 "XPMineDressUpListViewController7" = "Information card used successfully";
 "XPMineDressUpListViewController10" = "Dear user, you don't have any nameplates yet!";
-"XPMineDressUpListViewController11" = "Dear user, you don't have any headwear yet!";
-"XPMineDressUpListViewController12" = "Dear user, you don't have any vehicles yet!";
+"XPMineDressUpListViewController11" = "Dear user, you don't have any avatar frame yet!";
+"XPMineDressUpListViewController12" = "Dear user, you don't have any mount yet!";
 
-"XPDressUpShopViewController0" = "My Dress Up";
+"XPDressUpShopViewController0" = "Mine";
 "XPDressUpShopViewController1" = "Mall";
 "XPDressUpShopViewController6" = "Chat Bubbles";
 "XPDressUpShopViewController7" = "My Coins";
@@ -2654,7 +2654,7 @@
 "XPMineGuildViewController9" = "Requires room owner approval";
 "XPMineGuildViewController10" = "Exiting will dissolve the relationship, this operation is %@, are you sure you want to exit?";
 "XPMineGuildViewController11" = "Exit Room";
-"XPMineGuildViewController12" = "Join Guild";
+"XPMineGuildViewController12" = "Join Agency";
 
 ///XPGuildSuperAdminMenuView.m
 "XPGuildSuperAdminMenuView0" = "Set Managed Rooms";
@@ -2881,14 +2881,14 @@
 "XPMineGuildListVC3" = "No relevant rooms found";
 "XPMineGuildListVC4" = "Application submitted successfully, you will be able to join the room after approval";
 "XPMineGuildListVC5"="Prompt";
-"XPMineGuildListVC6"="Confirm to join guild\n%@";
+"XPMineGuildListVC6"="Confirm to join agency\n%@";
 
 ///XPMineTheGuildCell.m
-"XPMineTheGuildCell0" = "Guild · Room";
-"XPMineTheGuildCell1" = "Join Guild";
+"XPMineTheGuildCell0" = "Agnecy · Room";
+"XPMineTheGuildCell1" = "Join Agency";
 
 ///XPMineGiveDiamondVC
-"XPMineGiveDiamondVC0" = "My Gifting";
+"XPMineGiveDiamondVC0" = "Coins Gifting";
 "XPMineGiveDiamondVC1"="Gifting Records";
 "XPMineGiveDiamondVC2"="Only displaying records for the last three months";
 "XPMineGiveDiamondVC3"="No gifting records available";
@@ -3435,7 +3435,7 @@
 ///XPSessionMainViewController.m
 "XPSessionMainViewController0" = "Messages";
 "XPSessionMainViewController1" = "Friends";
-"XPSessionMainViewController2" = "Follows";
+"XPSessionMainViewController2" = "Following";
 "XPSessionMainViewController3" = "Fans";
 ///XPFreeGiftsObtainView
 "XPFreeGiftsObtainView0"="Got It";
@@ -3603,9 +3603,9 @@
 //MSRoomGameWebVC
 "MSRoomGameWebVC0"="Are you sure you want to exit the game?";
 ///MSSessionPublicChatHallVC
-"MSSessionPublicChatHallVC0"="Chating";
+"MSSessionPublicChatHallVC0"="Chatting";
 "MSSessionPublicChatHallVC1"="I want headlines~";
-"MSSessionPublicChatHallVC2"="Chating";
+"MSSessionPublicChatHallVC2"="Chatting";
 ///MSSessionReleaseHeadlinesView
 "MSSessionReleaseHeadlinesView0"="Enter your headline content~ (100 characters max)";
 "MSSessionReleaseHeadlinesView1"=" %@ makes headlines";