Skip to content

pidan / FuSiLive

Go to a project
Commit 477ce416 by ludi
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 7c42d59c 8c41982c
Inline Side-by-side
Showing with 861 additions and 72 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Extend.h
......@@ -63,4 +63,6 @@
/// @param formatDict 字符串格式字典
+ (NSString *)fus_stringWithDictFormat:(NSString *)format formatDict:(NSDictionary<NSString *, NSString *> *)formatDict;
- (NSString *)fus_adaptFusiString;
@end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Extend.m
......@@ -135,4 +135,43 @@
return format;
}
- (NSString *)fus_adaptFusiString {
NSString *result = self;
if ([result containsString:@"螢火蟲直播"]) {
result = [result stringByReplacingOccurrencesOfString:@"螢火蟲直播" withString:@"福絲直播"];
}
if ([result containsString:@"螢火蟲"]) {
result = [result stringByReplacingOccurrencesOfString:@"螢火蟲" withString:@"福絲"];
}
if ([result containsString:@"firefly live"]) {
result = [result stringByReplacingOccurrencesOfString:@"firefly live" withString:@"fusi live"];
}
if ([result containsString:@"firefly"]) {
result = [result stringByReplacingOccurrencesOfString:@"firefly" withString:@"fusi"];
}
if ([result containsString:@"Firefly Live"]) {
result = [result stringByReplacingOccurrencesOfString:@"Firefly Live" withString:@"Fusi Live"];
}
if ([result containsString:@"Firefly"]) {
result = [result stringByReplacingOccurrencesOfString:@"Firefly" withString:@"Fusi"];
}
if ([result containsString:@"FIREFLY LIVE"]) {
result = [result stringByReplacingOccurrencesOfString:@"FIREFLY LIVE" withString:@"FUSI LIVE"];
}
if ([result containsString:@"FIREFLY"]) {
result = [result stringByReplacingOccurrencesOfString:@"FIREFLY" withString:@"FUSI"];
}
return result;
}
@end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Http/FUSHttpHelper.m
......@@ -160,7 +160,11 @@
if (code == 1) {
if (success) success(dataDict, code);
}else{
if (failure) failure(dataDict, code);
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:dataDict];
if (![NSString isNullWithString:dict[@"msg"]]) {
dict[@"msg"] = [(NSString *)dict[@"msg"] fus_adaptFusiString];
}
if (failure) failure([dict copy], code);
}
} failure:^(NSURLSessionDataTask *operation, NSError *error) {
......@@ -250,7 +254,11 @@
if (code == 1) {
if (success) success(dataDict, code);
}else{
if (failure) failure(dataDict, code);
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:dataDict];
if (![NSString isNullWithString:dict[@"msg"]]) {
dict[@"msg"] = [(NSString *)dict[@"msg"] fus_adaptFusiString];
}
if (failure) failure([dict copy], code);
}
} failure:^(NSURLSessionDataTask *operation, NSError *error) {
......@@ -361,7 +369,12 @@
if (code == 1) {
if (success) success(dataDict, code);
}else{
if (failure) failure(dataDict, code);
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:dataDict];
if (![NSString isNullWithString:dict[@"msg"]]) {
dict[@"msg"] = [(NSString *)dict[@"msg"] fus_adaptFusiString];
}
if (failure) failure([dict copy], code);
}
} failure:^(NSURLSessionDataTask *operation, NSError *error) {
......@@ -499,7 +512,12 @@
if (code == 1) {
if (success) success(dataDict, code);
}else{
if (failure) failure(dataDict, code);
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:dataDict];
if (![NSString isNullWithString:dict[@"msg"]]) {
dict[@"msg"] = [(NSString *)dict[@"msg"] fus_adaptFusiString];
}
if (failure) failure([dict copy], code);
}
} failure:^(NSURLSessionDataTask *operation, NSError *error) {
if (retryTimes > 0) {
......@@ -1358,6 +1376,7 @@ NSString *decimalNumberWithDouble(double conversionValue){
if ([jsonStr hasPrefix:@"\""]){
jsonStr = [jsonStr stringByReplacingOccurrencesOfString:@"\\\""withString:@"\""];
jsonStr = [jsonStr substringWithRange:NSMakeRange(1, [jsonStr length] - 2)];
if ([NSDictionary isNull:[jsonStr converToDictionary]]) {
NSString *temp = [[ObfuseTableBase64 inst] decode:jsonStr];
if (temp) {
......@@ -1387,6 +1406,7 @@ NSString *decimalNumberWithDouble(double conversionValue){
jsonStr = [jsonStr stringByReplacingOccurrencesOfString:@"\r"withString:@""];
jsonStr = [jsonStr stringByReplacingOccurrencesOfString:@"\n"withString:@""];
jsonStr = [jsonStr stringByReplacingOccurrencesOfString:@"\t"withString:@""];
jsonStr = [jsonStr fus_adaptFusiString];
// 将JSON字符串转换为字典
NSData *jsonData = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
......@@ -1453,6 +1473,8 @@ NSString *decimalNumberWithDouble(double conversionValue){
}
}
jsonStr = [jsonStr fus_adaptFusiString];
// 将JSON字符串转换为字典
NSData *jsonData = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
if ([NSData isNull:jsonData])
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -256,6 +256,25 @@
BE8C62092C3809CF00991716 /* FUSBaoFangHomeFocusCollectionViewSmallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8C62082C3809CF00991716 /* FUSBaoFangHomeFocusCollectionViewSmallCell.m */; };
BE8C620D2C3815F600991716 /* FUSMainSearchViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE8C620A2C3815F500991716 /* FUSMainSearchViewController.xib */; };
BE8C620E2C3815F600991716 /* FUSMainSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8C620C2C3815F500991716 /* FUSMainSearchViewController.m */; };
BE8C62112C3BE23400991716 /* FUSGotBackpackItemAnimView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8C620F2C3BE23300991716 /* FUSGotBackpackItemAnimView.m */; };
BE8C62252C3BFE0400991716 /* backpack_bg_light_anim_0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62122C3BFE0400991716 /* backpack_bg_light_anim_0@2x.png */; };
BE8C62262C3BFE0400991716 /* backpack_bg_light_anim_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62132C3BFE0400991716 /* backpack_bg_light_anim_1@2x.png */; };
BE8C62272C3BFE0400991716 /* backpack_bg_light_anim_2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62142C3BFE0400991716 /* backpack_bg_light_anim_2@2x.png */; };
BE8C62282C3BFE0400991716 /* backpack_bg_light_anim_3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62152C3BFE0400991716 /* backpack_bg_light_anim_3@2x.png */; };
BE8C62292C3BFE0400991716 /* backpack_bg_light_anim_4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62162C3BFE0400991716 /* backpack_bg_light_anim_4@2x.png */; };
BE8C622A2C3BFE0400991716 /* backpack_bg_light_anim_5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62172C3BFE0400991716 /* backpack_bg_light_anim_5@2x.png */; };
BE8C622B2C3BFE0400991716 /* backpack_bg_light_anim_6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62182C3BFE0400991716 /* backpack_bg_light_anim_6@2x.png */; };
BE8C622C2C3BFE0400991716 /* backpack_bg_light_anim_7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62192C3BFE0400991716 /* backpack_bg_light_anim_7@2x.png */; };
BE8C622D2C3BFE0400991716 /* backpack_bg_light_anim_8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621A2C3BFE0400991716 /* backpack_bg_light_anim_8@2x.png */; };
BE8C622E2C3BFE0400991716 /* backpack_bg_light_anim_9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621B2C3BFE0400991716 /* backpack_bg_light_anim_9@2x.png */; };
BE8C622F2C3BFE0400991716 /* backpack_bg_light_anim_10@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621C2C3BFE0400991716 /* backpack_bg_light_anim_10@2x.png */; };
BE8C62302C3BFE0400991716 /* backpack_bg_light_anim_11@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621D2C3BFE0400991716 /* backpack_bg_light_anim_11@2x.png */; };
BE8C62312C3BFE0400991716 /* backpack_bg_light_anim_12@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621E2C3BFE0400991716 /* backpack_bg_light_anim_12@2x.png */; };
BE8C62322C3BFE0400991716 /* backpack_bg_light_anim_13@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C621F2C3BFE0400991716 /* backpack_bg_light_anim_13@2x.png */; };
BE8C62332C3BFE0400991716 /* backpack_bg_light_anim_14@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62202C3BFE0400991716 /* backpack_bg_light_anim_14@2x.png */; };
BE8C62342C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62212C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png */; };
BE8C62352C3BFE0400991716 /* backpack_bg_light_anim_16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62222C3BFE0400991716 /* backpack_bg_light_anim_16@2x.png */; };
BE8C62362C3BFE0400991716 /* backpack_bg_light_anim_17@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE8C62232C3BFE0400991716 /* backpack_bg_light_anim_17@2x.png */; };
BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743D12C3529E70061A55F /* InfoPlist.strings */; };
BE9743E32C352CE40061A55F /* Fusi_Japanese.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743DB2C352CE20061A55F /* Fusi_Japanese.strings */; };
BE9743E42C352CE40061A55F /* Fusi_Indonesian.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743DC2C352CE30061A55F /* Fusi_Indonesian.strings */; };
......@@ -1700,6 +1719,26 @@
BE8C620A2C3815F500991716 /* FUSMainSearchViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FUSMainSearchViewController.xib; path = FuSiLive/Classes/Search/Controller/FUSMainSearchViewController.xib; sourceTree = SOURCE_ROOT; };
BE8C620B2C3815F500991716 /* FUSMainSearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUSMainSearchViewController.h; path = FuSiLive/Classes/Search/Controller/FUSMainSearchViewController.h; sourceTree = SOURCE_ROOT; };
BE8C620C2C3815F500991716 /* FUSMainSearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUSMainSearchViewController.m; path = FuSiLive/Classes/Search/Controller/FUSMainSearchViewController.m; sourceTree = SOURCE_ROOT; };
BE8C620F2C3BE23300991716 /* FUSGotBackpackItemAnimView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSGotBackpackItemAnimView.m; sourceTree = "<group>"; };
BE8C62102C3BE23400991716 /* FUSGotBackpackItemAnimView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSGotBackpackItemAnimView.h; sourceTree = "<group>"; };
BE8C62122C3BFE0400991716 /* backpack_bg_light_anim_0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_0@2x.png"; sourceTree = "<group>"; };
BE8C62132C3BFE0400991716 /* backpack_bg_light_anim_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_1@2x.png"; sourceTree = "<group>"; };
BE8C62142C3BFE0400991716 /* backpack_bg_light_anim_2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_2@2x.png"; sourceTree = "<group>"; };
BE8C62152C3BFE0400991716 /* backpack_bg_light_anim_3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_3@2x.png"; sourceTree = "<group>"; };
BE8C62162C3BFE0400991716 /* backpack_bg_light_anim_4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_4@2x.png"; sourceTree = "<group>"; };
BE8C62172C3BFE0400991716 /* backpack_bg_light_anim_5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_5@2x.png"; sourceTree = "<group>"; };
BE8C62182C3BFE0400991716 /* backpack_bg_light_anim_6@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_6@2x.png"; sourceTree = "<group>"; };
BE8C62192C3BFE0400991716 /* backpack_bg_light_anim_7@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_7@2x.png"; sourceTree = "<group>"; };
BE8C621A2C3BFE0400991716 /* backpack_bg_light_anim_8@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_8@2x.png"; sourceTree = "<group>"; };
BE8C621B2C3BFE0400991716 /* backpack_bg_light_anim_9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_9@2x.png"; sourceTree = "<group>"; };
BE8C621C2C3BFE0400991716 /* backpack_bg_light_anim_10@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_10@2x.png"; sourceTree = "<group>"; };
BE8C621D2C3BFE0400991716 /* backpack_bg_light_anim_11@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_11@2x.png"; sourceTree = "<group>"; };
BE8C621E2C3BFE0400991716 /* backpack_bg_light_anim_12@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_12@2x.png"; sourceTree = "<group>"; };
BE8C621F2C3BFE0400991716 /* backpack_bg_light_anim_13@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_13@2x.png"; sourceTree = "<group>"; };
BE8C62202C3BFE0400991716 /* backpack_bg_light_anim_14@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_14@2x.png"; sourceTree = "<group>"; };
BE8C62212C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_15@2x.png"; sourceTree = "<group>"; };
BE8C62222C3BFE0400991716 /* backpack_bg_light_anim_16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_16@2x.png"; sourceTree = "<group>"; };
BE8C62232C3BFE0400991716 /* backpack_bg_light_anim_17@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backpack_bg_light_anim_17@2x.png"; sourceTree = "<group>"; };
BE9743D02C3529E70061A55F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
BE9743D32C3529F70061A55F /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
BE9743D42C352A010061A55F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
......@@ -4490,6 +4529,31 @@
path = ProgressView;
sourceTree = "<group>";
};
BE8C62242C3BFE0400991716 /* BgLightAnims */ = {
isa = PBXGroup;
children = (
BE8C62122C3BFE0400991716 /* backpack_bg_light_anim_0@2x.png */,
BE8C62132C3BFE0400991716 /* backpack_bg_light_anim_1@2x.png */,
BE8C62142C3BFE0400991716 /* backpack_bg_light_anim_2@2x.png */,
BE8C62152C3BFE0400991716 /* backpack_bg_light_anim_3@2x.png */,
BE8C62162C3BFE0400991716 /* backpack_bg_light_anim_4@2x.png */,
BE8C62172C3BFE0400991716 /* backpack_bg_light_anim_5@2x.png */,
BE8C62182C3BFE0400991716 /* backpack_bg_light_anim_6@2x.png */,
BE8C62192C3BFE0400991716 /* backpack_bg_light_anim_7@2x.png */,
BE8C621A2C3BFE0400991716 /* backpack_bg_light_anim_8@2x.png */,
BE8C621B2C3BFE0400991716 /* backpack_bg_light_anim_9@2x.png */,
BE8C621C2C3BFE0400991716 /* backpack_bg_light_anim_10@2x.png */,
BE8C621D2C3BFE0400991716 /* backpack_bg_light_anim_11@2x.png */,
BE8C621E2C3BFE0400991716 /* backpack_bg_light_anim_12@2x.png */,
BE8C621F2C3BFE0400991716 /* backpack_bg_light_anim_13@2x.png */,
BE8C62202C3BFE0400991716 /* backpack_bg_light_anim_14@2x.png */,
BE8C62212C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png */,
BE8C62222C3BFE0400991716 /* backpack_bg_light_anim_16@2x.png */,
BE8C62232C3BFE0400991716 /* backpack_bg_light_anim_17@2x.png */,
);
path = BgLightAnims;
sourceTree = "<group>";
};
BEC996012BFCD19500EBD348 = {
isa = PBXGroup;
children = (
......@@ -7853,9 +7917,14 @@
BED0F8742C0C49C80017B285 /* TaskCenter */ = {
isa = PBXGroup;
children = (
BE8C62102C3BE23400991716 /* FUSGotBackpackItemAnimView.h */,
BE8C620F2C3BE23300991716 /* FUSGotBackpackItemAnimView.m */,
BED0F8592C0C49C80017B285 /* FUSInvitationAwardView.h */,
BED0F85A2C0C49C80017B285 /* FUSInvitationAwardView.m */,
BED0F85B2C0C49C80017B285 /* FUSInvitationAwardView.xib */,
00A0357F2C33F3FF007FAE44 /* FUSMissionCenterNoTaskCell.h */,
00A035802C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m */,
00A035812C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib */,
BED0F85F2C0C49C80017B285 /* FUSTaskCenterHeaderSimpleTableViewCell.h */,
BED0F8602C0C49C80017B285 /* FUSTaskCenterHeaderSimpleTableViewCell.m */,
BED0F8612C0C49C80017B285 /* FUSTaskCenterHeaderSimpleTableViewCell.xib */,
......@@ -7877,9 +7946,6 @@
BED0F8712C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.h */,
BED0F8722C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.m */,
BED0F8732C0C49C80017B285 /* FUSTaskCenterTextTableViewCell.xib */,
00A0357F2C33F3FF007FAE44 /* FUSMissionCenterNoTaskCell.h */,
00A035802C33F400007FAE44 /* FUSMissionCenterNoTaskCell.m */,
00A035812C33F400007FAE44 /* FUSMissionCenterNoTaskCell.xib */,
);
path = TaskCenter;
sourceTree = "<group>";
......@@ -8330,6 +8396,7 @@
BEDC66832C09DAE700505F76 /* picture */ = {
isa = PBXGroup;
children = (
BE8C62242C3BFE0400991716 /* BgLightAnims */,
BEDC66192C09DAE700505F76 /* BaoFang */,
BEDC661E2C09DAE700505F76 /* common */,
BEDC66492C09DAE700505F76 /* live */,
......@@ -8523,6 +8590,7 @@
BEDC6EE12C09DAE800505F76 /* dew_sky_award.json in Resources */,
BED0F9A02C0C49C90017B285 /* FUSVideoChatSetItem.xib in Resources */,
BED0FC172C0C49CA0017B285 /* FUSSingleLiveRecordTableViewCell.xib in Resources */,
BE8C62302C3BFE0400991716 /* backpack_bg_light_anim_11@2x.png in Resources */,
BED0F9B82C0C49C90017B285 /* FUSChatDetailPrivateLiveTopView.xib in Resources */,
BED0FBDF2C0C49CA0017B285 /* FUSEmotionCollectionViewCell.xib in Resources */,
BED0F9BD2C0C49C90017B285 /* FUSSingleLiveGradePopView.xib in Resources */,
......@@ -8546,6 +8614,7 @@
BED0FBF22C0C49CA0017B285 /* FUSApiTestViewController.xib in Resources */,
BEDC6F7E2C09DAE900505F76 /* zone_account_backgroud.png in Resources */,
BE8C620D2C3815F600991716 /* FUSMainSearchViewController.xib in Resources */,
BE8C62282C3BFE0400991716 /* backpack_bg_light_anim_3@2x.png in Resources */,
BEDC6F2E2C09DAE900505F76 /* live_head_follow_btn_anim_5@2x.png in Resources */,
BEDC6ED62C09DAE800505F76 /* dew_sky_award_0.png in Resources */,
BEDC6ECA2C09DAE800505F76 /* img_1.png in Resources */,
......@@ -8593,6 +8662,7 @@
BED0FAA42C0C49C90017B285 /* FUSSendGiftUserListCollectionViewCell.xib in Resources */,
BED0FC7D2C0C49CA0017B285 /* FUSInvitationAwardView.xib in Resources */,
BEDC6F772C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_11@2x.png in Resources */,
BE8C62332C3BFE0400991716 /* backpack_bg_light_anim_14@2x.png in Resources */,
BED0FAB52C0C49C90017B285 /* FUSPKRecordView.xib in Resources */,
BEDC6F272C09DAE900505F76 /* common_empty_bg_img.png in Resources */,
BED0FBB22C0C49CA0017B285 /* FUSNetworkCheckCaptureView.xib in Resources */,
......@@ -8622,6 +8692,7 @@
BED0F99B2C0C49C90017B285 /* FUSGiftViewCell.xib in Resources */,
BED0FB2B2C0C49CA0017B285 /* article_editor.js in Resources */,
BE9743E42C352CE40061A55F /* Fusi_Indonesian.strings in Resources */,
BE8C62362C3BFE0400991716 /* backpack_bg_light_anim_17@2x.png in Resources */,
BEDC6F392C09DAE900505F76 /* box_000010.png in Resources */,
BED0FC5E2C0C49CA0017B285 /* FUSMyZoneSendJewelCountCell.xib in Resources */,
BEDC6F602C09DAE900505F76 /* zone_voice_sign_setting_play_anim_2@3x.png in Resources */,
......@@ -8639,6 +8710,7 @@
BED0FAD52C0C49C90017B285 /* FUSLiveTreasureBoxGrabView.xib in Resources */,
BED0FB2F2C0C49CA0017B285 /* RichEditor.html in Resources */,
BEDC6F222C09DAE800505F76 /* DailyCheckInSmallBg.png in Resources */,
BE8C622E2C3BFE0400991716 /* backpack_bg_light_anim_9@2x.png in Resources */,
BED0FAD32C0C49C90017B285 /* FUSLiveTreasureBoxGrabUserListCell.xib in Resources */,
BED0F9D12C0C49C90017B285 /* FUSStartPageViewController.xib in Resources */,
00A0C5642C2676010044A41D /* FUSMessageRegisterViewController.xib in Resources */,
......@@ -8663,6 +8735,7 @@
BED0F9AC2C0C49C90017B285 /* FUSVideoChatFailAlertView.xib in Resources */,
BE818A852C22BD8F004C8C6B /* live_minimize_anim_9@2x.png in Resources */,
BEDC6F5F2C09DAE900505F76 /* zone_voice_sign_setting_play_anim_1@3x.png in Resources */,
BE8C62342C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png in Resources */,
BED0FA812C0C49C90017B285 /* FUSLiveMessageBoxChatCell.xib in Resources */,
BEDC6F642C09DAE900505F76 /* zone_voice_sign_setting_play_anim_6@3x.png in Resources */,
BED0FC032C0C49CA0017B285 /* background.png in Resources */,
......@@ -8671,6 +8744,7 @@
BED0FC602C0C49CA0017B285 /* FUSMyZoneSignTagAddressCell.xib in Resources */,
BEDC6F762C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_10@2x.png in Resources */,
BED0FBAC2C0C49CA0017B285 /* FUSChatSettingExtraCell.xib in Resources */,
BE8C62312C3BFE0400991716 /* backpack_bg_light_anim_12@2x.png in Resources */,
BEDC6F212C09DAE800505F76 /* DailyCheckInBigBg.png in Resources */,
BEDC6EE42C09DAE800505F76 /* normal_reward_img_1.png in Resources */,
BED0FB2D2C0C49CA0017B285 /* jquery.js in Resources */,
......@@ -8709,6 +8783,7 @@
BED0FC812C0C49CA0017B285 /* FUSTaskCenterHeaderSimpleTableViewCell.xib in Resources */,
BEDC6F582C09DAE900505F76 /* zone_small_followed_anim_1@2x.png in Resources */,
BEDC6EED2C09DAE800505F76 /* gift_dew_award_sky.mp3 in Resources */,
BE8C622C2C3BFE0400991716 /* backpack_bg_light_anim_7@2x.png in Resources */,
BEDC6F702C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_4@2x.png in Resources */,
BED0FC6D2C0C49CA0017B285 /* FUSMyZoneHeaderView.xib in Resources */,
BED0FBB82C0C49CA0017B285 /* FUSSettingThirdPartyTableViewCell.xib in Resources */,
......@@ -8732,6 +8807,7 @@
BED0F9CD2C0C49C90017B285 /* FUSSetupPasswordViewController.xib in Resources */,
BEF819232C1AFFA700719DE0 /* TTSDKLisenceFile in Resources */,
BED0F9DD2C0C49C90017B285 /* FUSBindSuccessPopView.xib in Resources */,
BE8C62322C3BFE0400991716 /* backpack_bg_light_anim_13@2x.png in Resources */,
BEDC6EEA2C09DAE800505F76 /* normal_reward_dew_img_3.png in Resources */,
BEDC6F412C09DAE900505F76 /* live_link_micro_request_1.png in Resources */,
BED0F9E22C0C49C90017B285 /* FUSRegistPromptView.xib in Resources */,
......@@ -8793,6 +8869,7 @@
BED0FC5A2C0C49CA0017B285 /* FUSMyZoneMotoringCell.xib in Resources */,
BED0FB5B2C0C49CA0017B285 /* FUSNewsFeedMessageCell.xib in Resources */,
BED0FB452C0C49CA0017B285 /* FUSPublishPhotoCollectionViewCell.xib in Resources */,
BE8C622A2C3BFE0400991716 /* backpack_bg_light_anim_5@2x.png in Resources */,
BED0FC2C2C0C49CA0017B285 /* FUSZoneSendJewelRankController.xib in Resources */,
BED0FC622C0C49CA0017B285 /* FUSMyZoneVideoCreditCell.xib in Resources */,
BEDC6F6A2C09DAE900505F76 /* zone_voice_sign_setting_play_anim_12@3x.png in Resources */,
......@@ -8803,6 +8880,8 @@
BED0FC732C0C49CA0017B285 /* FUSVideoCreditDetailsView.xib in Resources */,
BED0FA3A2C0C49C90017B285 /* FUSRoomShareButton.xib in Resources */,
BED0FC1F2C0C49CA0017B285 /* FUSOfficialImageTableViewCell.xib in Resources */,
BE8C62272C3BFE0400991716 /* backpack_bg_light_anim_2@2x.png in Resources */,
BE8C62252C3BFE0400991716 /* backpack_bg_light_anim_0@2x.png in Resources */,
BED0FBED2C0C49CA0017B285 /* FUSScale3ViewController.xib in Resources */,
BE818A9D2C22E2DA004C8C6B /* FUSPopularListView.xib in Resources */,
BED0F9662C0C49C90017B285 /* FUSNameLevelView.xib in Resources */,
......@@ -8830,6 +8909,7 @@
BEDC6F3E2C09DAE900505F76 /* 3_live_first_recharge_package_detail_placeholder.png in Resources */,
BEDC6F792C09DAE900505F76 /* 2_icon_zone_bind_success.png in Resources */,
BEDC6F782C09DAE900505F76 /* 1_icon_zone_bind_success.png in Resources */,
BE8C622D2C3BFE0400991716 /* backpack_bg_light_anim_8@2x.png in Resources */,
BEDC6F652C09DAE900505F76 /* zone_voice_sign_setting_play_anim_7@3x.png in Resources */,
BEDC6F7B2C09DAE900505F76 /* fireFly_my_zone_exchange_dew_bgView.png in Resources */,
BED0FB0A2C0C49CA0017B285 /* FUSLiveVideoProgressBar.xib in Resources */,
......@@ -8866,9 +8946,11 @@
BEDC6F5E2C09DAE900505F76 /* zone_voice_sign_setting_play_anim_0@3x.png in Resources */,
BED0FC892C0C49CA0017B285 /* FUSTaskCenterProcessTableViewCell.xib in Resources */,
BE9743E92C352CE40061A55F /* Fusi_vietnamese.strings in Resources */,
BE8C622B2C3BFE0400991716 /* backpack_bg_light_anim_6@2x.png in Resources */,
BED0FB492C0C49CA0017B285 /* WGInputAlertView.xib in Resources */,
BED0FA2C2C0C49C90017B285 /* FUSLiveChatGiftSuspendTipView.xib in Resources */,
BED0FC562C0C49CA0017B285 /* FUSMyZoneInfoCell.xib in Resources */,
BE8C62352C3BFE0400991716 /* backpack_bg_light_anim_16@2x.png in Resources */,
BEDC6EDD2C09DAE800505F76 /* dew_sky_award_7.png in Resources */,
BED0FBFB2C0C49CA0017B285 /* FUSTestViewController.xib in Resources */,
BED0FACE2C0C49C90017B285 /* FUSLiveBoxDetailSettingView.xib in Resources */,
......@@ -8881,13 +8963,16 @@
BED0FAFF2C0C49CA0017B285 /* FUSVideoStartSetTitleView.xib in Resources */,
BEDC6F6C2C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_0@2x.png in Resources */,
BED0F8A52C0C49C80017B285 /* FUSSingleDailyCheckInView.xib in Resources */,
BE8C622F2C3BFE0400991716 /* backpack_bg_light_anim_10@2x.png in Resources */,
BEDC6F572C09DAE900505F76 /* zone_small_followed_anim_0@2x.png in Resources */,
BED0FAF62C0C49CA0017B285 /* FUSLiveWecomeEnterView.xib in Resources */,
BED0FAE82C0C49C90017B285 /* FUSRoomGuideSlideNoticeView.xib in Resources */,
BEDC6F6D2C09DAE900505F76 /* zone_voice_sign_play_btn_icon_anim_1@2x.png in Resources */,
BEDC6ED52C09DAE800505F76 /* big_reward_data.json in Resources */,
BEDC6F342C09DAE900505F76 /* box_00005.png in Resources */,
BE8C62262C3BFE0400991716 /* backpack_bg_light_anim_1@2x.png in Resources */,
BED0FBBA2C0C49CA0017B285 /* FUSFullImageViewController.xib in Resources */,
BE8C62292C3BFE0400991716 /* backpack_bg_light_anim_4@2x.png in Resources */,
BEDC6F482C09DAE900505F76 /* live_link_micro_request_8.png in Resources */,
BEDC6F402C09DAE900505F76 /* live_link_micro_request_0.png in Resources */,
BED0F9B52C0C49C90017B285 /* FUSIMVoiceButtonView.xib in Resources */,
......@@ -9455,6 +9540,7 @@
BED0FBFF2C0C49CA0017B285 /* FUSTestScrollHeaderCell.m in Sources */,
BE5F4D482C1D957C004B54AA /* FUSContributeListView.m in Sources */,
BED0FB612C0C49CA0017B285 /* FUSNewsFeedUnlockAlert.m in Sources */,
BE8C62112C3BE23400991716 /* FUSGotBackpackItemAnimView.m in Sources */,
BED0F96C2C0C49C90017B285 /* FUSLiveGiftCategoryDataModel.m in Sources */,
BED0FA2F2C0C49C90017B285 /* FUSLiveChatInputHelper.m in Sources */,
BED0F93B2C0C49C90017B285 /* FUSPhotoViewController.m in Sources */,
......
FuSiLive/AppDelegate.m
......@@ -117,38 +117,6 @@ static dispatch_queue_t get_status_queue() {
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// NSString *document = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingString:@"/ATest"];
// [FUSFileHelper createDirectoryAtPath:document];
//
// for (NSInteger i = 1; i <= 99;i++) {
// NSString *filePath = [document stringByAppendingPathComponent:[NSString stringWithFormat:@"fus_time_level_%zd.png",i]];
//
// if (![FUSFileHelper fus_isExistFileAtPath:filePath]) {
// CGFloat width = 20;
//
// /// 生成等级图片。保存在本地，然后再将路径加入HTML里面
// UILabel *timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, width, 14)];
// timeLabel.text = @(i).stringValue;
// timeLabel.backgroundColor = [UIColor colorWithWhite:1 alpha:0.32];
// timeLabel.textColor = [UIColor whiteColor];
// timeLabel.font = [UIFont fus_themeFont:9];
// timeLabel.layer.cornerRadius = 7;
// timeLabel.textAlignment = NSTextAlignmentCenter;
// timeLabel.layer.masksToBounds = YES;
//
// UIGraphicsBeginImageContextWithOptions(timeLabel.bounds.size, NO, [UIScreen mainScreen].scale);
// [timeLabel drawViewHierarchyInRect:timeLabel.bounds afterScreenUpdates:YES];
// UIImage *screenImage = UIGraphicsGetImageFromCurrentImageContext();
// UIGraphicsEndImageContext();
//
// if (screenImage) {
// NSData *imageData = UIImagePNGRepresentation(screenImage);
// [FUSFileHelper fus_writeDataToFile:imageData filePath:filePath];
// }
// }
// }
[FUSConfig fus_setUpFusiLiveConfigs];
[[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO];
......
FuSiLive/Classes/BaoFang/Broadcast/Model/FUSBroadcastModel.m
......@@ -96,7 +96,7 @@
}
}
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent];
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent whiteBg:YES];
return _languageContent;
}
......
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangBroadcastModel.m
......@@ -51,14 +51,8 @@
}
}
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent];
/// 在主包里面，是黑底白字的。但是在首页是白底黑字的，所以强制吧首页广播的白色改成黑色：added by pidan
if ([_languageContent containsString:@"FFFFFF"]) {
_languageContent = [_languageContent stringByReplacingOccurrencesOfString:@"FFFFFF" withString:@"000000"];
}
if ([_languageContent containsString:@"ffffff"]) {
_languageContent = [_languageContent stringByReplacingOccurrencesOfString:@"ffffff" withString:@"000000"];
}
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent whiteBg:YES];
return _languageContent;
}
......@@ -76,7 +70,7 @@
dispatch_async(dispatch_get_global_queue(0, 0), ^{
self.attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:self.languageContent baseColor:@"222222" font:[UIFont fus_themeFont:13] needRTLTransfer:FUSRTL.isRTL imgHeight:33 imgWidth:33];
self.attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:self.languageContent baseColor:@"222222" font:[UIFont fus_themeFont:13] needRTLTransfer:FUSRTL.isRTL imgHeight:15 imgWidth:0];
dispatch_async(dispatch_get_main_queue(), ^{
if (completed) {
......
FuSiLive/Classes/Common/View/FUSDewAwardAnimationView.m
......@@ -27,7 +27,7 @@
[largeLotAnimView.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
[largeLotAnimView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
[largeLotAnimView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor constant:-(UIView.fus_SafeBottom + UIView.fus_SafeTop)].active = YES;
[largeLotAnimView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
[largeLotAnimView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
largeLotAnimView.contentMode = UIViewContentModeScaleAspectFill;
......@@ -73,7 +73,7 @@
[largeLotAnimView.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
[largeLotAnimView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
[largeLotAnimView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
[largeLotAnimView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
[largeLotAnimView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
CompatibleAnimationKeypath *largePath = [[CompatibleAnimationKeypath alloc] initWithKeys:@[@"右边图片.png"]];
......
FuSiLive/Classes/Common/View/FUSWebShareView.m
......@@ -262,9 +262,9 @@
- (void)setupUI
{
if (_from == FUSFromInvitShare) {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), @(WechatFriendPlatform), @(WechatCirclePaltform), @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
} else {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), @(WechatFriendPlatform), @(WechatCirclePaltform), @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
}
if (_from == FUSFromInvitShare) {
......
FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDBOperate.m
......@@ -73,6 +73,7 @@
case CID_OFFICIAL_MESSAGE: // 官方推送消息
{
NSMutableArray *officialModelArray = [NSMutableArray arrayWithArray:self.classifyMessageDict[OFFICIAL_MESSAGE]];
[messageModel.jsondata fus_adaptFusiString];
[officialModelArray addObject:messageModel];
[self.classifyMessageDict setObject:officialModelArray forKey:OFFICIAL_MESSAGE];
_msgCount++;
......
FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageModel.m
......@@ -60,7 +60,7 @@
self.time = time;
self.extend1 = extend1;
self.extend2 = extend2;
self.jsondata = jsondata;
self.jsondata = [jsondata fus_adaptFusiString];
}
return self;
}
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/FUSIMGiftView.m
......@@ -336,6 +336,7 @@
- (NSMutableAttributedString *)handleGiftDescription:(FUSChatGiftDataModel *)chatGiftDataModel {
if (chatGiftDataModel.giftdesc) {
chatGiftDataModel.giftdesc = [chatGiftDataModel.giftdesc fus_adaptFusiString];
NSString *firstStr = [chatGiftDataModel.giftdesc stringByReplacingOccurrencesOfString:@"{giftname}" withString:@""];
NSString *bonds = [NSString stringWithFormat:@"%ld",chatGiftDataModel.giveprice.integerValue];
NSString *secondStr = [firstStr stringByReplacingOccurrencesOfString:@"{bonds}" withString:bonds];
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatGiftView.m
......@@ -480,6 +480,9 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
- (NSMutableAttributedString *)handleGiftDescription:(FUSChatConversationGiftDataModel *)chatGiftDataModel {
if (![FUSChatConversationGiftDataModel fus_isNullWithModel:chatGiftDataModel] && chatGiftDataModel.giftdesc) {
chatGiftDataModel.giftdesc = [chatGiftDataModel.giftdesc fus_adaptFusiString];
NSString *firstStr = [chatGiftDataModel.giftdesc stringByReplacingOccurrencesOfString:@"{giftname}" withString:@""];
NSString *bonds = [NSString stringWithFormat:@"%ld",chatGiftDataModel.giveprice.integerValue];
NSString *secondStr = [firstStr stringByReplacingOccurrencesOfString:@"{bonds}" withString:bonds];
......
FuSiLive/Classes/NewLive/Main/Other/FormatContent/FUSFormatContentHelper.h
......@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSString *)fus_replaceFusiLevelImg:(NSString *)content;
+ (NSString *)fus_replaceFusiLevelImg:(NSString *)content whiteBg:(BOOL)whiteBg;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/NewLive/Main/Other/FormatContent/FUSFormatContentHelper.m
......@@ -338,11 +338,25 @@
}
+ (NSString *)fus_replaceFusiLevelImg:(NSString *)content {
return [self fus_replaceFusiLevelImg:content whiteBg:NO];
}
+ (NSString *)fus_replaceFusiLevelImg:(NSString *)content whiteBg:(BOOL)whiteBg {
if ([NSString isNull:content]) {
return content;
}
if (whiteBg) {
/// 在主包里面，是黑底白字的。但是在首页是白底黑字的，所以强制吧首页广播的白色改成黑色：added by pidan
if ([content containsString:@"FFFFFF"]) {
content = [content stringByReplacingOccurrencesOfString:@"FFFFFF" withString:@"000000"];
}
if ([content containsString:@"ffffff"]) {
content = [content stringByReplacingOccurrencesOfString:@"ffffff" withString:@"000000"];
}
}
//fusi_img:图片
//fusi_font:文字颜色
//fusi_del:删除标签
......@@ -415,6 +429,9 @@
continue;
} else {
NSString *path = [NSString stringWithFormat:@"<img src=https://big.bgp.ourpow.com/comm/userlevel/fusi/TimeLevels/fus_time_level_%zd.png />",level];
if (whiteBg) {
path = [NSString stringWithFormat:@"<img src=https://big.bgp.ourpow.com/comm/userlevel/fusi/TimeLevels/fus_time_gray_level_%zd.png />",level];
}
content = [content stringByReplacingCharactersInRange:result.range withString:path];
}
}
......@@ -439,4 +456,66 @@
return content;
}
+ (void)fus_createLevelImgs {
// NSString *document = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingString:@"/ATest"];
// [FUSFileHelper createDirectoryAtPath:document];
//
// for (NSInteger i = 1; i <= 99;i++) {
// NSString *filePath = [document stringByAppendingPathComponent:[NSString stringWithFormat:@"fus_time_level_%zd.png",i]];
//
// if (![FUSFileHelper fus_isExistFileAtPath:filePath]) {
// CGFloat width = 20;
//
// /// 生成等级图片。保存在本地，然后再将路径加入HTML里面
// UILabel *timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, width, 14)];
// timeLabel.text = @(i).stringValue;
// timeLabel.backgroundColor = [UIColor colorWithWhite:1 alpha:0.32];
// timeLabel.textColor = [UIColor whiteColor];
// timeLabel.font = [UIFont fus_themeFont:9];
// timeLabel.layer.cornerRadius = 7;
// timeLabel.textAlignment = NSTextAlignmentCenter;
// timeLabel.layer.masksToBounds = YES;
//
// UIGraphicsBeginImageContextWithOptions(timeLabel.bounds.size, NO, [UIScreen mainScreen].scale);
// [timeLabel drawViewHierarchyInRect:timeLabel.bounds afterScreenUpdates:YES];
// UIImage *screenImage = UIGraphicsGetImageFromCurrentImageContext();
// UIGraphicsEndImageContext();
//
// if (screenImage) {
// NSData *imageData = UIImagePNGRepresentation(screenImage);
// [FUSFileHelper fus_writeDataToFile:imageData filePath:filePath];
// }
// }
// }
//
//
// for (NSInteger i = 1; i <= 99;i++) {
// NSString *filePath = [document stringByAppendingPathComponent:[NSString stringWithFormat:@"fus_time_gray_level_%zd.png",i]];
//
// if (![FUSFileHelper fus_isExistFileAtPath:filePath]) {
// CGFloat width = 20;
//
// /// 生成等级图片。保存在本地，然后再将路径加入HTML里面
// UILabel *timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, width, 14)];
// timeLabel.text = @(i).stringValue;
// timeLabel.backgroundColor = [UIColor colorWithHex:@"#D6D6D7"];
// timeLabel.textColor = [UIColor whiteColor];
// timeLabel.font = [UIFont fus_themeFont:9];
// timeLabel.layer.cornerRadius = 7;
// timeLabel.textAlignment = NSTextAlignmentCenter;
// timeLabel.layer.masksToBounds = YES;
//
// UIGraphicsBeginImageContextWithOptions(timeLabel.bounds.size, NO, [UIScreen mainScreen].scale);
// [timeLabel drawViewHierarchyInRect:timeLabel.bounds afterScreenUpdates:YES];
// UIImage *screenImage = UIGraphicsGetImageFromCurrentImageContext();
// UIGraphicsEndImageContext();
//
// if (screenImage) {
// NSData *imageData = UIImagePNGRepresentation(screenImage);
// [FUSFileHelper fus_writeDataToFile:imageData filePath:filePath];
// }
// }
// }
}
@end
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSChatInputTaskListTableViewCell.swift
......@@ -19,6 +19,7 @@ class FUSChatInputTaskListTableViewCell: UITableViewCell {
@IBOutlet weak var coinTypeImageView: UIImageView!
@IBOutlet weak var progressLabel: UILabel!
@IBOutlet weak var addLabel: UILabel!
@IBOutlet var imageWidthConstraint: NSLayoutConstraint!
var countTimer:Timer? = nil
......@@ -37,7 +38,7 @@ class FUSChatInputTaskListTableViewCell: UITableViewCell {
countTimer?.invalidate()
countTimer = nil
self.imageWidthConstraint.constant = 15
// 奖励类型（3：宝石、4：萤火、5：露水）
switch listmodel?.currency {
case 3:
......@@ -61,7 +62,16 @@ class FUSChatInputTaskListTableViewCell: UITableViewCell {
dewCountLabel.textColor = UIColor.init(hex: "#FE29FE")
addLabel.textColor = UIColor.init(hex: "#FE29FE")
case -1:
coinTypeImageView.setWebImageWithSubURLString(listmodel?.tagUrl ?? "")
coinTypeImageView.setWebImageWithSubURLString(listmodel?.tagUrl ?? "", placeholder: .fus_defaultIcon()) { [weak self] image, url, type, stage, error in
if let image = image {
if image.size.height > 0 {
let width = 15.0 / image.size.height * image.size.width
self?.imageWidthConstraint.constant = width
} else {
self?.imageWidthConstraint.constant = 15.0
}
}
}
dewCountLabel.textColor = UIColor(hexString: "#ebebeb")
addLabel.textColor = UIColor(hexString: "#ebebeb")
default:
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSChatInputTaskListTableViewCell.xib
......@@ -102,6 +102,7 @@
<outlet property="coinTypeImageView" destination="J0e-Ka-oVQ" id="Gqw-6h-4Ul"/>
<outlet property="dewCountLabel" destination="LQE-a7-IeJ" id="0hv-jg-Mib"/>
<outlet property="doingLabel" destination="cWX-TH-Co4" id="DNQ-2D-dLe"/>
<outlet property="imageWidthConstraint" destination="OTB-Zv-7hx" id="ge1-er-Nhz"/>
<outlet property="profileLabel" destination="Xbt-PK-IJ9" id="WYF-CG-Fuo"/>
<outlet property="progressLabel" destination="MyF-Ln-teR" id="g8m-Pr-8u6"/>
<outlet property="taskNameLabel" destination="pPg-Rs-l3u" id="hgf-2X-QA2"/>
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputTaskListView.swift
......@@ -272,8 +272,8 @@ class FUSLiveChatInputTaskListView: UIView, UITableViewDelegate, UITableViewData
fus_getTaskAward(model!.tid, sender: sender)
}
} else {
if (model?.missionType == 0
|| model?.missionType == 4) {
if (model?.type == 0
|| model?.type == 4) {
if let model = model {
fus_getTaskRewardReceive(model: model)
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShareView.m
......@@ -113,7 +113,7 @@
{
self.bgViewHeightConstraint.constant = 130 + UIView.fus_SafeBottom;
self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), @(TwitterPlatform), @(WechatFriendPlatform), @(WechatCirclePaltform), @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
[self initShareBtn];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSRoomShareView.h
......@@ -11,7 +11,7 @@
typedef void(^shareHandler)(SocialSharePlatform type);
#define SHARE_ARRAY @[@(FacebookPlatform), @(TwitterPlatform), @(WechatFriendPlatform), @(WechatCirclePaltform), @(CopyLink), /*@(FUSRoomShareTypeWeibo)*/]
#define SHARE_ARRAY @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(CopyLink), /*@(FUSRoomShareTypeWeibo)*/]
#define SHARE_VIEW_HEIGHT 140
......
FuSiLive/Classes/ZhaiXin/Main/Models/FUSZhaiXinModel.m
......@@ -10,5 +10,12 @@
@implementation FUSZhaiXinModel
- (NSString *)content {
if ([self.type isEqualToString:@"OfficialMessage"]) {
_content = [_content fus_adaptFusiString];
}
return _content;
}
@end
FuSiLive/Classes/ZhaiXin/Official/Models/FUSOfficialMessageModel.m
......@@ -10,4 +10,14 @@
@implementation FUSOfficialMessageModel
- (NSString *)content {
_content = [_content fus_adaptFusiString];
return _content;
}
- (NSString *)title {
_title = [_title fus_adaptFusiString];
return _title;
}
@end
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
......@@ -421,20 +421,20 @@ static NSString *const reuseIdentifyCell = @"cell";
FUSDewAwardAnimationView *dewAnimView = [[FUSDewAwardAnimationView alloc] initWithFrame:UIView.fus_screenFrame];
[dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_diamondBlue]];
[self.view addSubview:dewAnimView];
[UIApplication.sharedApplication.keyWindow addSubview:dewAnimView];
} else if (listModel.currency == 4
|| listModel.classify == 6) {
FUSDewAwardAnimationView *dewAnimView = [[FUSDewAwardAnimationView alloc] initWithFrame:UIView.fus_screenFrame];
[dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_fireGreen]];
[self.view addSubview:dewAnimView];
[UIApplication.sharedApplication.keyWindow addSubview:dewAnimView];
} else if (listModel.currency == 5
|| listModel.classify == 5) {
FUSDewAwardAnimationView *dewAnimView = [[FUSDewAwardAnimationView alloc] initWithFrame:UIView.fus_screenFrame];
[dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_dewBlue]];
[self.view addSubview:dewAnimView];
[UIApplication.sharedApplication.keyWindow addSubview:dewAnimView];
} else {
FUSSingleDailyCheckInView *awardView = [FUSSingleDailyCheckInView fus_dailyCheckInView];
......@@ -444,7 +444,7 @@ static NSString *const reuseIdentifyCell = @"cell";
desc:listModel.getTips
award:@(listModel.award).description
animated:NO];
[[UIApplication sharedApplication].delegate.window.rootViewController.view addSubview:awardView];
[UIApplication.sharedApplication.keyWindow addSubview:awardView];
}
}
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
......@@ -663,6 +663,10 @@
FUSZoneTaskInfoMModel *taskInfoModel = [FUSZoneTaskInfoMModel fus_modelWithDict:taskDic];
for (NSDictionary *taskListDic in taskDic[@"tasklist"]) {
FUSTaskCenterListModel *taskCenterListModel = [FUSTaskCenterListModel fus_modelWithDict:taskListDic];
/// Fusi 强制新星認定 和 新星通関两个任务不显示
if (taskCenterListModel.pid == 60002 || taskCenterListModel.pid == 60004) {
continue;
}
taskCenterListModel.missionType = [taskInfoModel.type integerValue];
[taskListModelArray addObject:taskCenterListModel];
}
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSGotBackpackItemAnimView.h 0 → 100644
//
// FUSGotBackpackItemAnimView.h
// PersonalPage
//
// Created by pierce on 2023/7/20.
//
#import <UIKit/UIKit.h>
typedef NS_ENUM(NSUInteger, FUSGotBackpackItemAnimType) {
FUSGotBackpackItemAnimType1 = 1,
FUSGotBackpackItemAnimType2 = 2,
FUSGotBackpackItemAnimType3 = 3,
};
typedef NS_ENUM(NSUInteger, FUSGotBackpackItemGoodsType) {
FUSGotBackpackItemGoodsTypeNone = 0,
FUSGotBackpackItemGoodsTypeProps = 1,
FUSGotBackpackItemGoodsTypeGift = 2,
FUSGotBackpackItemAnimMotor = 3,
};
NS_ASSUME_NONNULL_BEGIN
@interface FUSGotBackpackItemAnimView : UIView
+ (void)ff_showWithType:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl
name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType
isMotorHasWear:(BOOL)isMotorHasWear;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/Zone/View/TaskCenter/FUSGotBackpackItemAnimView.m 0 → 100644
//
// FUSGotBackpackItemAnimView.m
// PersonalPage
//
// Created by pierce on 2023/7/20.
//
#import "FUSGotBackpackItemAnimView.h"
//#import "FUSBackpackButton.h"
@interface FUSGotBackpackItemAnimView () <CAAnimationDelegate>
/// 商品背景
@property (nonatomic, strong) UIImageView *goodsTypeImageView;
/// 光点1
@property (nonatomic, strong) UIImageView *bgLightAnimImageView;
/// 光点1
@property (nonatomic, strong) UIImageView *lightAnimImageView;
/// 图片
@property (nonatomic, strong) YYAnimatedImageView *iconImageView;
/// 名称的view
@property (nonatomic, strong) UIView *nameContentView;
/// 名称的label
@property (nonatomic, strong) UILabel *nameLabel;
/// 已佩戴的标识
@property (nonatomic, strong) FUSStyleButton *hasWearBtn;
/// 类型
@property (nonatomic, assign) FUSGotBackpackItemAnimType type;
/// 商品类型
@property (nonatomic, assign) FUSGotBackpackItemGoodsType goodsType;
/// 图片地址
@property (nonatomic, copy) NSString *iconUrl;
/// 名称
@property (nonatomic, copy) NSString *name;
/// 是否显示已佩戴座驾的标识
@property (nonatomic, assign) BOOL isMotorHasWear;
/// 背包按钮
//@property (nonatomic, weak) FUSBackpackButton *backpackButton;
@end
@implementation FUSGotBackpackItemAnimView
+ (void)ff_showWithType:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl
name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType
isMotorHasWear:(BOOL)isMotorHasWear {
FUSGotBackpackItemAnimView *view = [[FUSGotBackpackItemAnimView alloc] initWithFrame:UIView.fus_screenFrame
type:type
icon:iconUrl
name:name
goodsType:goodsType isMotorHasWear:isMotorHasWear];
[[UIApplication sharedApplication].keyWindow addSubview:view];
}
- (instancetype)initWithFrame:(CGRect)frame
type:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl
name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType
isMotorHasWear:(BOOL)isMotorHasWear
{
self = [super initWithFrame:frame];
if (self) {
/// 类型
_type = type;
/// 图片地址
_iconUrl = iconUrl;
/// 图片地址
_name = name;
_goodsType = goodsType;
_isMotorHasWear = isMotorHasWear;
self.hidden = YES;
BOOL autoCDN = ![iconUrl hasPrefix:@"http"];
__weak typeof(self) weakSelf = self;
[self.iconImageView setWebImageWithSubURLString:iconUrl placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (image) {
[weakSelf ff_showImageAnim:image];
} else {
[weakSelf removeFromSuperview];
}
}];
}
return self;
}
- (void)ff_showImageAnim:(UIImage *)image {
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6];
if (self.goodsType == FUSGotBackpackItemGoodsTypeGift) {
[self addSubview:self.goodsTypeImageView];
}
CGFloat duration = 0.5;
switch (self.type) {
case FUSGotBackpackItemAnimType1:
duration = 1;
break;
case FUSGotBackpackItemAnimType2:
[self addSubview:self.lightAnimImageView];
[self.lightAnimImageView startAnimating];
duration = 1;
break;
case FUSGotBackpackItemAnimType3:
[self addSubview:self.bgLightAnimImageView];
[self.bgLightAnimImageView startAnimating];
[self addSubview:self.lightAnimImageView];
[self.lightAnimImageView startAnimating];
duration = 1;
break;
}
self.iconImageView.image = image;
[self addSubview:self.iconImageView];
self.nameLabel.text = self.name;
[self addSubview:self.nameContentView];
[self.nameContentView addSubview:self.nameLabel];
if (self.isMotorHasWear) {
[self.nameContentView addSubview:self.hasWearBtn];
}
self.iconImageView.centerX = self.width / 2.0f;
self.iconImageView.y = 240 + UIView.fus_SafeTop;
if (_goodsTypeImageView) {
_goodsTypeImageView.centerX = self.iconImageView.centerX;
_goodsTypeImageView.y = self.iconImageView.y - 23;
}
if (_bgLightAnimImageView) {
self.bgLightAnimImageView.center = self.iconImageView.center;
}
if (_lightAnimImageView) {
self.lightAnimImageView.x = self.iconImageView.centerX;
self.lightAnimImageView.bottom = self.iconImageView.bottom;
}
[self.nameLabel sizeToFit];
self.nameLabel.centerY = self.nameContentView.height / 2.0f;
self.nameLabel.x = 13;
CGFloat nameContentWidth = self.nameLabel.width + self.nameLabel.x * 2;
if (self.isMotorHasWear) {
self.hasWearBtn.x = self.nameLabel.right + 4;
nameContentWidth = nameContentWidth + 4 + self.hasWearBtn.width;
}
self.nameContentView.width = nameContentWidth;
self.nameContentView.y = self.iconImageView.bottom - 8;
self.nameContentView.centerX = self.iconImageView.centerX;
self.hidden = NO;
// FUSBackpackButton *backpackButton = [FUSBackpackButton ff_showBackpackButton];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (self->_bgLightAnimImageView) {
[self->_bgLightAnimImageView stopAnimating];
self->_bgLightAnimImageView.hidden = YES;
[self->_bgLightAnimImageView removeFromSuperview];
}
if (self->_lightAnimImageView) {
[self->_lightAnimImageView stopAnimating];
self->_lightAnimImageView.hidden = YES;
[self->_lightAnimImageView removeFromSuperview];
}
// self.backpackButton = backpackButton;
// [self ff_showMovingToBackpackBtn:backpackButton];
});
}
//- (void)ff_showMovingToBackpackBtn:(FUSBackpackButton *)backpackButton {
//
// CGFloat popDutation = 0;
// CGFloat moveDutation = 0.4;
//
// [UIView animateWithDuration:moveDutation animations:^{
// self.nameContentView.alpha = 0;
// self.nameContentView.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.1, 0.1);
//
// }];
//
// CAAnimationGroup *moveOutAnimGroup = [CAAnimationGroup animation];
// moveOutAnimGroup.delegate = (id)[YYWeakProxy proxyWithTarget:self];
// moveOutAnimGroup.removedOnCompletion = NO;
// moveOutAnimGroup.duration = popDutation + moveDutation;
// moveOutAnimGroup.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
// moveOutAnimGroup.fillMode = kCAFillModeForwards;
//
//// CAKeyframeAnimation *popScaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
//// popScaleAnimation.values = @[@1,@1.3,@1];
//// popScaleAnimation.keyTimes = @[@0,@0.6,@1];
//// popScaleAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
//// popScaleAnimation.duration = popDutation;
////
// CAKeyframeAnimation *moveOutScaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
// moveOutScaleAnimation.values = @[@1,@0.7,@0];//@[@1,@0.8,@0.6,@0.4,@0.1];
// moveOutScaleAnimation.keyTimes = @[@0,@0.6,@1];//@[@0,@0.2,@0.4,@0.6,@1];
// moveOutScaleAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
// moveOutScaleAnimation.beginTime = popDutation;
// moveOutScaleAnimation.duration = moveDutation;
//
// CAKeyframeAnimation *positionAnimation = [CAKeyframeAnimation animationWithKeyPath:@"position"];
// positionAnimation.beginTime = popDutation;
// positionAnimation.duration = moveDutation;
// positionAnimation.values = @[[NSValue valueWithCGPoint:self.iconImageView.center], [NSValue valueWithCGPoint:backpackButton.center]];
// positionAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
// positionAnimation.fillMode = kCAFillModeForwards;
//
// moveOutAnimGroup.animations = @[moveOutScaleAnimation,positionAnimation];
// [self.iconImageView.layer addAnimation:moveOutAnimGroup forKey:@"FUSGotBackpackMoveOutAnim"];
//}
//
//- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
// [self.backpackButton ff_startRemoveCountDown];
// [self removeFromSuperview];
//}
- (UIImageView *)goodsTypeImageView {
if (!_goodsTypeImageView) {
CGFloat width = 205 * UIView.fus_screenW / 375.0;
CGFloat height = 59 * UIView.fus_screenW / 375.0;
_goodsTypeImageView = [[UIImageView alloc] initWithFrame:CGRectMake((UIView.fus_screenW - width) / 2.0 , 192, width, height)];
_goodsTypeImageView.image = [UIImage imageNamed:@"backpack_anim_gift_bg"];
_goodsTypeImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _goodsTypeImageView;
}
- (UIImageView *)bgLightAnimImageView {
if (!_bgLightAnimImageView) {
CGFloat width = 193 * UIView.fus_screenW / 375.0;
_bgLightAnimImageView = [[UIImageView alloc] initWithFrame:CGRectMake((UIView.fus_screenW - width) / 2.0 , 192, width, width)];
_bgLightAnimImageView.contentMode = UIViewContentModeScaleAspectFit;
NSMutableArray *imgs = [NSMutableArray array];
for (NSInteger i = 0; i < 18; i++) {
NSString *imageName = [NSString stringWithFormat:@"backpack_bg_light_anim_%zd",i];
UIImage *img = [UIImage imageNamed:imageName];
if (img) {
[imgs addObject:img];
}
}
_bgLightAnimImageView.animationImages = imgs;
_bgLightAnimImageView.animationDuration = imgs.count / 10.0f;
_bgLightAnimImageView.animationRepeatCount = 0;
}
return _bgLightAnimImageView;
}
- (UIImageView *)lightAnimImageView {
if (!_lightAnimImageView) {
CGFloat width = 130 * UIView.fus_screenW / 375.0;
_lightAnimImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, width, width)];
_lightAnimImageView.contentMode = UIViewContentModeScaleAspectFit;
NSMutableArray *imgs = [NSMutableArray array];
for (NSInteger i = 0; i < 18; i++) {
NSString *imageName = [NSString stringWithFormat:@"backpack_moving_light_anim_%zd",i];
UIImage *img = [UIImage imageNamed:imageName];
if (img) {
[imgs addObject:img];
}
}
_lightAnimImageView.animationImages = imgs;
_lightAnimImageView.animationDuration = imgs.count / 20.0f;
_lightAnimImageView.animationRepeatCount = 0;
}
return _lightAnimImageView;
}
- (YYAnimatedImageView *)iconImageView {
if (!_iconImageView) {
CGFloat width = 120 * UIView.fus_screenW / 375.0;
_iconImageView = [[YYAnimatedImageView alloc] initWithFrame:CGRectMake(0, 0, width, width)];
_iconImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _iconImageView;
}
- (UIView *)nameContentView {
if (!_nameContentView) {
_nameContentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 122, 30)];
_nameContentView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2];
_nameContentView.layer.cornerRadius = 15;
_nameContentView.layer.masksToBounds = YES;
}
return _nameContentView;
}
- (UILabel *)nameLabel {
if (!_nameLabel) {
_nameLabel = [[UILabel alloc] init];
_nameLabel.font = [UIFont fus_themeMediumFont:16];
_nameLabel.textColor = [UIColor whiteColor];
_nameLabel.textAlignment = NSTextAlignmentCenter;
}
return _nameLabel;
}
- (FUSStyleButton *)hasWearBtn {
if (!_hasWearBtn) {
_hasWearBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
_hasWearBtn.userInteractionEnabled = NO;
[_hasWearBtn setTitle:[NSString fus_localString:@"已佩戴"] forState:UIControlStateNormal];
_hasWearBtn.style = FUSButtonStyleGradientLeftToRight;
_hasWearBtn.titleLabel.font = [UIFont fus_themeFont:10];
[_hasWearBtn sizeToFit];
_hasWearBtn.height = 20;
_hasWearBtn.layer.cornerRadius = _hasWearBtn.height / 2.0f;
_hasWearBtn.layer.masksToBounds = YES;
}
return _hasWearBtn;
}
@end
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.m
......@@ -19,6 +19,7 @@
// 记录model
@property (nonatomic, strong) FUSTaskCenterListModel *taskCenterListModel;
@property (weak, nonatomic) IBOutlet UIImageView *currencyImageView;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint *imageWidthConstraint;
@property (weak, nonatomic) IBOutlet UILabel *detailLabel;
......@@ -41,6 +42,7 @@
- (void)setListModel:(FUSTaskCenterListModel *)listModel {
_taskCenterListModel = listModel;
self.taskNameLabel.text = listModel.taskName;
self.imageWidthConstraint.constant = 16;
// 物品分类（1：道具、2：礼物、3：座驾、4：宝石、5：露水、6：萤火）
if (listModel.currency == 3 || listModel.classify == 4) {
self.currencyImageView.image = [UIImage imageNamed:@"icon_taskCenter_gem"];
......@@ -55,9 +57,16 @@
self.awardLabel.textColor = [UIColor colorWithHex:@"#58C1FF"];
self.addlabel.textColor = [UIColor colorWithHex:@"#58C1FF"];
} else if (listModel.currency == -1) {
[self.currencyImageView setWebImageWithSubURLString:listModel.tagUrl];
self.awardLabel.textColor = [UIColor colorWithHex:@"#ebebeb"];
self.addlabel.textColor = [UIColor colorWithHex:@"#ebebeb"];
__weak typeof(self) weakSelf = self;
[self.currencyImageView setWebImageWithSubURLString:listModel.tagUrl placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (image && image.size.height > 0) {
weakSelf.imageWidthConstraint.constant = 16 / image.size.height * image.size.width;
} else {
weakSelf.imageWidthConstraint.constant = 16;
}
}];
self.awardLabel.textColor = [UIColor fus_textColorLight];
self.addlabel.textColor = [UIColor fus_textColorLight];
}
if ([NSString isNullWithString:listModel.tagValue]) {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.xib
......@@ -56,8 +56,8 @@
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_taskCenter_small" translatesAutoresizingMaskIntoConstraints="NO" id="EoZ-uN-sDh">
<rect key="frame" x="105" y="17.5" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" secondItem="EoZ-uN-sDh" secondAttribute="height" multiplier="1:1" id="LQx-XS-980"/>
<constraint firstAttribute="width" constant="16" id="R4K-BJ-QMZ"/>
<constraint firstAttribute="height" constant="16" id="jWL-dM-Jxs"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iwt-SR-z91">
......@@ -112,6 +112,7 @@
<outlet property="currencyImageView" destination="EoZ-uN-sDh" id="2DX-5k-cQV"/>
<outlet property="detailLabel" destination="iwt-SR-z91" id="kdA-bg-PZD"/>
<outlet property="expTimeLabel" destination="vuj-9P-CdU" id="LUp-Pj-033"/>
<outlet property="imageWidthConstraint" destination="R4K-BJ-QMZ" id="K4Z-8f-lu3"/>
<outlet property="operationBtn" destination="VBv-Bq-UZB" id="0RD-iD-3Hb"/>
<outlet property="taskNameLabel" destination="oRB-IO-xec" id="szN-TL-KfO"/>
</connections>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.m
......@@ -22,6 +22,8 @@
@property (weak, nonatomic) IBOutlet UILabel *taskProcessLabel;
// 任务奖励图标
@property (weak, nonatomic) IBOutlet UIImageView *awardImageView;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint *imageWidthConstraint;
// 任务奖励label
@property (weak, nonatomic) IBOutlet UILabel *awardLabel;
// 任务进度view的宽度
......@@ -59,7 +61,7 @@
[self.taskImageView setWebImageWithSubURLString:listModel.icon placeholder:nil];
self.taskTitleLabel.text = listModel.taskName;
self.awardLabel.text = [NSString stringWithFormat:@"%ld",(long)listModel.award];
self.imageWidthConstraint.constant = 16;
//classify: 物品分类（1：道具、2：礼物、3：座驾、4：宝石、5：露水、6：萤火）
if (listModel.currency == 3 || listModel.classify == 4) {
self.awardImageView.image = [UIImage imageNamed:@"icon_taskCenter_gem"];
......@@ -86,13 +88,20 @@
} else {
if (![NSString isNullWithString:listModel.tagUrl]) {
[self.awardImageView setWebImageWithSubURLString:listModel.tagUrl];
__weak typeof(self) weakSelf = self;
[self.awardImageView setWebImageWithSubURLString:listModel.tagUrl placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (image && image.size.height > 0) {
weakSelf.imageWidthConstraint.constant = 16 / image.size.height * image.size.width;
} else {
weakSelf.imageWidthConstraint.constant = 16;
}
}];
}
if (![NSString isNullWithString:listModel.tagValue]) {
self.awardLabel.text = listModel.tagValue;
self.awardLabel.textColor = [UIColor colorWithHex:@"#ebebeb"];
self.addLabel.textColor = [UIColor colorWithHex:@"#ebebeb"];
self.awardLabel.textColor = [UIColor fus_textColorLight];
self.addLabel.textColor = [UIColor fus_textColorLight];
}
}
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.xib
......@@ -127,6 +127,7 @@
<outlet property="awardLabel" destination="RyB-oG-Lqu" id="zeT-gP-uQR"/>
<outlet property="btnConstrant" destination="ZlU-VB-AeZ" id="MWo-Ga-fxv"/>
<outlet property="detailLabel" destination="8v6-UE-dIy" id="tNE-Re-0Zj"/>
<outlet property="imageWidthConstraint" destination="ogJ-Ij-RNm" id="Ybs-7c-I53"/>
<outlet property="operationBtn" destination="RbH-RC-F8l" id="wtc-x8-Amr"/>
<outlet property="taskProcessLabel" destination="EyC-iH-DvF" id="s5u-4V-YfW"/>
<outlet property="taskTitleLabel" destination="bfp-Ws-YBS" id="lUa-EV-zX5"/>
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
......@@ -2108,3 +2108,84 @@
"往期" = "往期";
"首次免费" = "首次免費";
"截图" = "截圖";
"记录已清空" = "記錄已清空";
"领取成功" = "領取成功";
"小窗播放" = "小窗播放";
"内容未保存是否保存？" = "內容未保存是否保存？";
"签名" = "簽名";
"性别" = "性別";
"确认清除全部观看记录吗？" = "确认清除全部观看记录吗？";
"编辑资料" = "編輯資料";
"已有语音签名，是否去录制新的语音签名？" = "已有語音簽名，是否去錄製新的語音簽名？";
"观看记录" = "观看记录";
"生日只能修改一次" = "生日只能修改一次";
"性别只能修改一次" = "性別只能修改一次";
"已在认证中，无法提交新的认证" = "已在認證中，無法提交新的認證";
"切换到听筒模式" = "切換到聽筒模式";
"身高" = "身高";
"昵称" = "暱稱";
"地区" = "地區";
"保密" = "保密";
"脸部特效" = "臉部特效";
"未录制" = "未錄製";
"请输入你的职业" = "請輸入你的職業";
"性别只能修改一次，您已经修改过" = "性别只能修改一次，您已經修改過";
"生日未设置" = "生日未設置";
"兑换" = "兌換";
"新星养成" = "新星養成";
"使用该头像，需要重新认证?" = "使用該頭像，需要重新認證?";
"学历" = "學歷";
"任务" = "任務";
"生日" = "生日";
"切换到扬声器模式" = "切換到揚聲器模式";
"职业" = "職業";
"体重" = "體重";
"审核中" = "審核中";
"修改昵称需要10宝石" = "修改暱稱需要10寶石";
"每日任务" = "每日任務";
"生日只能修改一次，您已经修改过" = "生日只能修改一次，您已經修改過";
"聊天" = "聊天";
"您的宝石不足，无法更改昵称" = "您的寶石不足，無法更改暱稱";
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings
......@@ -2108,3 +2108,84 @@
"往期" = "往期";
"首次免费" = "首次免費";
"截图" = "截圖";
"记录已清空" = "記錄已清空";
"领取成功" = "領取成功";
"小窗播放" = "小窗播放";
"内容未保存是否保存？" = "內容未保存是否保存？";
"签名" = "簽名";
"性别" = "性別";
"确认清除全部观看记录吗？" = "确认清除全部观看记录吗？";
"编辑资料" = "編輯資料";
"已有语音签名，是否去录制新的语音签名？" = "已有語音簽名，是否去錄製新的語音簽名？";
"观看记录" = "观看记录";
"生日只能修改一次" = "生日只能修改一次";
"性别只能修改一次" = "性別只能修改一次";
"已在认证中，无法提交新的认证" = "已在認證中，無法提交新的認證";
"切换到听筒模式" = "切換到聽筒模式";
"身高" = "身高";
"昵称" = "暱稱";
"地区" = "地區";
"保密" = "保密";
"脸部特效" = "臉部特效";
"未录制" = "未錄製";
"请输入你的职业" = "請輸入你的職業";
"性别只能修改一次，您已经修改过" = "性别只能修改一次，您已經修改過";
"生日未设置" = "生日未設置";
"兑换" = "兌換";
"新星养成" = "新星養成";
"使用该头像，需要重新认证?" = "使用該頭像，需要重新認證?";
"学历" = "學歷";
"任务" = "任務";
"生日" = "生日";
"切换到扬声器模式" = "切換到揚聲器模式";
"职业" = "職業";
"体重" = "體重";
"审核中" = "審核中";
"修改昵称需要10宝石" = "修改暱稱需要10寶石";
"每日任务" = "每日任務";
"生日只能修改一次，您已经修改过" = "生日只能修改一次，您已經修改過";
"聊天" = "聊天";
"您的宝石不足，无法更改昵称" = "您的寶石不足，無法更改暱稱";
"连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment