yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-08-01 17:01:53 +08:00
parent d6ffba21ab
commit 487258c76e
6 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xplan-ios/Appdelegate/AppDelegate+ThirdConfig.m
View File

@@ -25,6 +25,7 @@
#import "XPWebViewController.h" #import "XPWebViewController.h"
#import "XPRoomViewController.h" #import "XPRoomViewController.h"
#import "XCCurrentVCStackManager.h" #import "XCCurrentVCStackManager.h"
#import <RPSDK/RPSDK.h>
UIKIT_EXTERN NSString * kYinyouPrivateKey; UIKIT_EXTERN NSString * kYinyouPrivateKey;
UIKIT_EXTERN NSString * adImageName; UIKIT_EXTERN NSString * adImageName;
@@ -40,6 +41,13 @@ UIKIT_EXTERN NSString * adImageName;
[self initEmojiData]; [self initEmojiData];
[self configBugly]; [self configBugly];
[self configQIYUSDK]; [self configQIYUSDK];
[self configCloudShield];
}
- (void)configCloudShield {
[RPSDK setup];
#if !TARGET_OS_SIMULATOR
// [RPSDK initialize:RPSDKEnvOnline]; //必须为RPSDKEnvOnline
#endif
} }
- (void)configShareSDK { - (void)configShareSDK {

5
xplan-ios/Main/Mine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m
View File

@@ -96,7 +96,7 @@
}]; }];
[self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(30); make.height.mas_equalTo(60);
}]; }];
[self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -112,7 +112,7 @@
self.avatarImageView.imageUrl = _userInfo.avatar; self.avatarImageView.imageUrl = _userInfo.avatar;
self.nickLabel.text = _userInfo.nick; self.nickLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo];
self.incomeLabel.text = [NSString getDealNumwithstring:_userInfo.totalGoldNum]; self.incomeLabel.text = _userInfo.totalGoldNum;
} }
} }
@@ -184,6 +184,7 @@
_incomeLabel = [[UILabel alloc] init]; _incomeLabel = [[UILabel alloc] init];
_incomeLabel.font = [UIFont boldSystemFontOfSize:14]; _incomeLabel.font = [UIFont boldSystemFontOfSize:14];
_incomeLabel.textColor = [ThemeColor mainTextColor]; _incomeLabel.textColor = [ThemeColor mainTextColor];
_incomeLabel.numberOfLines = 2;
} }
return _incomeLabel; return _incomeLabel;
} }

8
xplan-ios/Main/Mine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m
View File

@@ -81,7 +81,7 @@
[self.singleRoomIncomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.singleRoomIncomeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo((KScreenWidth - 52 - 45 - 90 - 10 * 4)/ 2); make.width.mas_equalTo((KScreenWidth - 52 - 45 - 90 - 10 * 4)/ 2);
make.height.mas_equalTo(30); make.height.mas_equalTo(60);
}]; }];
} }
@@ -92,8 +92,8 @@
self.avatarImageView.imageUrl = _userInfo.avatar; self.avatarImageView.imageUrl = _userInfo.avatar;
self.nickLabel.text = _userInfo.nick; self.nickLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo];
self.singleRoomIncomeLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring: _userInfo.anchorDiamondNum]]; self.singleRoomIncomeLabel.text = [NSString stringWithFormat:@"+%@", _userInfo.anchorDiamondNum];
self.roomIncomeLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumwithstring:_userInfo.roomDiamondNum]]; self.roomIncomeLabel.text = [NSString stringWithFormat:@"+%@", _userInfo.roomDiamondNum];
} }
} }
@@ -170,6 +170,7 @@
_singleRoomIncomeLabel = [[UILabel alloc] init]; _singleRoomIncomeLabel = [[UILabel alloc] init];
_singleRoomIncomeLabel.font = [UIFont boldSystemFontOfSize:14]; _singleRoomIncomeLabel.font = [UIFont boldSystemFontOfSize:14];
_singleRoomIncomeLabel.textColor = [ThemeColor mainTextColor]; _singleRoomIncomeLabel.textColor = [ThemeColor mainTextColor];
_singleRoomIncomeLabel.numberOfLines = 2;
} }
return _singleRoomIncomeLabel; return _singleRoomIncomeLabel;
} }
@@ -179,6 +180,7 @@
_roomIncomeLabel = [[UILabel alloc] init]; _roomIncomeLabel = [[UILabel alloc] init];
_roomIncomeLabel.font = [UIFont boldSystemFontOfSize:14]; _roomIncomeLabel.font = [UIFont boldSystemFontOfSize:14];
_roomIncomeLabel.textColor = [ThemeColor mainTextColor]; _roomIncomeLabel.textColor = [ThemeColor mainTextColor];
_roomIncomeLabel.numberOfLines = 2;
} }
return _roomIncomeLabel; return _roomIncomeLabel;
} }

5
xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m
View File

@@ -564,7 +564,10 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
} }
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.giftcollectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:currentPage inSection:0] atScrollPosition:UICollectionViewScrollPositionNone animated:YES]; if(currentPage < self.datasource.count){
[self.giftcollectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:currentPage inSection:0] atScrollPosition:UICollectionViewScrollPositionNone animated:YES];
}
}); });
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

4
xplan-ios/Main/RTC/RtcImpl/TRTCRtcImpl.m
View File

@@ -40,8 +40,8 @@
[self.engine enableAudioVolumeEvaluation:900]; [self.engine enableAudioVolumeEvaluation:900];
TRTCParams *params = [[TRTCParams alloc] init]; TRTCParams *params = [[TRTCParams alloc] init];
UInt32 appId; UInt32 appId;
NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcKey"]; NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"];
if(curTtcKey != nil){ if(curTtcKey != nil && curTtcKey.length > 0){
sscanf([curTtcKey UTF8String], "%u", &appId); sscanf([curTtcKey UTF8String], "%u", &appId);
}else{ }else{
sscanf([KeyWithType(KeyType_TRTC) UTF8String], "%u", &appId); sscanf([KeyWithType(KeyType_TRTC) UTF8String], "%u", &appId);

14
xplan-ios/Main/Tabbar/ClientConfig.m
View File

@@ -61,17 +61,17 @@
///开始下载 ///开始下载
[[XPRoomFaceTool shareFaceTool] downFaceData]; [[XPRoomFaceTool shareFaceTool] downFaceData];
} }
NSString *trtcKey = initData[@"trtcKey"]; NSString *trtcAppId = initData[@"trtcAppId"];
NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcKey"]; NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"];
if(curTtcKey == nil){ if(curTtcKey == nil){
if(trtcKey != nil){ if(trtcAppId != nil){
[[NSUserDefaults standardUserDefaults]setValue:trtcKey forKey:@"kTrtcKey"]; [[NSUserDefaults standardUserDefaults]setValue:trtcAppId forKey:@"kTrtcAppId"];
[[NSUserDefaults standardUserDefaults]synchronize]; [[NSUserDefaults standardUserDefaults]synchronize];
} }
}else{ }else{
if(![trtcKey isEqualToString:curTtcKey]){ if(![trtcAppId isEqualToString:curTtcKey]){
if(trtcKey != nil){ if(trtcAppId != nil){
[[NSUserDefaults standardUserDefaults]setValue:trtcKey forKey:@"kTrtcKey"]; [[NSUserDefaults standardUserDefaults]setValue:trtcAppId forKey:@"kTrtcAppId"];
[[NSUserDefaults standardUserDefaults]synchronize]; [[NSUserDefaults standardUserDefaults]synchronize];
} }
} }