Compare commits

...

8 Commits

Author SHA1 Message Date
liyuhua
9cedfc0408 商店包版本修改 此commit置顶 10.12 2023-08-08 11:27:09 +08:00
liyuhua
25fe36f693 修复bug 2023-08-07 10:28:29 +08:00
liyuhua
948f81dc37 修复bug 2023-08-04 17:40:16 +08:00
liyuhua
16315040b0 修复bug 2023-08-04 15:34:52 +08:00
liyuhua
20458f8f31 修复bug 2023-08-04 11:47:43 +08:00
liyuhua
dba85043bc 修复bug 2023-07-31 11:46:41 +08:00
liyuhua
01ce491831 修复bug 2023-07-24 10:09:08 +08:00
liyuhua
447b189d4f 优化。修复bug 2023-07-21 18:53:10 +08:00
121 changed files with 1210 additions and 665 deletions

View File

@@ -65,7 +65,7 @@ target 'YuMi' do
pod 'ZLCollectionViewFlowLayout'
pod 'WMZDropDownMenu'
pod 'TABAnimated'
pod 'YuMi',:path=>'yum'
end
post_install do |installer|

View File

@@ -176,6 +176,7 @@
23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; };
23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */; };
23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */; };
23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */; };
73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; };
9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
@@ -1582,6 +1583,8 @@
23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordViewController.h; sourceTree = "<group>"; };
23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseAnimationViewModel.h; sourceTree = "<group>"; };
23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseAnimationViewModel.m; sourceTree = "<group>"; };
23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineGuildItemView.h; sourceTree = "<group>"; };
23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineGuildItemView.m; sourceTree = "<group>"; };
7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = "<group>"; };
9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = "<group>"; };
9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
@@ -6756,6 +6759,8 @@
E85E7AAE2A4EB0D200B6D00A /* XPNewGuildTimePickView.m */,
E85E7B702A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.h */,
E85E7B712A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.m */,
23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */,
23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */,
);
path = SubViews;
sourceTree = "<group>";
@@ -9669,6 +9674,7 @@
18E7B26926E8D5D60064BC9B /* XCCurrentVCStackManager.m in Sources */,
E85E7B472A4EB0D300B6D00A /* XPMineGuildManagerPerTableViewCell.m in Sources */,
E824544326F58FCE00BE8163 /* XPMinePayPwdInputView.m in Sources */,
23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */,
9B1B72A1280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m in Sources */,
1808073027315E8E001FD836 /* NetImageView.m in Sources */,
E880B3AC278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m in Sources */,
@@ -10448,7 +10454,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 10.9;
MARKETING_VERSION = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -10481,7 +10487,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 10.9;
MARKETING_VERSION = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

View File

@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "1024.png",
"filename" : "10241024.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -10,6 +10,7 @@
"scale" : "2x"
},
{
"filename" : "common_avatar@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -46,7 +46,7 @@ NSString * const URLWithType(URLType type) {
@(kReportRoomURL) : @"TbIA4vIU9O5Z/RGJKEELZNe7SFzF9ig/Lvo6D1upv/g=",///
@(kShareRoomURL) : @"k+TyUH/PriZr4MWmS/rq8BUYAu34MX3ZyAZsDLF0Eck=",/// modules/share_room/index.html
@(kCandyTreeURL) : @"uGP8LbEVEzTWPSSD357NnkHsXf118dGp9qeZO+8idY4=",/// activity/explore/index.html
@(kCandyTreeRuleURL) : @"V6XAvR9DZVl5TTczQ/JABNYrR8ebdHwSCqNvO+lcxDl8aiBlq4Dt1BNO3V+65Q4B",/// modules/rank/index.html#/wishingWellRule
@(kCandyTreeRuleURL) : @"modules/rule/newWishingWellRule.html",/// modules/rank/index.html#/wishingWellRule
@(kCandyTreeRecordURL) : @"V6XAvR9DZVl5TTczQ/JABDNKGpFSnSP/r6WLbu91uPKWKlwVlmlYvkETALeLk7Jz",/// modules/rank/index.html#/newWishingWellRecord
@(kRoomCharmRankURL) : @"a5qVnItWuLLh148cl8R/+VuVNfOSOd1nzVzfSFbAxUA=",// modules/charm/index.html
@(kRoomRankURL) : @"DqPWO/9EdbpkGl4PoRVQy4+hE8o8EuE30v2vN/yeZFg=", // modules/room_rank/index.html

View File

@@ -108,7 +108,7 @@
//
[[RACSignal combineLatest:@[self.phoneTextField.rac_textSignal]
reduce:^id(NSString *phone){
BOOL enable = phone.length == 11;
BOOL enable = phone.length > 0;
return @(enable);
}] subscribeNext:^(NSNumber *enable) {
@strongify(self)

View File

@@ -87,7 +87,7 @@
- (void)racBind {
RAC(self.sureBtn, enabled) = [[RACSignal combineLatest:@[self.phoneInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString* smsCode, NSString *password){
return @((phone.length == 11) && smsCode.length >= 5 && (password.length >= 6 && password.length <= 16));
return @((phone.length > 0) && smsCode.length >= 5 && (password.length >= 6 && password.length <= 16));
}] takeUntil:self.rac_willDeallocSignal];
}
@@ -103,7 +103,7 @@
- (void)smsCodeAction {
NSString *phone = self.phoneInputView.inputTextField.text;
if (phone.length != 11 ) {
if (phone.length <= 0) {
[self showErrorToast:YMLocalizedString(@"XPForgetPwdViewController0")];
return;
}

View File

@@ -194,7 +194,7 @@
- (UIButton *)findButton {
if (!_findButton) {
_findButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_findButton setTitle:@"去找TA" forState:UIControlStateNormal];
[_findButton setTitle:YMLocalizedString(@"XPSessionFindNewAlertView2") forState:UIControlStateNormal];
[_findButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal];
_findButton.titleLabel.font = [UIFont systemFontOfSize:14];
[_findButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];

View File

@@ -164,7 +164,7 @@
listView.delegate = self;
[TTPopup popupView:listView style:TTPopupStyleActionSheet];
} else {
[self showErrorToast:@"该用户被打招呼次数太多了,换一个吧~"];
[self showErrorToast:YMLocalizedString(@"XPSessionFindNewViewController0")];
}
}

View File

@@ -34,7 +34,7 @@
[dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
NIMVideoObject *videoObject = [[NIMVideoObject alloc] initWithSourcePath:filePath scene:NIMNOSSceneTypeMessage];
videoObject.displayName = [NSString stringWithFormat:@"视频发送于%@", dateString];
videoObject.displayName = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"NIMMessageMaker1"),dateString];
NIMMessage *message = [[NIMMessage alloc] init];
message.messageObject = videoObject;
message.apnsContent = YMLocalizedString(@"NIMMessageMaker2");
@@ -68,7 +68,7 @@
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
imageObject.displayName = [NSString stringWithFormat:@"图片发送于%@", dateString];
imageObject.displayName = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"NIMMessageMaker3"), dateString];
NIMMessage *message = [[NIMMessage alloc] init];
message.messageObject = imageObject;
message.apnsContent = YMLocalizedString(@"NIMMessageMaker4");

View File

@@ -20,19 +20,19 @@
text = message.text;
break;
case NIMMessageTypeAudio:
text = @"[语音]";
text = YMLocalizedString(@"NIMMessageUtils0");
break;
case NIMMessageTypeImage:
text = @"[图片]";
text = YMLocalizedString(@"NIMMessageUtils1");
break;
case NIMMessageTypeVideo:
text = @"[视频]";
text = YMLocalizedString(@"NIMMessageUtils2");
break;
case NIMMessageTypeLocation:
text = @"[位置]";
text = YMLocalizedString(@"NIMMessageUtils3");
break;
case NIMMessageTypeFile:
text = @"[文件]";
text = YMLocalizedString(@"NIMMessageUtils4");
break;
case NIMMessageTypeCustom: {
NIMCustomObject *obj = (NIMCustomObject *) message.messageObject;
@@ -43,27 +43,27 @@
}
} else if(attachment.first == CustomMessageType_Gift) {
if (attachment.second == Custom_Message_Sub_Gift_Send) {
text = @"[礼物]";
text = YMLocalizedString(@"NIMMessageUtils5");
}
} else if(attachment.first == CustomMessageType_Hall) {
text = @"[您收到一条公会消息]";
text = YMLocalizedString(@"NIMMessageUtils6");
} else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) {
return @"您关注的TA上线了快去围观吧~~~";
return YMLocalizedString(@"NIMMessageUtils7");
} else if(attachment.first == CustomMessageType_Application_Share && attachment.second == Custom_Message_Sub_Application_Share_Room) {
return @"[分享房间]";
return YMLocalizedString(@"NIMMessageUtils8");
}else if(attachment.first == CustomMessageType_User_UpGrade && (attachment.second == Custom_Message_Sub_User_UpGrade_Charm || attachment.second == Custom_Message_Sub_User_UpGrade_Exper)) {
return @"[升级消息]";
return YMLocalizedString(@"NIMMessageUtils9");
} else if(attachment.first == CustomMessageType_Tweet && attachment.second == Custom_Message_Sub_Tweet_News) {
return @"[推文消息]";
return YMLocalizedString(@"NIMMessageUtils10");
} else if(attachment.first == CustomMessageType_FindNew && attachment.second == Custom_Message_Find_New_Greet_New_User) {
NSString * text = attachment.data[@"message"];
return text.length > 0 ? text : @"[消息]";
return text.length > 0 ? text : YMLocalizedString(@"NIMMessageUtils11");
} else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Share) {
return @"[分享了一条动态]";
return YMLocalizedString(@"NIMMessageUtils12");;
} else if(attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) {
return @"[你收到一个全服红包]";
return YMLocalizedString(@"NIMMessageUtils13");;
} else {
text = @"[消息]";
text = YMLocalizedString(@"NIMMessageUtils14");;
}
if (!text) {
text = message.text;
@@ -71,7 +71,7 @@
}
break;
default:
text = @"[未知消息]";
text = YMLocalizedString(@"NIMMessageUtils15");;
break;
}
return text;

View File

@@ -36,11 +36,11 @@
}
else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+1)))//
{
result = showDetail? [[NSString alloc] initWithFormat:@"昨天%@ %zd:%02d",result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils1");
result = showDetail? [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils1"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils1");
}
else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+2))) //
{
result = showDetail? [[NSString alloc] initWithFormat:@"前天%@ %zd:%02d",result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils3");
result = showDetail? [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils3"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils3");
}
else if([nowDate timeIntervalSinceDate:msgDate] < 7 * OnedayTimeIntervalValue)//
{

View File

@@ -100,7 +100,7 @@
if (level.length < 0) {
return;
}
NSString * title = [NSString stringWithFormat:@"当前主播评级:%@", level];
NSString * title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPSessionSayHelloHeaderView0"), level];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:@"#1A1A1A"]}];
[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#FF8400"] range:[title rangeOfString:level]];
[attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightSemibold] range:[title rangeOfString:level]];
@@ -112,7 +112,7 @@
return;
}
NSString * levelStr = [NSString stringWithFormat:YMLocalizedString(@"XPSessionSayHelloHeaderView1"), level];
NSString * title = [NSString stringWithFormat:@"当前打招呼流量%@", levelStr];
NSString * title = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"XPSessionSayHelloHeaderView2"),levelStr];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#171A58"] range:[title rangeOfString:levelStr]];
[attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:24 weight:UIFontWeightMedium] range:[title rangeOfString:levelStr]];

View File

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
@end
@interface SessionSettingTableViewCell : UITableViewCell
@property (nonatomic,strong) SessionSettingModel *settingItem;
@property (nonatomic,strong) SessionSettingModel *chatItem;
///代理
@property (nonatomic,weak) id<SessionSettingTableViewCellDelegate> delegate;
@end

View File

@@ -76,42 +76,43 @@
#pragma mark - Event Response
- (void)switchDidChange:(UISwitch *)switchOn {
if (self.delegate && [self.delegate respondsToSelector:@selector(sessionSettingTableViewCell:switchState:)]) {
[self.delegate sessionSettingTableViewCell:self.settingItem switchState:switchOn];
[self.delegate sessionSettingTableViewCell:self.chatItem switchState:switchOn];
}
}
#pragma mark - Getters And Setters
- (void)setSettingItem:(SessionSettingModel *)settingItem {
_settingItem = settingItem;
if (_settingItem) {
self.titleLabel.text = _settingItem.title;
switch (_settingItem.settingType) {
case SessionSettingType_Top:
{
self.arrowImageView.hidden = YES;
self.switchView.hidden = NO;
self.switchView.on = _settingItem.state;
}
break;
case SessionSettingType_black:
{
self.arrowImageView.hidden = YES;
self.switchView.hidden = NO;
self.switchView.on = _settingItem.state;
}
break;
case SessionSettingType_report:
{
self.arrowImageView.hidden = NO;
self.switchView.hidden = YES;
}
break;
default:
break;
}
}
- (void)setChatItem:(SessionSettingModel *)chatItem{
_chatItem = chatItem;
if ( _chatItem) {
self.titleLabel.text = _chatItem.title;
switch (_chatItem.settingType) {
case SessionSettingType_Top:
{
self.arrowImageView.hidden = YES;
self.switchView.hidden = NO;
self.switchView.on = _chatItem.state;
}
break;
case SessionSettingType_black:
{
self.arrowImageView.hidden = YES;
self.switchView.hidden = NO;
self.switchView.on = _chatItem.state;
}
break;
case SessionSettingType_report:
{
self.arrowImageView.hidden = NO;
self.switchView.hidden = YES;
}
break;
default:
break;
}
}
}
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init];

View File

@@ -214,15 +214,15 @@
NSInteger day = [self getDay:time];
if (month<1 || month>12 || day<1 || day>31){
return @"错误日期格式!";
return YMLocalizedString(@"SessionUserInfoTableViewCell1");
}
if(month==2 && day>29)
{
return @"错误日期格式!!";
return YMLocalizedString(@"SessionUserInfoTableViewCell1");
}else if(month==4 || month==6 || month==9 || month==11) {
if (day>30) {
return @"错误日期格式!!!";
return YMLocalizedString(@"SessionUserInfoTableViewCell1");
}
}

View File

@@ -133,7 +133,7 @@
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont systemFontOfSize:17];
_titleLabel.text = @"你关注的TA";
_titleLabel.text = YMLocalizedString(@"MessageContentOpenLiveView1");
_titleLabel.textColor = [DJDKMIMOMColor mainTextColor];
}
return _titleLabel;

View File

@@ -108,7 +108,7 @@
NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
if (now - model.message.timestamp > 60*30) {
self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView0");
self.descLabel.text = @"下次要快点来哦~";
self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView1");
self.subLabel.hidden = YES;
self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_inValid_bg"];
self.bgImageView.userInteractionEnabled = NO;
@@ -123,7 +123,7 @@
self.bgImageView.userInteractionEnabled = NO;
} else {
self.titleLabel.text = info.sendUserNick;
self.descLabel.text = @"点击进房领取>";
self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView4");
self.subLabel.hidden = NO;
self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_valid_bg"];
self.bgImageView.userInteractionEnabled = YES;

View File

@@ -160,7 +160,7 @@
if (code == 200) {
UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:data.data];
if (!userInfo.isBindPhone) {
[XNDJTDDLoadingTool showErrorWithMessage:@"请先绑定手机号!"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"MessageContentTextClickable0")];
return;
}
//

View File

@@ -21,10 +21,10 @@
ContentLevelUpgradeModel * model = [ContentLevelUpgradeModel modelWithJSON:attach.data];
if (attach.second == Custom_Message_Sub_User_UpGrade_Charm) {
self.imageName = @"message_content_upgrade_charm";
self.level = [NSString stringWithFormat:@"恭喜您的魅力等级已到达Lv%@", model.levelName];
self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel0"), model.levelName];
} else {
self.imageName = @"message_content_upgrade_expre";
self.level = [NSString stringWithFormat:@"恭喜您的等级已到达Lv%@", model.levelName];
self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel1"), model.levelName];
}
}
return self;

View File

@@ -27,7 +27,7 @@
}
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:[self messageTextAttibutes]];
NSRange range = [text rangeOfString:@"《整治网络直播乱象》"];
NSRange range = [text rangeOfString:YMLocalizedString(@"MessageRiskAlertModel0")];
if ((range.location + range.length) <= text.length) {
[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:range];
[attribute yy_setTextHighlightRange:range color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {

View File

@@ -78,7 +78,7 @@
cell = [[SessionSettingTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([SessionSettingTableViewCell class])];
}
SessionSettingModel * model= [self.datasource safeObjectAtIndex1:indexPath.row];
cell.settingItem = model;
cell.chatItem = model;
cell.delegate = self;
return cell;
}

View File

@@ -372,7 +372,7 @@
if (user) {
self.sessionNavView.title = user.userInfo.nickName;
} else {
self.sessionNavView.title = @"加载中……";
self.sessionNavView.title = YMLocalizedString(@"XNDJTDDLoadingTool0");
}
[[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session];
[self.presenter getChatLimitReceiverUid:self.session.sessionId];
@@ -436,7 +436,7 @@
self.sessionNavView.userInfo = userInfo;
if (userInfo.roomUid && self.openType == SessionListOpenTypeDefault) {
if ([self showChatRiskView:userInfo]) {
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒:当前对方账号存在异常,请谨慎来往!" : @"温馨提示:对方和您非好友关系,请注意隐私安全!";
self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") : YMLocalizedString(@"SessionViewController18");
if (!self.riskAlertView.superview) {
[self.view addSubview:self.riskAlertView];
[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -455,7 +455,7 @@
}
} else {
if ([self showChatRiskView:userInfo]) {
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒:当前对方账号存在异常,请谨慎来往!" : @"温馨提示:对方和您非好友关系,请注意隐私安全!";
self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") : YMLocalizedString(@"SessionViewController18");
if (!self.riskAlertView.superview) {
[self.view addSubview:self.riskAlertView];
[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -867,10 +867,10 @@
[self presentViewController:imagePicker animated:YES completion:NULL];
} denied:^{
@kStrongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"SessionViewController10")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController10")];
} restriction:^{
@kStrongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"SessionViewController12")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController12")];
}];
}
@@ -923,10 +923,10 @@
});
} denied:^{
@kStrongify(self);
[self showNotPhoto:@"无法访问相册" content:YMLocalizedString(@"SessionViewController14")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController14")];
} restriction:^{
@kStrongify(self);
[self showNotPhoto:@"无法访问相册" content:YMLocalizedString(@"SessionViewController16")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController16")];
}];
} else {
[_keyboardManager hideAllBoardView];

View File

@@ -46,8 +46,8 @@
NSInteger wealth = wealthLevel > 0 ? wealthLevel : 3;
UIColor *highlightColor = DJDKMIMOMColor.appMainColor;
NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"SessionChatLimitView0"), wealth, charm] attributes:@{NSFontAttributeName: [UIFont systemFontOfSize: 12],NSForegroundColorAttributeName: DJDKMIMOMColor.mainTextColor}];;
NSRange wealthLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"财富等级≥%zd", wealth]];
NSRange charmLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"魅力等级≥%zd", charm]];
NSRange wealthLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView1"), wealth]];
NSRange charmLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView2"), charm]];
[attStr yy_setColor:highlightColor range:wealthLevelRange];
[attStr yy_setColor:highlightColor range:charmLevelRange];
self.textLabel.attributedText = attStr;

View File

@@ -70,7 +70,7 @@
_liveLabel = [[UILabel alloc] init];
_liveLabel.font = [UIFont systemFontOfSize:10];
_liveLabel.textColor = [DJDKMIMOMColor textThirdColor];
_liveLabel.text = @"直播中 >";
_liveLabel.text = [NSString stringWithFormat:@"%@ >",YMLocalizedString(@"SessionNavLiveView0")];
}
return _liveLabel;
}

View File

@@ -68,7 +68,7 @@
- (UILabel *)warnTextLabel {
if (!_warnTextLabel) {
_warnTextLabel = [[UILabel alloc]init];
_warnTextLabel.text = @"温馨提示:对方和您非好友关系,请注意隐私安全!";
_warnTextLabel.text = YMLocalizedString(@"SessionRiskView0");
_warnTextLabel.textColor = UIColorFromRGB(0xFF5858);
_warnTextLabel.font = [UIFont systemFontOfSize:12.f];
}

View File

@@ -463,7 +463,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
}
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.confirmButtonConfig.title = YMLocalizedString(@"SessionListViewController3");
config.message = @"清除当前未读消息提醒?";
config.message = YMLocalizedString(@"SessionListViewController4");
[TTPopup alertWithConfig:config confirmHandler:^{
[[NIMSDK sharedSDK].conversationManager markAllMessagesRead];
[self setTabBarItemBadge:0];

View File

@@ -66,7 +66,9 @@
NSString * ticket = [AccountInfoStorage instance].getTicket;
[Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
[[self getView] checkReceiptSuccess:transcationId];
} showLoading:YES] receipt:receipt chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket];
}fail:^(NSInteger code, NSString * _Nullable msg) {
[[self getView]hideHUD];
} showLoading:YES] receipt:receipt chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket];
}

View File

@@ -47,7 +47,7 @@
- (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo {
if (self.datasouce.count > 0) {
self.phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent0");
self.payItem.subTitle = userinfo.isBindPaymentPwd ? @"修改" : YMLocalizedString(@"XPMineSettingPresent2");
self.payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent2");
} else {
if ([ClientConfig shareConfig].canOpen) {
XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init];
@@ -57,7 +57,7 @@
self.phoneItem = phoneItem;
XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
loginItem.title = userinfo.isBindPasswd ? @"重置密码" : YMLocalizedString(@"XPMineSettingPresent6");
loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent6");
loginItem.subTitle = YMLocalizedString(@"XPMineSettingPresent7");
loginItem.type = XPMineSettingItemType_Login_Password;
self.loginItem = loginItem;
@@ -69,7 +69,7 @@
XPMineSettingItemModel * payItem = [[XPMineSettingItemModel alloc] init];
payItem.title = YMLocalizedString(@"XPMineSettingPresent9");
payItem.subTitle = userinfo.isBindPaymentPwd ? @"修改" : YMLocalizedString(@"XPMineSettingPresent11");
payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent11");
payItem.type = XPMineSettingItemType_Pay_Password;
self.payItem = payItem;
@@ -104,7 +104,7 @@
updateItem.type = XPMineSettingItemType_CheckUpdate;
XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init];
aboutusItem.title = [NSString stringWithFormat:@"关于%@", AppName];
aboutusItem.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineAboutUsViewController0"), AppName];
aboutusItem.subTitle = @"";
aboutusItem.type = XPMineSettingItemType_About_Us;
@@ -127,7 +127,7 @@
self.phoneItem = phoneItem;
XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
loginItem.title = userinfo.isBindPasswd ? @"重置密码" : YMLocalizedString(@"XPMineSettingPresent23");
loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent23");
loginItem.subTitle = @"";
loginItem.type = XPMineSettingItemType_Login_Password;
self.loginItem = loginItem;

View File

@@ -129,7 +129,7 @@
if (!_nickItem) {
_nickItem = [[XPMineUserInfoEditModel alloc] init];
_nickItem.type = XPMineUserInfoEditType_Nick;
_nickItem.title = @"昵称:";
_nickItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter1");
}
return _nickItem;
}
@@ -138,7 +138,7 @@
if (!_avatarItem) {
_avatarItem = [[XPMineUserInfoEditModel alloc] init];
_avatarItem.type = XPMineUserInfoEditType_Avatar;
_avatarItem.title = @"头像:";
_avatarItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter2");
}
return _avatarItem;
}
@@ -148,7 +148,7 @@
if (!_birthItem) {
_birthItem = [[XPMineUserInfoEditModel alloc] init];
_birthItem.type = XPMineUserInfoEditType_Birth;
_birthItem.title = @"生日:";
_birthItem.title =YMLocalizedString(@"XPMineUserInfoEditPresenter3");
}
return _birthItem;
}
@@ -157,7 +157,7 @@
if (!_photoItem) {
_photoItem = [[XPMineUserInfoEditModel alloc] init];
_photoItem.type = XPMineUserInfoEditType_Photo;
_photoItem.title = @"相册:";
_photoItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter4");
}
return _photoItem;
}
@@ -166,7 +166,7 @@
if (!_desItem) {
_desItem = [[XPMineUserInfoEditModel alloc] init];
_desItem.type = XPMineUserInfoEditType_UseDes;
_desItem.title = @"个人介绍:";
_desItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter5");
}
return _desItem;
}

View File

@@ -286,7 +286,7 @@
- (UIButton *)findButton {
if (!_findButton) {
_findButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_findButton setTitle:@"找到Ta" forState:UIControlStateNormal];
[_findButton setTitle:YMLocalizedString(@"XPMineAttentionTableViewCell1") forState:UIControlStateNormal];
[_findButton setTitleColor:[DJDKMIMOMColor appEmphasizeColor] forState:UIControlStateNormal];
_findButton.titleLabel.font = [UIFont systemFontOfSize:12];
_findButton.layer.masksToBounds = YES;

View File

@@ -205,7 +205,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"普通礼物", YMLocalizedString(@"XPMineDataGiftTableViewCell2")];
_titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineDataGiftTableViewCell2")];
}
return _titles;
}

View File

@@ -89,7 +89,7 @@
_userInfo = userInfo;
if (_userInfo) {
self.nameLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"%@%ld",AppName, (long)_userInfo.erbanNo];
self.idLabel.text = [NSString stringWithFormat:@"%@%@%ld",AppName,YMLocalizedString(@"App_Common_hao"), (long)_userInfo.erbanNo];
self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPMineUserInfoTableViewCell1");
NSString * sexStr;
if (_userInfo.gender == GenderType_Male) {

View File

@@ -17,7 +17,8 @@
@property (nonatomic,strong) UILabel * titleVeiw;
@property (nonatomic,strong) UIImageView * arrowView;
@property (nonatomic,strong) UIView *lineView;
///
@property (nonatomic,strong) NetImageView *badgeImageView;
@end
@implementation XPMineListCell
@@ -34,7 +35,9 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.backgroundColor = [UIColor clearColor];
[self.contentView addSubview:self.bgView];
[self.bgView addSubview:self.iconView];
[self.bgView addSubview:self.badgeImageView];
[self.bgView addSubview:self.titleVeiw];
[self.bgView addSubview:self.arrowView];
[self.bgView addSubview:self.lineView];
@@ -46,12 +49,17 @@
make.right.mas_equalTo(-15);
make.top.bottom.equalTo(self.contentView);
}];
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(11);
make.width.height.mas_equalTo(25);
make.centerY.equalTo(self.bgView);
}];
[self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.iconView.mas_top);
make.size.mas_equalTo(CGSizeMake(24, 10));
make.left.mas_equalTo(self.iconView.mas_centerX);
}];
[self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(42);
make.centerY.equalTo(self.bgView);
@@ -83,6 +91,7 @@
}else{
self.iconView.imageUrl = _itemModel.centerPic;
}
self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil;
}
}
-(void)setCornerWithIsTop:(BOOL)isTop isBottom:(BOOL)isBottom{
@@ -137,4 +146,11 @@
}
return _lineView;
}
- (NetImageView *)badgeImageView {
if (!_badgeImageView) {
_badgeImageView = [[NetImageView alloc] init];
_badgeImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _badgeImageView;
}
@end

View File

@@ -50,7 +50,7 @@
if (data) {
self.avatarImageView.imageUrl = data.avatar;
self.nickLabel.text = data.nick;
self.idLabel.text = [NSString stringWithFormat:@"%@:%@",AppName, data.erbanNo];
self.idLabel.text = [NSString stringWithFormat:@"%@%@:%@",AppName, YMLocalizedString(@"App_Common_hao"),data.erbanNo];
self.sexImageView.image = data.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];
}
}

View File

@@ -132,7 +132,7 @@
- (void)setNobleCardModel:(DressUpShopModel *)nobleCardModel {
_nobleCardModel = nobleCardModel;
if (_nobleCardModel) {
self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd)", nobleCardModel.name, nobleCardModel.dressDay];
self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", nobleCardModel.name, nobleCardModel.dressDay,YMLocalizedString(@"App_Commont_Day")];
self.nobleImageView.imageUrl = nobleCardModel.pic;
self.diamondLabel.text = [NSString stringWithFormat:@"%zd", nobleCardModel.dressPrice];
self.limitTimeBgView.hidden = (nobleCardModel.dressLimitStatus != 0);

View File

@@ -120,7 +120,7 @@
- (void)setDressUpModel:(DressUpShopModel *)dressUpModel {
_dressUpModel = dressUpModel;
if (dressUpModel) {
self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd)", dressUpModel.name, dressUpModel.dressDay];
self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", dressUpModel.name, dressUpModel.dressDay,YMLocalizedString(@"App_Commont_Day")];
self.dressUpImageView.imageUrl = dressUpModel.pic;
self.diamondLabel.text = [NSString stringWithFormat:@"%zd", dressUpModel.dressPrice];
self.limitTimeBgView.hidden = (dressUpModel.dressLimitStatus != 0);

View File

@@ -103,22 +103,22 @@
- (void)useHeadwearSuccess:(NSString *)headWearId {
// [self.presenter getUserHeadwearList];
[self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPDressUpShopCardViewController2")];
[self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopCardViewController2")];
}
- (void)useCarSuccess:(NSString *)carId {
// [self.presenter getUserCarList];
[self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPDressUpShopCardViewController4")];
[self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopCardViewController4")];
}
- (void)useNameplateSuccess:(NSString *)nameplateId {
// [self.presenter getUserNameplateList];
[self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPDressUpShopCardViewController6")];
[self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopCardViewController6")];
}
- (void)userNobleCardSuccess:(NSString *)nobleCardId {
[self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPDressUpShopCardViewController8")];
[self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopCardViewController8")];
if (nobleCardId.integerValue == 0) {
for (NobleCardModel *model in self.datasource) {
model.used = NO;

View File

@@ -102,21 +102,21 @@
- (void)useHeadwearSuccess:(NSString *)headWearId {
// [self.presenter getUserHeadwearList];
[self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPDressUpShopListViewController2")];
[self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopListViewController2")];
}
- (void)useCarSuccess:(NSString *)carId {
// [self.presenter getUserCarList];
[self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPDressUpShopListViewController4")];
[self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopListViewController4")];
}
- (void)useNameplateSuccess:(NSString *)nameplateId {
// [self.presenter getUserNameplateList];
[self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPDressUpShopListViewController6")];
[self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopListViewController6")];
}
- (void)userNobleCardSuccess:(NSString *)nobleCardId {
[self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPDressUpShopListViewController8")];
[self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopListViewController8")];
if (nobleCardId.integerValue == 0) {
for (NobleCardModel *model in self.datasource) {
model.used = NO;
@@ -151,7 +151,7 @@
return cell;
}
XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath];
cell.emptyTitle = self.type == DressUpShopListType_HeadWear ? @"暂无头饰" : self.type == DressUpShopListType_Car ? @"暂无座驾" : self.type == DressUpShopListType_Nameplate ? @"暂无铭牌" : YMLocalizedString(@"XPDressUpShopListViewController12");
cell.emptyTitle = self.type == DressUpShopListType_HeadWear ? YMLocalizedString(@"XPDressUpShopCardViewController10") : self.type == DressUpShopListType_Car ? YMLocalizedString(@"XPDressUpShopCardViewController12") : self.type == DressUpShopListType_Nameplate ? YMLocalizedString(@"XPDressUpShopCardViewController11") : YMLocalizedString(@"XPDressUpShopListViewController12");
return cell;
}

View File

@@ -49,7 +49,7 @@
///
@property (nonatomic, strong) XPDressUpShopListViewController *bubbleView;
///
@property (nonatomic,strong) SDCycleScrollView *cycleScrollView;
@property (nonatomic,strong) SDCycleScrollView *pi_BannerView;
///
@property (nonatomic,copy) NSArray<ActivityInfoModel *> *activityList;
@@ -85,7 +85,7 @@
#pragma mark - Private Method
- (void)initSubViews {
self.title = YMLocalizedString(@"XPDressUpShopViewController1");
[self.view addSubview:self.cycleScrollView];
[self.view addSubview:self.pi_BannerView];
[self.view addSubview:self.titleView];
[self.view addSubview:self.contentView];
[self.view addSubview:self.mainView];
@@ -96,7 +96,7 @@
}
- (void)initSubViewConstraints {
[self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.view);
make.left.mas_equalTo(15);
make.right.mas_equalTo(-15);
@@ -106,7 +106,7 @@
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view);
make.height.mas_equalTo(50);
make.top.mas_equalTo(self.cycleScrollView.mas_bottom);
make.top.mas_equalTo(self.pi_BannerView.mas_bottom);
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -162,7 +162,7 @@
if (code == 200) {
NSArray <ActivityInfoModel *>* array = [ActivityInfoModel modelsWithArray:data.data];
if (array.count <= 0) {
[self.cycleScrollView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0);
}];
return;
@@ -174,15 +174,15 @@
[picList addObject:obj.bannerPic];
}
}];
self.cycleScrollView.imageURLStringsGroup = picList;
self.pi_BannerView.imageURLStringsGroup = picList;
if (array.count > 1) {
[self.cycleScrollView setAutoScroll:YES];
self.cycleScrollView.autoScrollTimeInterval = 3;
[self.pi_BannerView setAutoScroll:YES];
self.pi_BannerView.autoScrollTimeInterval = 3;
} else {
[self.cycleScrollView setAutoScroll:NO];
[self.pi_BannerView setAutoScroll:NO];
}
} else {
[self.cycleScrollView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0);
}];
}
@@ -279,7 +279,7 @@
}
- (NSArray<NSString *> *)titles {
return @[@"头饰", @"座驾", @"铭牌", @"资料卡", YMLocalizedString(@"XPDressUpShopViewController6")];
return @[YMLocalizedString(@"XPMineDressUpViewController1"), YMLocalizedString(@"XPMineDressUpViewController2"), YMLocalizedString(@"XPMineDressUpViewController3"), YMLocalizedString(@"XPMineDressUpViewController4"), YMLocalizedString(@"XPDressUpShopViewController6")];
}
- (XPDressUpShopListViewController *)headwearView {
@@ -322,18 +322,18 @@
return _bubbleView;
}
- (SDCycleScrollView *)cycleScrollView {
if (!_cycleScrollView) {
_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_cycleScrollView.currentPageDotColor = [UIColor whiteColor];
_cycleScrollView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.15];
_cycleScrollView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_cycleScrollView.layer.masksToBounds = YES;
_cycleScrollView.layer.cornerRadius = 12;
- (SDCycleScrollView *)pi_BannerView {
if (!_pi_BannerView) {
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_pi_BannerView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_pi_BannerView.currentPageDotColor = [UIColor whiteColor];
_pi_BannerView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.15];
_pi_BannerView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_pi_BannerView.layer.masksToBounds = YES;
_pi_BannerView.layer.cornerRadius = 12;
}
return _cycleScrollView;
return _pi_BannerView;
}
- (UIView *)mainView {

View File

@@ -64,7 +64,7 @@
}
- (void)useBubbleSuccess:(NSString *)bubbleId {
[self showSuccessToast:bubbleId.integerValue == 0 ? @"取消使用气泡成功" : YMLocalizedString(@"XPMineDressUpBubbleViewController1")];
[self showSuccessToast:bubbleId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpBubbleViewController3") : YMLocalizedString(@"XPMineDressUpBubbleViewController1")];
if (bubbleId.integerValue == 0) {
for (ChatBubbleModel *model in self.datasource) {
model.hasUsed = NO;
@@ -99,7 +99,7 @@
return cell;
}
XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath];
cell.emptyTitle = @"亲爱的用户,你还没有聊天气泡噢!";
cell.emptyTitle = YMLocalizedString(@"XPMineDressUpBubbleViewController2");
return cell;
}

View File

@@ -93,22 +93,22 @@
- (void)useHeadwearSuccess:(NSString *)headWearId {
[self.presenter getUserHeadwearList];
[self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPMineDressUpListViewController1")];
[self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPMineDressUpListViewController1")];
}
- (void)useCarSuccess:(NSString *)carId {
[self.presenter getUserCarList];
[self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPMineDressUpListViewController3")];
[self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPMineDressUpListViewController3")];
}
- (void)useNameplateSuccess:(NSString *)nameplateId {
[self.presenter getUserNameplateList];
[self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPMineDressUpListViewController5")];
[self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPMineDressUpListViewController5")];
}
- (void)userNobleCardSuccess:(NSString *)nobleCardId {
[self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPMineDressUpListViewController7")];
[self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPMineDressUpListViewController7")];
if (nobleCardId.integerValue == 0) {
for (NobleCardModel *model in self.datasource) {
model.used = NO;
@@ -186,7 +186,7 @@
if (cell == nil) {
cell = [[XPMineDressEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])];
}
cell.emptyTitle = self.type == DressUpListType_HeadWear ? @"亲爱的用户,你还没有头饰噢!" : self.type == DressUpListType_Car ? @"亲爱的用户,你还没有座驾噢!" : @"亲爱的用户,你还没有铭牌噢!";
cell.emptyTitle = self.type == DressUpListType_HeadWear ? YMLocalizedString(@"XPMineDressUpListViewController11") : self.type == DressUpListType_Car ? YMLocalizedString(@"XPMineDressUpListViewController12") : YMLocalizedString(@"XPMineDressUpListViewController10" );
return cell;
}

View File

@@ -41,7 +41,7 @@
///
@property (nonatomic, strong) XPMineDressUpBubbleViewController *bubbleView;
///
@property (nonatomic,strong) SDCycleScrollView *cycleScrollView;
@property (nonatomic,strong) SDCycleScrollView *pi_BannerView;
///
@property (nonatomic,copy) NSArray<ActivityInfoModel *> *activityList;
@end
@@ -58,13 +58,13 @@
#pragma mark - Private Method
- (void)initSubViews {
self.title = YMLocalizedString(@"XPMineDressUpViewController0");
[self.view addSubview:self.cycleScrollView];
[self.view addSubview:self.pi_BannerView];
[self.view addSubview:self.titleView];
[self.view addSubview:self.contentView];
}
- (void)initSubViewConstraints {
[self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.view);
make.left.mas_equalTo(15);
make.right.mas_equalTo(-15);
@@ -74,7 +74,7 @@
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view);
make.height.mas_equalTo(50);
make.top.mas_equalTo(self.cycleScrollView.mas_bottom);
make.top.mas_equalTo(self.pi_BannerView.mas_bottom);
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -88,7 +88,7 @@
if (code == 200) {
NSArray <ActivityInfoModel *>* array = [ActivityInfoModel modelsWithArray:data.data];
if (array.count <= 0) {
[self.cycleScrollView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0);
}];
return;
@@ -100,15 +100,15 @@
[picList addObject:obj.bannerPic];
}
}];
self.cycleScrollView.imageURLStringsGroup = picList;
self.pi_BannerView.imageURLStringsGroup = picList;
if (array.count > 1) {
[self.cycleScrollView setAutoScroll:YES];
self.cycleScrollView.autoScrollTimeInterval = 3;
[self.pi_BannerView setAutoScroll:YES];
self.pi_BannerView.autoScrollTimeInterval = 3;
} else {
[self.cycleScrollView setAutoScroll:NO];
[self.pi_BannerView setAutoScroll:NO];
}
} else {
[self.cycleScrollView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0);
}];
}
@@ -194,7 +194,7 @@
}
- (NSArray<NSString *> *)titles {
return @[@"头饰", @"座驾", @"铭牌", @"资料卡", YMLocalizedString(@"XPMineDressUpViewController5")];
return @[YMLocalizedString(@"XPMineDressUpViewController1"), YMLocalizedString(@"XPMineDressUpViewController2"), YMLocalizedString(@"XPMineDressUpViewController3"), YMLocalizedString(@"XPMineDressUpViewController4"), YMLocalizedString(@"XPMineDressUpViewController5")];
}
- (XPMineDressUpListViewController *)headwearView {
@@ -236,18 +236,18 @@
return _bubbleView;
}
- (SDCycleScrollView *)cycleScrollView {
if (!_cycleScrollView) {
_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_cycleScrollView.currentPageDotColor = [UIColor whiteColor];
_cycleScrollView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.15];
_cycleScrollView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_cycleScrollView.layer.masksToBounds = YES;
_cycleScrollView.layer.cornerRadius = 12;
- (SDCycleScrollView *)pi_BannerView {
if (!_pi_BannerView) {
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_pi_BannerView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_pi_BannerView.currentPageDotColor = [UIColor whiteColor];
_pi_BannerView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.15];
_pi_BannerView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_pi_BannerView.layer.masksToBounds = YES;
_pi_BannerView.layer.cornerRadius = 12;
}
return _cycleScrollView;
return _pi_BannerView;
}

View File

@@ -120,7 +120,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"消息", @"好友",@"粉丝", YMLocalizedString(@"XPMineContactViewController3")];
_titles = @[YMLocalizedString(@"TabbarViewController4"), YMLocalizedString(@"XPMonentsTooBarView3"),YMLocalizedString(@"XPMineHeadView5"), YMLocalizedString(@"XPMineContactViewController3")];
}
return _titles;
}

View File

@@ -87,7 +87,7 @@
switch (self.shareType) {
case MineShareType_Monents:
{
title = [NSString stringWithFormat:@"确认分享给%@吗?", nick];
title = [NSString stringWithFormat:YMLocalizedString(@"XPMineShareViewController1"), nick];
attachment.first = CustomMessageType_Monents;
attachment.second = Custom_Message_Sub_Monents_Share;
ContentShareMonentsModel * shareInfo = [[ContentShareMonentsModel alloc] init];
@@ -163,7 +163,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"好友",@"粉丝", YMLocalizedString(@"XPMineShareViewController4")];
_titles = @[YMLocalizedString(@"XPMonentsTooBarView3"),YMLocalizedString(@"XPMineContactViewController3"), YMLocalizedString(@"XPMineShareViewController4")];
}
return _titles;
}

View File

@@ -0,0 +1,18 @@
//
// XPNewMineGuildItemView.h
// YuMi
//
// Created by duoban on 2023/8/4.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface XPNewMineGuildItemView : UIView
@property(nonatomic,strong) UIImage *bgImage;
@property(nonatomic,copy) NSString *text;
@property(nonatomic,strong) UIColor *textColor;
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,63 @@
//
// XPNewMineGuildItemView.m
// YuMi
//
// Created by duoban on 2023/8/4.
//
#import "XPNewMineGuildItemView.h"
@interface XPNewMineGuildItemView()
@property(nonatomic,strong) UIImageView *iconView;
@property(nonatomic,strong) UILabel *titleView;
@end
@implementation XPNewMineGuildItemView
-(instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if(self){
[self installUI];
[self installConstraints];
}
return self;
}
-(void)installUI{
[self addSubview:self.iconView];
[self addSubview:self.titleView];
}
-(void)installConstraints{
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.iconView);
}];
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.mas_equalTo(12);
make.centerY.equalTo(self);
}];
}
- (void)setBgImage:(UIImage *)bgImage{
_bgImage = bgImage;
_iconView.image = _bgImage;
}
- (void)setText:(NSString *)text{
_text = text;
_titleView.text = _text;
}
-(void)setTextColor:(UIColor *)textColor{
_textColor = textColor;
_titleView.textColor = _textColor;
}
#pragma mark -
- (UIImageView *)iconView{
if(!_iconView){
_iconView = [UIImageView new];
}
return _iconView;
}
-(UILabel *)titleView{
if(!_titleView){
_titleView = [UILabel new];
_titleView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
}
return _titleView;
}
@end

View File

@@ -202,7 +202,7 @@
self.avatarImageView.imageUrl = userInfo.avatar;
self.bgImageView.imageUrl = userInfo.avatar;
self.introduceLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPMineSimpleUserInfoHeaderView0");
self.fansLabel.text =[NSString stringWithFormat:@"粉丝%ld", _userInfo.fansNum];
self.fansLabel.text =[NSString stringWithFormat:@"%@%ld",YMLocalizedString(@"XPMineHeadView5"), _userInfo.fansNum];
self.userGiftWall = self.userInfo.userGiftWall;
self.userLuckyBagGiftWall = self.userInfo.userLuckyBagGiftWall;
@@ -433,7 +433,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"普通礼物", YMLocalizedString(@"XPMineSimpleUserInfoHeaderView5")];
_titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineSimpleUserInfoHeaderView5")];
}
return _titles;
}

View File

@@ -86,10 +86,10 @@
[self presentViewController:imagePicker animated:YES completion:NULL];
} denied:^{
@strongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController3")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController3")];
} restriction:^{
@strongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController5")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController5")];
}];
}];
@@ -104,10 +104,10 @@
[self presentViewController:imagePicker animated:YES completion:NULL];
} denied:^{
@strongify(self);
[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")];
} restriction:^{
@strongify(self);
[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")];
}];
}];
@@ -173,7 +173,7 @@
- (void)xPMineUserInfoAlbumCollectionViewCell:(XPMineUserInfoAlbumCollectionViewCell *)cell didDeleteItem:(UserPhoto *)photo {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPMineUserInfoAlbumViewController12");
config.message = @"是否需要删除?";
config.message = YMLocalizedString(@"XPMineUserInfoAlbumViewController13");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter deleteImageUrlFromServerWithPid:photo.pid];
} cancelHandler:^{

View File

@@ -124,7 +124,7 @@ static NSInteger maxCount = 60;
if (!_useDescTextView) {
_useDescTextView = [[SZTextView alloc] init];
_useDescTextView.delegate = self;
_useDescTextView.placeholder = @"填写自我介绍,可以让别人更了解你哦~";
_useDescTextView.placeholder = YMLocalizedString(@"XPMineUserInfoDesViewController2");
_useDescTextView.placeholderTextColor = [DJDKMIMOMColor secondTextColor];
_useDescTextView.font = [UIFont systemFontOfSize:14];
_useDescTextView.textColor = [DJDKMIMOMColor mainTextColor];

View File

@@ -81,10 +81,10 @@
[self presentViewController:imagePicker animated:YES completion:NULL];
} denied:^{
@strongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController3")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoEditViewController3")];
} restriction:^{
@strongify(self);
[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController5")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoEditViewController5")];
}];
}];
@@ -99,10 +99,10 @@
[self presentViewController:imagePicker animated:YES completion:NULL];
} denied:^{
@strongify(self);
[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController8")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")];
} restriction:^{
@strongify(self);
[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController10")];
[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")];
}];
}];

View File

@@ -123,7 +123,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"普通礼物", YMLocalizedString(@"XPMineUserInfoGiftWallViewController2")];
_titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineUserInfoGiftWallViewController2")];
}
return _titles;
}

View File

@@ -257,6 +257,7 @@
- (void)requestIAPRechargeOrderFail {
///
[self hideHUD];
}
///
@@ -265,6 +266,7 @@
///💎
[self getUserWalletBalanceInfo];
self.orderId = nil;
[self hideHUD];
}
- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo {
@@ -356,7 +358,7 @@
- (UIButton *)protcoloButton {
if (!_protcoloButton) {
_protcoloButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_protcoloButton setTitle:@"《用户充值协议》" forState:UIControlStateNormal];
[_protcoloButton setTitle:YMLocalizedString(@"XPIAPRechargeViewController3") forState:UIControlStateNormal];
[_protcoloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal];
_protcoloButton.titleLabel.font = [UIFont systemFontOfSize:12];
[_protcoloButton addTarget:self action:@selector(protcoloButtonAction:) forControlEvents:UIControlEventTouchUpInside];
@@ -376,7 +378,7 @@
- (UILabel *)contactLabel {
if (!_contactLabel) {
_contactLabel = [[UILabel alloc] init];
_contactLabel.text = @"如有任何问题请咨询客服Piko号88001";
_contactLabel.text = [NSString stringWithFormat:@"%@: 88001",YMLocalizedString(@"XPIAPRechargeViewController5")];
_contactLabel.font = [UIFont systemFontOfSize:12];
_contactLabel.textColor = [DJDKMIMOMColor appMainColor];
}

View File

@@ -283,7 +283,7 @@
- (UIButton *)protcoloButton {
if (!_protcoloButton) {
_protcoloButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_protcoloButton setTitle:@"《用户充值协议》" forState:UIControlStateNormal];
[_protcoloButton setTitle:YMLocalizedString(@"XPIAPRechargeViewController3") forState:UIControlStateNormal];
[_protcoloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal];
_protcoloButton.titleLabel.font = [UIFont systemFontOfSize:12];
[_protcoloButton addTarget:self action:@selector(protcoloButtonAction:) forControlEvents:UIControlEventTouchUpInside];

View File

@@ -26,7 +26,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.title = [NSString stringWithFormat:@"关于%@",AppName];
self.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineSettingPresent19"),AppName];
[self initSubViews];
[self makeConstriants];
@@ -43,10 +43,11 @@
}
- (void)makeConstriants {
[self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.view);
make.top.mas_equalTo(kNavigationHeight+60);
}];
[self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.view);
make.width.height.mas_equalTo(80);
make.top.mas_equalTo(kNavigationHeight+60);
}];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.view);
make.top.mas_equalTo(self.iconImageView.mas_bottom).offset(5);

View File

@@ -92,7 +92,7 @@
#pragma mark - FeedbackCoreClient
- (void)saveFeedbackSuccess {
[self showSuccessToast:[NSString stringWithFormat:@"感谢您的宝贵意见,让我们共同营造更好的%@", AppName]];
[self showSuccessToast:[NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineFeedbackViewController1"), AppName]];
[self.navigationController popViewControllerAnimated:YES];
}
#pragma mark - Event Response
@@ -126,7 +126,7 @@
- (SZTextView *)contentTextView {
if (!_contentTextView) {
_contentTextView = [[SZTextView alloc] init];
NSString * placeholder = @"请详细描述您所遇到的问题与情况,感谢您提出宝贵的意见。";
NSString * placeholder = YMLocalizedString(@"XPMineFeedbackViewController3");
_contentTextView.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
_contentTextView.textColor = [DJDKMIMOMColor mainTextColor];
_contentTextView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor];

View File

@@ -109,7 +109,7 @@
case XPMineSettingItemType_Pay_Password:
{
if (!self.userInfo.isBindPhone) {
[self showErrorToast:@"请先绑定手机号码哦~"];
[self showErrorToast:YMLocalizedString(@"XPMineSettingViewController1")];
return;
}
//
@@ -180,7 +180,7 @@
{
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPMineSettingViewController2");
config.message = @"要清除缓存吗?";
config.message = YMLocalizedString(@"XPMineSettingViewController3");
[TTPopup alertWithConfig:config confirmHandler:^{
NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];

View File

@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface XPMineUserInfoHeaderView : UIView
@property (nonatomic,strong) UserInfoModel *userInfo;
///轮播图
@property (nonatomic,strong, readonly) SDCycleScrollView *cycleScrollView;
@property (nonatomic,strong, readonly) SDCycleScrollView *pi_BannerView;
///代理
@property (nonatomic,weak) id<XPMineUserInfoHeaderViewDelegate> delegate;
///当前查看用户是否在直播

View File

@@ -25,7 +25,7 @@
@interface XPMineUserInfoHeaderView ()<SDCycleScrollViewDelegate, SDPhotoBrowserDelegate>
///
@property (nonatomic,strong) SDCycleScrollView *cycleScrollView;
@property (nonatomic,strong) SDCycleScrollView *pi_BannerView;
///view
@property (nonatomic,strong) UIImageView * coverImageView;
///
@@ -102,7 +102,7 @@
#pragma mark - Private Method
- (void)initSubViews {
[self addSubview:self.cycleScrollView];
[self addSubview:self.pi_BannerView];
[self addSubview:self.coverImageView];
[self addSubview:self.reviewIcon];
[self addSubview:self.userInfoView];
@@ -142,13 +142,13 @@
}
- (void)initSubViewConstraints {
[self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self);
make.height.mas_equalTo(375);
}];
[self.coverImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.cycleScrollView);
make.edges.mas_equalTo(self.pi_BannerView);
}];
[self.reviewIcon mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -269,6 +269,7 @@
[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.signBackView).offset(10);
make.right.mas_equalTo(self.signBackView).offset(10);
make.top.mas_equalTo(self.signBackView).offset(23);
}];
}
@@ -294,7 +295,7 @@
- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index {
NSInteger count = self.imageUrls.count;
SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init];
browser.sourceImagesContainerView = self.cycleScrollView;
browser.sourceImagesContainerView = self.pi_BannerView;
browser.delegate = self;
browser.imageCount = count;
browser.currentImageIndex = index;
@@ -385,7 +386,7 @@
if (imageUrls.count > 0) {
self.imageUrls = imageUrls;
self.cycleScrollView.imageURLStringsGroup = imageUrls;
self.pi_BannerView.imageURLStringsGroup = imageUrls;
[self.pageButton setTitle:[NSString stringWithFormat:@"1/%lu",(unsigned long)imageUrls.count] forState:UIControlStateNormal];;
//
self.reviewIcon.hidden = ![self.userPhtotArray objectAtIndex:0].isReview;
@@ -523,15 +524,15 @@
return _onlineButton;
}
- (SDCycleScrollView *)cycleScrollView {
if (!_cycleScrollView) {
_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:[UIImageConstant defalutBannerPlaceholder]];
_cycleScrollView.backgroundColor = [UIColor clearColor];
_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleNone;
_cycleScrollView.autoScroll = NO;
- (SDCycleScrollView *)pi_BannerView{
if (!_pi_BannerView) {
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:[UIImageConstant defalutBannerPlaceholder]];
_pi_BannerView.backgroundColor = [UIColor clearColor];
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_pi_BannerView.pageControlStyle = SDCycleScrollViewPageContolStyleNone;
_pi_BannerView.autoScroll = NO;
}
return _cycleScrollView;
return _pi_BannerView;
}
- (UIButton *)pageButton {

View File

@@ -273,7 +273,7 @@
_footerTip = [[UILabel alloc] init];
_footerTip.textColor = DJDKMIMOMColor.mainTextColor;
_footerTip.font = [UIFont systemFontOfSize:12];
_footerTip.text = @"—— 仅展示能查询到的已授权系统权限 ——";
_footerTip.text = YMLocalizedString(@"XPPermissionsViewController8");
}
return _footerTip;
}
@@ -281,7 +281,7 @@
- (UIButton *)gotoSetting {
if (!_gotoSetting) {
_gotoSetting = [UIButton buttonWithType:UIButtonTypeCustom];
[_gotoSetting setTitle:@"前往系统设置>" forState:UIControlStateNormal];
[_gotoSetting setTitle:YMLocalizedString(@"XPPermissionsViewController9") forState:UIControlStateNormal];
[_gotoSetting setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateNormal];
_gotoSetting.titleLabel.font = [UIFont systemFontOfSize:14];
_gotoSetting.titleLabel.adjustsFontSizeToFitWidth = YES;

View File

@@ -257,7 +257,7 @@
if (self.datasource.count > 0) {
MonentsCommentModel* monent = [self.datasource safeObjectAtIndex1:indexPath.row];
self.commentId = monent.commentId;
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", monent.nick];
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), monent.nick];
[self.inputBarView textViewBecomeFirstResponder];
}
}
@@ -296,7 +296,7 @@
TTActionSheetConfig *action;
if (self.monentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController4") clickAction:^{
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:self.monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", self.monentsInfo.worldId]];
} cancelHandler:^{
@@ -325,7 +325,7 @@
- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo {
if (commentInfo) {
self.commentId = commentInfo.replyId;
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", commentInfo.nick];
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), commentInfo.nick];
[self.inputBarView textViewBecomeFirstResponder];
}
}
@@ -347,7 +347,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

View File

@@ -27,7 +27,7 @@
@interface XPMonentTopicContainerViewController ()<JXPagerViewDelegate,JXCategoryViewDelegate>
@property (nonatomic,strong) JXCategoryTitleView *categoryView;
@property (nonatomic,strong) JXCategoryIndicatorLineView *lineView;
@property (nonatomic,strong) JXPagerListRefreshView *pagerView;
@property (nonatomic,strong) JXPagerListRefreshView *pagerContentView;
@property (nonatomic,strong) NSArray<NSString *> *titles;
@property (nonatomic,strong) XPMonentsTopicRecommondViewController *recommendVC;
@property (nonatomic,strong) XPMonentsTopicLatestViewController *latestVC;
@@ -51,11 +51,11 @@
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
self.pagerView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight - 50);
self.pagerContentView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight - 50);
}
- (void)initSubViews {
[self.view addSubview:self.pagerView];
[self.view addSubview:self.pagerContentView];
[self.view addSubview:self.backButton];
[self.view addSubview:self.enterTopicButton];
@@ -150,7 +150,7 @@
_categoryView.titleColorGradientEnabled = YES;
_categoryView.titleLabelZoomEnabled = NO;
_categoryView.indicators = @[self.lineView];
_categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerView.listContainerView;
_categoryView.listContainer = (id<JXCategoryViewListContainer>)self.pagerContentView.listContainerView;
_categoryView.averageCellSpacingEnabled = NO;
_categoryView.contentEdgeInsetLeft = 20;
_categoryView.contentEdgeInsetRight = 20;
@@ -171,18 +171,18 @@
return _lineView;
}
- (JXPagerListRefreshView *)pagerView {
if (!_pagerView) {
_pagerView = [[JXPagerListRefreshView alloc] initWithDelegate:self];
_pagerView.listContainerView.scrollView.backgroundColor = UIColor.clearColor;
_pagerView.pinSectionHeaderVerticalOffset = (NSInteger) kNavigationHeight;
- (JXPagerListRefreshView *)pagerContentView {
if (!_pagerContentView) {
_pagerContentView = [[JXPagerListRefreshView alloc] initWithDelegate:self];
_pagerContentView.listContainerView.scrollView.backgroundColor = UIColor.clearColor;
_pagerContentView.pinSectionHeaderVerticalOffset = (NSInteger) kNavigationHeight;
}
return _pagerView;
return _pagerContentView;
}
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"推荐", YMLocalizedString(@"XPMonentTopicContainerViewController1")];
_titles = @[YMLocalizedString(@"XPMonentsViewController0" ), YMLocalizedString(@"XPMonentTopicContainerViewController1")];
}
return _titles;
}

View File

@@ -184,7 +184,7 @@
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
self.commentLabel.text = [NSString stringWithFormat:@"所有评论(%@)", self.monentsInfo.commentCount];
self.commentLabel.text = [NSString stringWithFormat:@"%@(%@)",YMLocalizedString(@"XPMonentsDetailViewController2"),self.monentsInfo.commentCount];
return self.sectionView;
}
@@ -221,7 +221,7 @@
if (self.datasource.count > 0) {
MonentsCommentModel* monent = [self.datasource safeObjectAtIndex1:indexPath.row];
self.commentId = monent.commentId;
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", monent.nick];
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@", YMLocalizedString(@"XPMonentsDetailViewController3"),monent.nick];
[self.inputBarView textViewBecomeFirstResponder];
}
}
@@ -239,7 +239,7 @@
- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo {
if (commentInfo) {
self.commentId = commentInfo.replyId;
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", commentInfo.nick];
self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), commentInfo.nick];
[self.inputBarView textViewBecomeFirstResponder];
}
}
@@ -260,7 +260,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsDetailViewController5") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

View File

@@ -186,7 +186,7 @@
#pragma mark - Event Response
- (void)rightButtonAction:(UIButton *)sender {
[TTPopup alertWithMessage:@"清空后所有互动通知将被删除,确定清空吗?" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsInteractiveViewController2") confirmHandler:^{
[[self presenter] clearInteractiveMessage];
} cancelHandler:^{
}];

View File

@@ -170,7 +170,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

View File

@@ -269,7 +269,7 @@
#pragma mark - XPMonentsPublishCollectionViewCellDelegate
- (void)XPMonentsPublishCollectionViewCell:(XPMonentsPublishCollectionViewCell *)view didDeleteItem:(UIImage *)image {
[TTPopup alertWithMessage:@"确认删除吗?" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsPublishViewController1") confirmHandler:^{
if ([self.datasource containsObject:image]) {
[self.datasource removeObject:image];
}
@@ -370,7 +370,7 @@
if (self.isEdited) {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPMonentsPublishViewController2");
config.message = @"还没有发布哎~确定要返回吗?";
config.message = YMLocalizedString(@"XPMomentsSimpleDetailViewController12");
config.confirmButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController4");
config.cancelButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController5");
[TTPopup alertWithConfig:config confirmHandler:^{
@@ -480,7 +480,7 @@
_textView = [[SZTextView alloc] init];
_textView.textColor = [DJDKMIMOMColor mainTextColor];
_textView.font = [UIFont systemFontOfSize:15];
_textView.placeholder = @"记录你此刻生活,分享给有趣的人看...";
_textView.placeholder = [NSString stringWithFormat:@"%@...",YMLocalizedString(@"XPMonentsPublishViewController9")];
_textView.placeholderTextColor = [DJDKMIMOMColor secondTextColor];
_textView.backgroundColor = [UIColor clearColor];
_textView.delegate = self;
@@ -510,7 +510,7 @@
- (UILabel *)descriptionLabel {
if (!_descriptionLabel) {
_descriptionLabel = [[UILabel alloc] init];
_descriptionLabel.text = @"禁止出现商业广告、微信号码、QQ号码、电话号码, 以及低俗、色情、恐怖、暴力和具有侮辱性语言等内容,违规者封号处理 ";
_descriptionLabel.text = YMLocalizedString(@"XPMonentsPublishViewController10");
_descriptionLabel.font = [UIFont systemFontOfSize:11];
_descriptionLabel.textColor = [DJDKMIMOMColor secondTextColor];
_descriptionLabel.numberOfLines = 0;

View File

@@ -148,7 +148,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

View File

@@ -164,7 +164,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

View File

@@ -14,7 +14,7 @@
#import "NSArray+Safe.h"
#import "UIImageConstant.h"
@interface XPHomeBannerTableViewCell ()<SDCycleScrollViewDelegate>
@property (nonatomic, strong) SDCycleScrollView *pi_cycleScrollView;
@property (nonatomic, strong) SDCycleScrollView *pi_BannerView;
@end
@implementation XPHomeBannerTableViewCell
@@ -31,11 +31,11 @@
- (void)initSubViews {
self.backgroundColor = [UIColor clearColor];
self.selectionStyle = UITableViewCellSelectionStyleNone;
[self.contentView addSubview:self.pi_cycleScrollView];
[self.contentView addSubview:self.pi_BannerView];
}
- (void)initSubViewConstraints {
[self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.contentView).mas_offset(16);
make.bottom.mas_equalTo(self.contentView);
make.left.right.mas_equalTo(self.contentView).inset(15);
@@ -61,31 +61,31 @@
}
}];
if (array.count > 0) {
self.pi_cycleScrollView.imageURLStringsGroup = array;
[self.pi_cycleScrollView autoScroll];
self.pi_BannerView.imageURLStringsGroup = array;
[self.pi_BannerView autoScroll];
}
}
}
- (void)setIsMineViewBanner:(BOOL)isMineViewBanner {
[self.pi_cycleScrollView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) {
make.top.bottom.mas_equalTo(self.contentView);
}];
}
- (SDCycleScrollView *)pi_cycleScrollView {
if (!_pi_cycleScrollView) {
_pi_cycleScrollView = [[SDCycleScrollView alloc] init];
_pi_cycleScrollView.backgroundColor = [UIColor clearColor];
_pi_cycleScrollView.layer.cornerRadius = 10;
_pi_cycleScrollView.layer.masksToBounds = YES;
_pi_cycleScrollView.delegate = self;
_pi_cycleScrollView.showPageControl = NO;
_pi_cycleScrollView.autoScrollTimeInterval = 5.0;
_pi_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_pi_cycleScrollView.placeholderImage = [UIImageConstant defalutBannerPlaceholder];
- (SDCycleScrollView *)pi_BannerView {
if (!_pi_BannerView) {
_pi_BannerView = [[SDCycleScrollView alloc] init];
_pi_BannerView.backgroundColor = [UIColor clearColor];
_pi_BannerView.layer.cornerRadius = 10;
_pi_BannerView.layer.masksToBounds = YES;
_pi_BannerView.delegate = self;
_pi_BannerView.showPageControl = NO;
_pi_BannerView.autoScrollTimeInterval = 5.0;
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
_pi_BannerView.placeholderImage = [UIImageConstant defalutBannerPlaceholder];
}
return _pi_cycleScrollView;
return _pi_BannerView;
}

View File

@@ -85,7 +85,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.bgView).offset(65);
make.bottom.mas_equalTo(self.bgView.mas_centerY).offset(-8);
make.right.lessThanOrEqualTo(self.numberImageView.mas_left).offset(-10);
make.right.equalTo(self.numberImageView.mas_left).offset(-10);
}];
[self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -101,6 +101,7 @@
[self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.bgView).offset(-12);
make.width.mas_equalTo(40);
make.centerY.mas_equalTo(self.titleLabel);
}];
@@ -133,6 +134,10 @@
self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.erbanNo];
self.numberLabel.text = [NSString stringWithFormat:@"%ld", _roomInfo.onlineNum];
CGFloat getWidth = [self.numberLabel.text sizeWithAttributes:@{NSFontAttributeName:self.numberLabel.font}].width+5;
[self.numberLabel mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(getWidth);
}];
}
}

View File

@@ -156,7 +156,8 @@
/// @param roundId pkid
/// @param isAccept o 1
+ (void)handleAcrossRoomPKInvite:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid roundId:(NSString *)roundId isAccept:(NSString *)isAccept {
NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9nZXRDcm9zc1BrRGF0YQ=="];///crossroompkround/getCrossPkData
NSString * fang = [NSString stringWithFormat:@"crossroompkround"];///crossroompkround/getCrossPkData
fang = [NSString stringWithFormat:@"%@/replyChallenge",fang];
[self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, roundId, isAccept, nil];
}
@@ -164,7 +165,8 @@
/// @param completion
/// @param roomUid ui
+ (void)getAcrossRoomPKDetail:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid {
NSString * fang = [NSString stringFromBase64String:@""];///
NSString * fang = [NSString stringWithFormat:@"crossroompkround"];///
fang = [NSString stringWithFormat:@"%@/getCrossPkData",fang];
[self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil];
}

View File

@@ -133,7 +133,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont systemFontOfSize:10];
_titleLabel.textColor = [UIColor whiteColor];
_titleLabel.text = @"下一场PK";
_titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKCountDownView0");
}
return _titleLabel;
}

View File

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface XPAcrossRoomPKInviteResultView : UIView
///是否是接受
@property (nonatomic,assign) BOOL isAccept;
@property (nonatomic,assign) BOOL is_XP_Accept;
@end
NS_ASSUME_NONNULL_END

View File

@@ -57,16 +57,18 @@
[self removeFromSuperview];
}
#pragma mark - getter
- (void)setIsAccept:(BOOL)isAccept {
if (isAccept) {
self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView0");
self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_accept_bg"];
} else {
self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView1");
self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_bg"];
}
- (void)setIs_XP_Accept:(BOOL)is_XP_Accept{
_is_XP_Accept = is_XP_Accept;
if (_is_XP_Accept) {
self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView0");
self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_accept_bg"];
} else {
self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView1");
self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_bg"];
}
}
- (UIImageView *)backImageView {
if (!_backImageView) {
_backImageView = [[UIImageView alloc] init];

View File

@@ -280,14 +280,14 @@
if (data.csRank.count > 0) {//
AcrossRoomPkRankModel *contributeInfo = [data.csRank safeObjectAtIndex1:0];
self.contributeNick.text = contributeInfo.nick ? contributeInfo.nick : @"";
self.contributeValue.text = [NSString stringWithFormat:@"神豪值%@", contributeInfo.amount? contributeInfo.amount : @""];
self.contributeValue.text = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPAcrossRoomPKResultView0"), contributeInfo.amount? contributeInfo.amount : @""];
self.contributeAvatar.imageUrl = contributeInfo.avatar;
}
if (data.crRank.count > 0) {
AcrossRoomPkRankModel *charmInfo = [data.crRank safeObjectAtIndex1:0];
self.charmNick.text = charmInfo.nick ? charmInfo.nick : @"";
self.charmValue.text = [NSString stringWithFormat:@"魅力值%@", charmInfo.amount? charmInfo.amount : @""];
self.charmValue.text = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPAcrossRoomPKResultView1"), charmInfo.amount? charmInfo.amount : @""];
self.charmAvatar.imageUrl = charmInfo.avatar;
}
}

View File

@@ -77,7 +77,7 @@
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init];
_titleLabel.text = @"如何开启跨房PK";
_titleLabel.text =YMLocalizedString(@"XPAcrossRoomPKRuleView0");
_titleLabel.textColor = [UIColor whiteColor];
_titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
}
@@ -92,7 +92,7 @@
_ruleTextView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
_ruleTextView.scrollEnabled = NO;
_ruleTextView.editable = NO;
_ruleTextView.text = @"1只有牌照房房主和超管才可以发起跨房pk一次只能选择一个牌照房发起\n2只有房主和超管才可以接受或拒绝跨房pk请求若10秒内不点击pk邀请弹窗弹窗消失视为自动拒绝\n3发起pk时需选择pk时间和pk对象自定义时间下限为5上限为180只能填写整数\n4pk发起后未到pk时间无法自行结束若有特殊情况需提前结束可联系客服但本场pk不算胜负。\n";
_ruleTextView.text = YMLocalizedString(@"XPAcrossRoomPKRuleView1");
}
return _ruleTextView;
}

View File

@@ -684,7 +684,7 @@
_ruleTextView.backgroundColor = [UIColor clearColor];
_ruleTextView.textColor = [UIColor whiteColor];
_ruleTextView.font = [UIFont systemFontOfSize:12];
_ruleTextView.text = @"1按收到的礼物价值积分1钻石=1分礼物值高的一方获胜。\n2PK结束后若比分差距≥1314或双方分数总值≥15000平局除外将在与获胜方相同类型的房间公示PK结果若比分差距≥5200或双方分数总值≥30000平局除外将在全服所有房间公示PK结果。";
_ruleTextView.text = YMLocalizedString(@"XPAcrpssRoomPKPanelView1");
}
return _ruleTextView;
}

View File

@@ -62,7 +62,7 @@
- (void)cancelMatch:(UITapGestureRecognizer *)ges {
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = @"取消匹配?";
config.message = YMLocalizedString(@"XPAnchorPKMatchView0");
[TTPopup alertWithConfig:config confirmHandler:^{
[Api cancelMatchRandomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if (code == 200) {

View File

@@ -37,7 +37,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
///
@property (nonatomic,strong) UIStackView *stackView;
///
@property (nonatomic,strong) SDCycleScrollView *cycleScrollView;
@property (nonatomic,strong) SDCycleScrollView *pi_BannerView;
///
@property (nonatomic,strong) UIView * placeHolderView;
///
@@ -77,7 +77,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
#pragma mark - Private Method
- (void)initSubViews {
[self addSubview:self.stackView];
[self.stackView addArrangedSubview:self.cycleScrollView];
[self.stackView addArrangedSubview:self.pi_BannerView];
[self.stackView addArrangedSubview:self.placeHolderView];
[self.stackView addArrangedSubview:self.firstRechargeImageView];
[self.stackView addArrangedSubview:self.lookLoveImageView];
@@ -90,7 +90,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}];
CGFloat itemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale;
[self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
[self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(itemWidth , itemWidth));
}];
@@ -131,19 +131,19 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
dispatch_group_notify(group,dispatch_get_main_queue(), ^{
self.isLoadActivity = YES;
self.cycleScrollView.hidden = NO;
self.pi_BannerView.hidden = NO;
///
[self configfirstRecharge];
NSMutableArray *picArray = [NSMutableArray array];
for (ActivityInfoModel *model in self.activityList) {
[picArray addObject:model.bannerPic];
}
self.cycleScrollView.imageURLStringsGroup = picArray;
self.pi_BannerView.imageURLStringsGroup = picArray;
if (self.activityList.count > 1) {
[self.cycleScrollView setAutoScroll:YES];
self.cycleScrollView.autoScrollTimeInterval = 3;
[self.pi_BannerView setAutoScroll:YES];
self.pi_BannerView.autoScrollTimeInterval = 3;
} else {
[self.cycleScrollView setAutoScroll:NO];
[self.pi_BannerView setAutoScroll:NO];
}
});
@@ -193,12 +193,12 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
for (ActivityInfoModel *model in self.activityList) {
[picArray addObject:model.bannerPic];
}
self.cycleScrollView.imageURLStringsGroup = picArray;
self.pi_BannerView.imageURLStringsGroup = picArray;
if (self.activityList.count > 1) {
[self.cycleScrollView setAutoScroll:YES];
self.cycleScrollView.autoScrollTimeInterval = 3;
[self.pi_BannerView setAutoScroll:YES];
self.pi_BannerView.autoScrollTimeInterval = 3;
} else {
[self.cycleScrollView setAutoScroll:NO];
[self.pi_BannerView setAutoScroll:NO];
}
if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) {
if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode ) {
@@ -364,24 +364,24 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
}
#pragma mark - Getters And Setters
- (SDCycleScrollView *)cycleScrollView {
if (!_cycleScrollView) {
_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_cycleScrollView.currentPageDotColor = [UIColor whiteColor];
_cycleScrollView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.2];
- (SDCycleScrollView *)pi_BannerView{
if (!_pi_BannerView) {
_pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil];
_pi_BannerView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter;
_pi_BannerView.currentPageDotColor = [UIColor whiteColor];
_pi_BannerView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.2];
_cycleScrollView.pageControlDotSize = CGSizeMake(5, 2);
_cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic;
_cycleScrollView.currentPageDotImage = [UIImage imageNamed:@"room_activity_banner_select"];
_cycleScrollView.pageDotImage = [UIImage imageNamed:@"room_activity_banner_normal"];
_cycleScrollView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit;
_cycleScrollView.pageControlBottomOffset = -10;
_cycleScrollView.hidden = YES;
_pi_BannerView.pageControlDotSize = CGSizeMake(5, 2);
_pi_BannerView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic;
_pi_BannerView.currentPageDotImage = [UIImage imageNamed:@"room_activity_banner_select"];
_pi_BannerView.pageDotImage = [UIImage imageNamed:@"room_activity_banner_normal"];
_pi_BannerView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00];
_pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit;
_pi_BannerView.pageControlBottomOffset = -10;
_pi_BannerView.hidden = YES;
}
return _cycleScrollView;
return _pi_BannerView;
}
- (UIView *)placeHolderView {

Some files were not shown because too many files have changed in this diff Show More