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

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSArray/NSArray+Swizzling.m

@@ -16,7 +16,7 @@
 // swizzling objectAtIndex:
 // swizzling objectAtIndex:
 + (void)load
 + (void)load
 {
 {
-    // Firefly Show 3.3.0 移除自己写的方崩溃方法
+    // FuSi Live 3.3.0 移除自己写的方崩溃方法
     return;
     return;
 }
 }
 
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Others/FUSEnumSet.h

 //
 //
 //  FUSEnumSet.h
 //  FUSEnumSet.h
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by 曾治铭 on 15/12/23.
 //  Created by 曾治铭 on 15/12/23.
 //  Copyright © 2024年 FuSiLive. All rights reserved.
 //  Copyright © 2024年 FuSiLive. All rights reserved.

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/CustomControls/FUSTextField.m

@@ -224,7 +224,7 @@ static const int cursorLength = 30; //!< 定义光标长度
             // 系统默认
             // 系统默认
             break;
             break;
         case 1:
         case 1:
-            // Firefly自定义光标注册监听
+            // FuSi自定义光标注册监听
             
             
             //!< 监听开始编辑时初始化光标
             //!< 监听开始编辑时初始化光标
             [self addTarget:self action:@selector(initCustomCursor:) forControlEvents:UIControlEventEditingDidBegin];
             [self addTarget:self action:@selector(initCustomCursor:) forControlEvents:UIControlEventEditingDidBegin];

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m

@@ -57,7 +57,7 @@
     _emptyContentBgView = [[UIView alloc] init];
     _emptyContentBgView = [[UIView alloc] init];
     
     
     _emptyButton = [[FUSStyleButton alloc] init];
     _emptyButton = [[FUSStyleButton alloc] init];
-    _emptyButton.style = FUSButtonStyleBlurGradientBorder;
+    _emptyButton.style = FUSButtonStyleBlueBorder;
     _emptyButton.hidden = YES;
     _emptyButton.hidden = YES;
     _emptyButton.titleLabel.font = [UIFont fus_themeFont:15];
     _emptyButton.titleLabel.font = [UIFont fus_themeFont:15];
     [_emptyButton addTarget:self action:@selector(onClickEmptyButton) forControlEvents:UIControlEventTouchUpInside];
     [_emptyButton addTarget:self action:@selector(onClickEmptyButton) forControlEvents:UIControlEventTouchUpInside];

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.h

@@ -19,6 +19,7 @@ typedef NS_ENUM(NSInteger, FUSButtonStyle) {
     FUSButtonStyleGrayBorder,            // 白边 灰色底 （自带圆角）
     FUSButtonStyleGrayBorder,            // 白边 灰色底 （自带圆角）
     FUSButtonStyleBlurGradientBorder,     // 彩色渐变边框 和 渐变模糊透明背景（自带圆角）
     FUSButtonStyleBlurGradientBorder,     // 彩色渐变边框 和 渐变模糊透明背景（自带圆角）
     FUSButtonStyleBlue,                  // 纯色背景
     FUSButtonStyleBlue,                  // 纯色背景
+    FUSButtonStyleBlueBorder,           // 纯色背景
 };
 };
 
 
 @interface FUSStyleButton : UIButton
 @interface FUSStyleButton : UIButton

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m

@@ -227,6 +227,17 @@
             self.backgroundColor = [UIColor fus_appMainColor];
             self.backgroundColor = [UIColor fus_appMainColor];
         }
         }
             break;
             break;
+        case FUSButtonStyleBlueBorder:
+        {
+            [self cleanStyle];
+            [self setTitleColor:[UIColor fus_appMainColor] forState:UIControlStateNormal];
+            self.layer.cornerRadius = self.height / 2.0f;
+            self.layer.masksToBounds = YES;
+            self.layer.borderColor = UIColor.fus_appMainColor.CGColor;
+            self.layer.borderWidth = 1;
+            self.backgroundColor = [UIColor whiteColor];
+        }
+            break;
         default:
         default:
             break;
             break;
     }
     }

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/Loading/FUSFuSiLoadingView.h

 //
 //
 //  YALiveLoadingView.h
 //  YALiveLoadingView.h
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by Jim Chan on 2018/11/27.
 //  Created by Jim Chan on 2018/11/27.
 //  Copyright © 2018 压寨团队. All rights reserved.
 //  Copyright © 2018 压寨团队. All rights reserved.

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/Loading/FUSFuSiLoadingView.m

 //
 //
 //  FUSLiveLoadingView.m
 //  FUSLiveLoadingView.m
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by Jim Chan on 2018/11/27.
 //  Created by Jim Chan on 2018/11/27.
 //  Copyright © 2018 压寨团队. All rights reserved.
 //  Copyright © 2018 压寨团队. All rights reserved.

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/XLWaveProgress/XLWave.h

+//
+//  XLWave.h
+//  XLWaveProgressDemo
+//
+//  Created by Apple on 2016/11/10.
+//  Copyright © 2016年 Apple. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface XLWave : UIView
+
+/**
+ 设置进度 0~1
+ */
+@property (assign,nonatomic) CGFloat progress;
+/**
+ 前层波浪颜色
+ */
+@property (nonatomic ,strong) UIColor *frontWaveColor;
+/**
+ 后层波浪颜色
+ */
+@property (nonatomic ,strong) UIColor *backWaveColor;
+/**
+ 波浪背景色
+ */
+@property (nonatomic ,strong) UIColor *waveBackgroundColor;
+
+/**
+ 开始
+ */
+- (void)start;
+
+/**
+ 停止
+ */
+-(void)stop;
+
+@end

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/XLWaveProgress/XLWave.m

+//
+//  XLWave.m
+//  XLWaveProgressDemo
+//
+//  Created by Apple on 2016/11/10.
+//  Copyright © 2016年 Apple. All rights reserved.
+//
+
+/**
+ 正弦曲线公式可表示为y=Asin(ωx+φ)+k：
+ A，振幅，最高和最低的距离
+ W，角速度，用于控制周期大小，单位x中的起伏个数
+ K，偏距，曲线整体上下偏移量
+ φ，初相，左右移动的值
+ 
+ 这个效果主要的思路是添加两条曲线 一条正玄曲线、一条余弦曲线 然后在曲线下添加深浅不同的背景颜色，从而达到波浪显示的效果
+ */
+
+#import "XLWave.h"
+
+
+@interface XLWave ()
+{
+    //前面的波浪
+    CAShapeLayer *_backWaveLayer;
+    //后面的波浪
+    CAShapeLayer *_frontWaveLayer;
+    //定时刷新器
+    CADisplayLink *_disPlayLink;
+    /**
+     曲线的振幅
+     */
+    CGFloat _waveAmplitude;
+    /**
+     曲线角速度
+     */
+    CGFloat _wavePalstance;
+    /**
+     曲线初相
+     */
+    CGFloat _waveX;
+    /**
+     曲线偏距
+     */
+    CGFloat _waveY;
+    /**
+     曲线移动速度
+     */
+    CGFloat _waveMoveSpeed;
+}
+@end
+
+
+@implementation XLWave
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        [self buildUI];
+        [self configWave];
+    }
+    return self;
+}
+
+//初始化UI
+-(void)buildUI {
+    //初始化波浪
+    //底层
+    _backWaveLayer = [CAShapeLayer layer];
+    [self.layer addSublayer:_backWaveLayer];
+    
+    //上层
+    _frontWaveLayer = [CAShapeLayer layer];
+    [self.layer addSublayer:_frontWaveLayer];
+    
+    //画了个圆
+    self.layer.cornerRadius = self.bounds.size.width/2.0f;
+    self.layer.masksToBounds = true;
+}
+
+//初始化数据
+- (void)configWave {
+    //振幅
+    _waveAmplitude = 10;
+    //角速度
+    _wavePalstance = M_PI/self.bounds.size.width;
+    //偏距
+    _waveY = self.bounds.size.height;
+    //初相
+    _waveX = 0;
+    //x轴移动速度
+    _waveMoveSpeed = _wavePalstance * 5;
+}
+
+- (void)updateWave:(CADisplayLink *)link {
+    _waveX += _waveMoveSpeed;
+    [self updateWaveY];
+    [self updateWave1];
+    [self updateWave2];
+}
+
+//更新偏距的大小 直到达到目标偏距 让wave有一个匀速增长的效果
+-(void)updateWaveY
+{
+    CGFloat targetY = self.bounds.size.height - _progress * self.bounds.size.height;
+    if (_waveY < targetY) {
+        _waveY += 2;
+    }
+    if (_waveY > targetY ) {
+        _waveY -= 2;
+    }
+}
+
+-(void)updateWave1
+{
+    //波浪宽度
+    CGFloat waterWaveWidth = self.bounds.size.width;
+    //初始化运动路径
+    CGMutablePathRef path = CGPathCreateMutable();
+    //设置起始位置
+    CGPathMoveToPoint(path, nil, 0, _waveY);
+    //初始化波浪其实Y为偏距
+    CGFloat y = _waveY;
+    //正弦曲线公式为： y=Asin(ωx+φ)+k;
+    for (float x = 0.0f; x <= waterWaveWidth ; x++) {
+        y = _waveAmplitude * cos(_wavePalstance * x + _waveX) + _waveY;
+        CGPathAddLineToPoint(path, nil, x, y);
+    }
+    //填充底部颜色
+    CGPathAddLineToPoint(path, nil, waterWaveWidth, self.bounds.size.height);
+    CGPathAddLineToPoint(path, nil, 0, self.bounds.size.height);
+    CGPathCloseSubpath(path);
+    _backWaveLayer.path = path;
+    CGPathRelease(path);
+}
+
+-(void)updateWave2
+{
+    //波浪宽度
+    CGFloat waterWaveWidth = self.bounds.size.width;
+    //初始化运动路径
+    CGMutablePathRef path = CGPathCreateMutable();
+    //设置起始位置
+    CGPathMoveToPoint(path, nil, 0, _waveY);
+    //初始化波浪其实Y为偏距
+    CGFloat y = _waveY;
+    //正弦曲线公式为： y=Asin(ωx+φ)+k;
+    for (float x = 0.0f; x <= waterWaveWidth ; x++) {
+        y = _waveAmplitude * sin(_wavePalstance * x + _waveX) + _waveY;
+        CGPathAddLineToPoint(path, nil, x, y);
+    }
+    //添加终点路径、填充底部颜色
+    CGPathAddLineToPoint(path, nil, waterWaveWidth, self.bounds.size.height);
+    CGPathAddLineToPoint(path, nil, 0, self.bounds.size.height);
+    CGPathCloseSubpath(path);
+    _frontWaveLayer.path = path;
+    CGPathRelease(path);
+    
+}
+
+#pragma mark -
+#pragma mark Setter
+- (void)setProgress:(CGFloat)progress {
+    _progress = progress;
+}
+
+- (void)setWaveBackgroundColor:(UIColor *)waveBackgroundColor {
+    self.backgroundColor = waveBackgroundColor;
+}
+
+- (void)setBackWaveColor:(UIColor *)backWaveColor {
+    _backWaveLayer.fillColor = backWaveColor.CGColor;
+    _backWaveLayer.strokeColor = backWaveColor.CGColor;
+}
+
+- (void)setFrontWaveColor:(UIColor *)frontWaveColor {
+    _frontWaveLayer.fillColor = frontWaveColor.CGColor;
+    _frontWaveLayer.strokeColor = frontWaveColor.CGColor;
+}
+
+#pragma mark -
+#pragma mark 功能方法
+
+//开始
+- (void)start {
+    //以屏幕刷新速度为周期刷新曲线的位置
+    _disPlayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateWave:)];
+    [_disPlayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+}
+
+//停止
+- (void)stop {
+    if (_disPlayLink) {
+        [_disPlayLink invalidate];
+        _disPlayLink = nil;
+    }
+}
+
+
+-(void)dealloc
+{
+    [self stop];
+    if (_backWaveLayer) {
+        [_backWaveLayer removeFromSuperlayer];
+        _backWaveLayer = nil;
+    }
+    if (_frontWaveLayer) {
+        [_frontWaveLayer removeFromSuperlayer];
+        _frontWaveLayer = nil;
+    }
+    
+}
+
+@end

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/XLWaveProgress/XLWaveProgress.h

+//
+//  XLWaveProgress.h
+//  XLWaveProgressDemo
+//
+//  Created by Apple on 2016/11/10.
+//  Copyright © 2016年 Apple. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface XLWaveProgress : UIView
+/**
+ 进度 0~1
+ */
+@property (nonatomic ,assign) CGFloat progress;
+/**
+ 文字颜色
+ */
+@property (nonatomic ,strong) UIColor *textColor;
+/**
+ 文字字体
+ */
+@property (nonatomic ,strong) UIFont *textFont;
+/**
+ 前层波浪颜色
+ */
+@property (nonatomic ,strong) UIColor *frontWaveColor;
+/**
+ 后层波浪颜色
+ */
+@property (nonatomic ,strong) UIColor *backWaveColor;
+/**
+ 波浪背景色
+ */
+@property (nonatomic ,strong) UIColor *waveBackgroundColor;
+
+/**
+ 开始
+ */
+- (void)start;
+/**
+ 停止
+ */
+- (void)stop;
+
+@end

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/XLWaveProgress/XLWaveProgress.m

+//
+//  XLWaveProgress.m
+//  XLWaveProgressDemo
+//
+//  Created by Apple on 2016/11/10.
+//  Copyright © 2016年 Apple. All rights reserved.
+//
+
+#import "XLWaveProgress.h"
+#import "XLWave.h"
+
+@interface XLWaveProgress () {
+    XLWave *_wave;
+    UILabel *_textLabel;
+}
+
+@end
+
+@implementation XLWaveProgress
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        [self buildLayout];
+    }
+    return self;
+}
+
+- (void)buildLayout {
+    
+    _wave = [[XLWave alloc] initWithFrame:self.bounds];
+    _wave.center = CGPointMake(self.bounds.size.width/2.0f, self.bounds.size.width/2.0f);
+    [self addSubview:_wave];
+    
+    _textLabel = [[UILabel alloc] initWithFrame:self.bounds];
+    _textLabel.textAlignment = NSTextAlignmentCenter;
+    [self addSubview:_textLabel];
+}
+
+#pragma mark -
+#pragma mark Setter
+
+- (void)setProgress:(CGFloat)progress {
+    _progress = progress;
+    _wave.progress = progress;
+    _textLabel.text = [NSString stringWithFormat:@"%.0f%%",progress*100];
+}
+
+- (void)setTextFont:(UIFont *)textFont {
+    _textLabel.font = textFont;
+}
+
+- (void)setTextColor:(UIColor *)textColor {
+    _textLabel.textColor = textColor;
+}
+
+- (void)setWaveBackgroundColor:(UIColor *)waveBackgroundColor {
+    _wave.waveBackgroundColor = waveBackgroundColor;
+}
+
+- (void)setBackWaveColor:(UIColor *)backWaveColor {
+    _wave.backWaveColor = backWaveColor;
+}
+
+- (void)setFrontWaveColor:(UIColor *)frontWaveColor {
+    _wave.frontWaveColor = frontWaveColor;
+}
+
+#pragma mark -
+#pragma mark 功能方法
+- (void)start {
+    [_wave start];
+}
+
+- (void)stop {
+    [_wave stop];
+}
+
+- (void)dealloc {
+    [_wave stop];
+    for (UIView *view in self.subviews) {
+        [view removeFromSuperview];
+    }
+}
+
+@end

FuSiLive/AppDelegate.m

@@ -187,7 +187,7 @@ static dispatch_queue_t get_status_queue() {
 
 
 - (void)initTTSDK {
 - (void)initTTSDK {
     NSInteger appId = 100667;
     NSInteger appId = 100667;
-    NSString *appname = @"firefly";
+    NSString *appname = FUSConfig.sharedInstanced.appConfigs.appName;
     NSString *channel = [FUSDeviceHelper fus_getChannelId];
     NSString *channel = [FUSDeviceHelper fus_getChannelId];
     NSString *bundleID = @"com.ft.chat.ios";
     NSString *bundleID = @"com.ft.chat.ios";
     NSString *lisenceFilePath = @"TTSDKLisenceFileForTest";
     NSString *lisenceFilePath = @"TTSDKLisenceFileForTest";

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_at_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_at_btn@2x.png",
+      "filename" : "形状 4603@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_at_btn@3x.png",
+      "filename" : "形状 4603@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_at_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_at_btn_pressed@2x.png",
+      "filename" : "形状 4603@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_at_btn_pressed@3x.png",
+      "filename" : "形状 4603@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_btns_line_img.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_btns_line_img@2x.png",
+      "filename" : "分割线@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_btns_line_img@3x.png",
+      "filename" : "分割线@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_chat_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_chat_btn@2x.png",
+      "filename" : "形状 4602@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_chat_btn@3x.png",
+      "filename" : "形状 4602@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_chat_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_chat_btn_pressed@2x.png",
+      "filename" : "形状 4602@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_chat_btn_pressed@3x.png",
+      "filename" : "形状 4602@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_control_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_control_btn@2x.png",
+      "filename" : "场控@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_control_btn@3x.png",
+      "filename" : "场控@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_control_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_control_btn_pressed@2x.png",
+      "filename" : "场控@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_control_btn_pressed@3x.png",
+      "filename" : "场控@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_follow_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_follow_btn@2x.png",
+      "filename" : "形状 4601@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_follow_btn@3x.png",
+      "filename" : "形状 4601@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_kick_out_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_kick_out_btn@2x.png",
+      "filename" : "踢出@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_kick_out_btn@3x.png",
+      "filename" : "踢出@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_kick_out_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_kick_out_btn_pressed@2x.png",
+      "filename" : "踢出@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_kick_out_btn_pressed@3x.png",
+      "filename" : "踢出@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_mute_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_mute_btn@2x.png",
+      "filename" : "禁言@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_mute_btn@3x.png",
+      "filename" : "禁言@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_mute_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_mute_btn_pressed@2x.png",
+      "filename" : "禁言@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_mute_btn_pressed@3x.png",
+      "filename" : "禁言@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_zone_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_zone_btn@2x.png",
+      "filename" : "形状 4604@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_zone_btn@3x.png",
+      "filename" : "形状 4604@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_zone_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "live_room_card_zone_btn_pressed@2x.png",
+      "filename" : "形状 4604@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "live_room_card_zone_btn_pressed@3x.png",
+      "filename" : "形状 4604@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

FuSiLive/Assets.xcassets/VideoChat/Contents.json

 {
 {
   "info" : {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
   }
 }
 }

FuSiLive/Assets.xcassets/VideoChat/video_chat_userinfo_bg.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "live_userinfo_level_normal.png",
-      "idiom" : "universal",
-      "resizing" : {
-        "cap-insets" : {
-          "bottom" : 358,
-          "left" : 24,
-          "right" : 24,
-          "top" : 63
-        },
-        "center" : {
-          "height" : 21,
-          "mode" : "tile",
-          "width" : 1
-        },
-        "mode" : "9-part"
-      },
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FuSiLive/Classes/BaoFang/DailyCheckIn/View/FUSSingleDailyCheckInView.m

@@ -98,7 +98,7 @@
     [attr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#02F2F2"] range:countRange];
     [attr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#02F2F2"] range:countRange];
     self.subtitleLabel.attributedText = attr;
     self.subtitleLabel.attributedText = attr;
     
     
-    self.checkInBtn.style = FUSButtonStyleBlurGradientBorder;
+    self.checkInBtn.style = FUSButtonStyleBlueBorder;
     [self.iconImageView setWebImageWithSubURLString:checkInModel.icon placeholder:[UIImage imageNamed:@"checkIn_placeholder"]];
     [self.iconImageView setWebImageWithSubURLString:checkInModel.icon placeholder:[UIImage imageNamed:@"checkIn_placeholder"]];
     
     
     if (checkInModel.toDayState.integerValue) {
     if (checkInModel.toDayState.integerValue) {

FuSiLive/Classes/BaoFang/Main/View/Cell/FUSBaofangAddNewsFeedCell.m

@@ -192,7 +192,7 @@
         _tipLabel = [[UILabel alloc] init];
         _tipLabel = [[UILabel alloc] init];
         _tipLabel.textColor = [UIColor colorWithHex:@"#02F2F2"];
         _tipLabel.textColor = [UIColor colorWithHex:@"#02F2F2"];
         _tipLabel.numberOfLines = 2;
         _tipLabel.numberOfLines = 2;
-        _tipLabel.text = FUSLocalizationHelper.localString(@"Firefly玩家內容分享");
+        _tipLabel.text = FUSLocalizationHelper.localString(@"FuSi玩家內容分享");
         if (FUSLocalizationHelper.fus_currentLanguage.languageID.intValue == 2) {
         if (FUSLocalizationHelper.fus_currentLanguage.languageID.intValue == 2) {
             _tipLabel.font = [UIFont fus_themeBoldFont:36];
             _tipLabel.font = [UIFont fus_themeBoldFont:36];
         } else {
         } else {

FuSiLive/Classes/Common/Other/FUSSocialShareManager.m

@@ -115,8 +115,8 @@
         // web 链接分享
         // web 链接分享
         FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
         FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
         content.contentURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@?msg=%@",contentURL,imageOrUrl]];
         content.contentURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@?msg=%@",contentURL,imageOrUrl]];
-        content.hashtag = [FBSDKHashtag hashtagWithString:@"#FireflyLive"];
-        content.ref = @"Firefly";
+        content.hashtag = [FBSDKHashtag hashtagWithString:@"#FuSiLive"];
+        content.ref = @"FuSi";
 
 
         [FBSDKShareDialog showFromViewController:viewController
         [FBSDKShareDialog showFromViewController:viewController
                                      withContent:content
                                      withContent:content
@@ -150,8 +150,8 @@
         // web 链接分享
         // web 链接分享
         FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
         FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
         content.contentURL = [NSURL URLWithString:contentURL];
         content.contentURL = [NSURL URLWithString:contentURL];
-        content.hashtag = [FBSDKHashtag hashtagWithString:@"#FireflyLive"];
-        content.ref = @"Firefly";
+        content.hashtag = [FBSDKHashtag hashtagWithString:@"#FuSiLive"];
+        content.ref = @"FuSi";
         
         
         [FBSDKShareDialog showFromViewController:viewController
         [FBSDKShareDialog showFromViewController:viewController
                                      withContent:content
                                      withContent:content

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m

@@ -280,7 +280,7 @@
                     _thirdPartyCell.facebookBtn.selected = YES;
                     _thirdPartyCell.facebookBtn.selected = YES;
                 }
                 }
                     break;
                     break;
-                case 7: // Firefly ID
+                case 7: // FuSi ID
                 {
                 {
                     _thirdPartyCell.fireflyidBtn.userInteractionEnabled = NO;
                     _thirdPartyCell.fireflyidBtn.userInteractionEnabled = NO;
                     _thirdPartyCell.fireflyidBtn.selected = YES;
                     _thirdPartyCell.fireflyidBtn.selected = YES;

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingItem.h

@@ -140,7 +140,7 @@ typedef NS_ENUM(NSInteger, CustomSettingItemType) {
  */
  */
 @property (nonatomic, copy) NSArray *thirdPartyAccountArr;
 @property (nonatomic, copy) NSArray *thirdPartyAccountArr;
 /**
 /**
- *  第三方账号按钮的点击事件block(1=Facebook 2=twitter 3=Line 4=微信 5=Firefly ID)
+ *  第三方账号按钮的点击事件block(1=Facebook 2=twitter 3=Line 4=微信 5=FuSi ID)
  */
  */
 @property (nonatomic, copy) void(^thirdPartyAccountBtnClick)(NSInteger index);
 @property (nonatomic, copy) void(^thirdPartyAccountBtnClick)(NSInteger index);
 
 

FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h

@@ -58,7 +58,7 @@
 // 注册新用户
 // 注册新用户
 #define URL_REGIST_USER                 DNS_ACCOUNTS(@"/yzcomm/reg.do")
 #define URL_REGIST_USER                 DNS_ACCOUNTS(@"/yzcomm/reg.do")
 
 
-// Firefly社区注册
+// FuSi社区注册
 #define URL_REGIST_COMMUNITY            DNS_FUS_API(@"/user/reg.html")
 #define URL_REGIST_COMMUNITY            DNS_FUS_API(@"/user/reg.html")
 
 
 // 第三方登录
 // 第三方登录
@@ -114,7 +114,7 @@
 // 获取用户亲密关系列表
 // 获取用户亲密关系列表
 #define URL_GET_FOLLOW_FRIEND_LIST                DNS_FUS_API(@"/followFriend/getFollowList.html")
 #define URL_GET_FOLLOW_FRIEND_LIST                DNS_FUS_API(@"/followFriend/getFollowList.html")
 
 
-// 搜索Firefly好友
+// 搜索FuSi好友
 #define URL_SEARCH_USER                 DNS_FUS_API(@"/user/search.html")
 #define URL_SEARCH_USER                 DNS_FUS_API(@"/user/search.html")
 
 
 #pragma mark -- 设置相关
 #pragma mark -- 设置相关
@@ -566,7 +566,7 @@
 #define URL_UPDATE_LIVE_GIFT_DATA       DNS_FUS_API(@"/setting/updatelivegift.html")
 #define URL_UPDATE_LIVE_GIFT_DATA       DNS_FUS_API(@"/setting/updatelivegift.html")
 
 
 // 获取直播间包裹礼物
 // 获取直播间包裹礼物
-// Firefly 5.5.0 修改了接口，背包接口从/inventory/getgifts.html 改为/inventory/getBackpack.html
+// FuSi 5.5.0 修改了接口，背包接口从/inventory/getgifts.html 改为/inventory/getBackpack.html
 //#define URL_LIVE_PARCELGIFT_DATA        DNS_FUS_API(@"/inventory/getgifts.html")
 //#define URL_LIVE_PARCELGIFT_DATA        DNS_FUS_API(@"/inventory/getgifts.html")
 #define URL_LIVE_BACKPACK_DATA        DNS_FUS_API(@"/inventory/getBackpack.html")
 #define URL_LIVE_BACKPACK_DATA        DNS_FUS_API(@"/inventory/getBackpack.html")
 
 
@@ -1018,19 +1018,19 @@
 //#define URL_API_URL                       @"http://test.api.lvdou66.com/update/server.html"
 //#define URL_API_URL                       @"http://test.api.lvdou66.com/update/server.html"
 
 
 #pragma mark - 固定链接
 #pragma mark - 固定链接
-// Firefly官网
+// FuSi官网
 #define URL_WEB_OFFICIAL                  @"http://www.firefly.live"
 #define URL_WEB_OFFICIAL                  @"http://www.firefly.live"
 
 
-// Firefly商城
+// FuSi商城
 #define URL_WEB_STORE                     DNS_FUS_API(@"/share/store.html")
 #define URL_WEB_STORE                     DNS_FUS_API(@"/share/store.html")
 
 
-// Firefly伴聊往期
+// FuSi伴聊往期
 #define URL_WEB_YABO_ACCOMPANY            DNS_WEB(@"/article/past.html")
 #define URL_WEB_YABO_ACCOMPANY            DNS_WEB(@"/article/past.html")
 
 
-// Firefly游戏
+// FuSi游戏
 #define URL_WEB_GAME                      EDNS_WEB(@"/mygame.html")//@"https://zhiboweb.ishuaji.cn/mygame.html"
 #define URL_WEB_GAME                      EDNS_WEB(@"/mygame.html")//@"https://zhiboweb.ishuaji.cn/mygame.html"
 
 
-// Firefly帮助
+// FuSi帮助
 #define URL_WEB_HELP                      DNS_WEB(@"/Nesting/help/index.html")
 #define URL_WEB_HELP                      DNS_WEB(@"/Nesting/help/index.html")
 
 
 // 阿拉伯帮助
 // 阿拉伯帮助
@@ -1098,7 +1098,7 @@
 // 测试服首页包房的地址
 // 测试服首页包房的地址
 #define URL_WEB_TEST_BAOFANG_ACTIVE_URL                       @"http://test.ybact.yazhaiyabo.com/active2021/activityCenter/index.html"
 #define URL_WEB_TEST_BAOFANG_ACTIVE_URL                       @"http://test.ybact.yazhaiyabo.com/active2021/activityCenter/index.html"
 
 
-// ================================= Firefly 新接口 =================================
+// ================================= FuSi 新接口 =================================
 #pragma mark - 登录注册相关
 #pragma mark - 登录注册相关
 // 校验密码
 // 校验密码
 #define URL_VERIFY_PWD                      DNS_FUS_API(@"/user/checkPassword.html")
 #define URL_VERIFY_PWD                      DNS_FUS_API(@"/user/checkPassword.html")

FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDBOperate.m

@@ -79,7 +79,7 @@
             [self writeSocketMessageToDataBase];
             [self writeSocketMessageToDataBase];
         }
         }
             break;
             break;
-        case CID_NOTIFICATION_MESSAGE:  // Firefly通知消息
+        case CID_NOTIFICATION_MESSAGE:  // FuSi通知消息
         {
         {
             NSMutableArray *officialModelArray = [NSMutableArray arrayWithArray:self.classifyMessageDict[NOTIFICATION_MESSAGE]];
             NSMutableArray *officialModelArray = [NSMutableArray arrayWithArray:self.classifyMessageDict[NOTIFICATION_MESSAGE]];
             [officialModelArray addObject:messageModel];
             [officialModelArray addObject:messageModel];
@@ -88,7 +88,7 @@
              [self writeSocketMessageToDataBase];
              [self writeSocketMessageToDataBase];
         }
         }
             break;
             break;
-        case CID_YABO_ACCOMPANY:  // Firefly伴聊
+        case CID_YABO_ACCOMPANY:  // FuSi伴聊
         {
         {
             NSMutableArray *officialModelArray = [NSMutableArray arrayWithArray:self.classifyMessageDict[FUSBO_ACCOMPANY]];
             NSMutableArray *officialModelArray = [NSMutableArray arrayWithArray:self.classifyMessageDict[FUSBO_ACCOMPANY]];
             [officialModelArray addObject:messageModel];
             [officialModelArray addObject:messageModel];
@@ -149,7 +149,7 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:OFFICIAL_MESSAGE_REFRESH object:nil];
         [[NSNotificationCenter defaultCenter] postNotificationName:OFFICIAL_MESSAGE_REFRESH object:nil];
     }
     }
     
     
-    // 写入Firefly通知消息
+    // 写入FuSi通知消息
     NSArray *notificationModelArray = self.classifyMessageDict[NOTIFICATION_MESSAGE];
     NSArray *notificationModelArray = self.classifyMessageDict[NOTIFICATION_MESSAGE];
     if (![NSArray isNull:notificationModelArray]) {
     if (![NSArray isNull:notificationModelArray]) {
         [FUSOfficialCacheOperate fus_writeDataToOfficialMessageTableWithModelArray:notificationModelArray msgType:@"1"];
         [FUSOfficialCacheOperate fus_writeDataToOfficialMessageTableWithModelArray:notificationModelArray msgType:@"1"];
@@ -157,7 +157,7 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:OFFICIAL_MESSAGE_REFRESH object:nil];
         [[NSNotificationCenter defaultCenter] postNotificationName:OFFICIAL_MESSAGE_REFRESH object:nil];
     }
     }
     
     
-    // 写入Firefly伴聊消息
+    // 写入FuSi伴聊消息
     NSArray *accompanyModelArray = self.classifyMessageDict[FUSBO_ACCOMPANY];
     NSArray *accompanyModelArray = self.classifyMessageDict[FUSBO_ACCOMPANY];
     if (![NSArray isNull:accompanyModelArray]) {
     if (![NSArray isNull:accompanyModelArray]) {
         [FUSOfficialCacheOperate fus_writeDataToOfficialMessageTableWithModelArray:accompanyModelArray msgType:@"2"];
         [FUSOfficialCacheOperate fus_writeDataToOfficialMessageTableWithModelArray:accompanyModelArray msgType:@"2"];

FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDelegate.h

@@ -25,10 +25,10 @@
 #define CID_SINGLE_LIVE_EARNINGS   2026  //音视频通话每分钟增加萤火
 #define CID_SINGLE_LIVE_EARNINGS   2026  //音视频通话每分钟增加萤火
 #define CID_SINGLE_LIVE_DIAMOND_EXPEND   2027  // 通话扣费主叫方宝石变化消息
 #define CID_SINGLE_LIVE_DIAMOND_EXPEND   2027  // 通话扣费主叫方宝石变化消息
 #define CID_SINGLE_LIVE_DIAMOND_RETURN   2028  // 退回用户已扣除宝石费用
 #define CID_SINGLE_LIVE_DIAMOND_RETURN   2028  // 退回用户已扣除宝石费用
-#define CID_OFFICIAL_MESSAGE        2031  // Firefly官方消息
-#define CID_NOTIFICATION_MESSAGE    2039  // Firefly通知消息(3.0之前的命令号为2034)
+#define CID_OFFICIAL_MESSAGE        2031  // FuSi官方消息
+#define CID_NOTIFICATION_MESSAGE    2039  // FuSi通知消息(3.0之前的命令号为2034)
 #define CID_PRIVATE_LIVE            2036  // 私密直播消息（单聊直播）
 #define CID_PRIVATE_LIVE            2036  // 私密直播消息（单聊直播）
-#define CID_YABO_ACCOMPANY          2037    // Firefly伴聊
+#define CID_YABO_ACCOMPANY          2037    // FuSi伴聊
 #define CID_YABO_CHANGENIKENAME     2041  //修改暱稱
 #define CID_YABO_CHANGENIKENAME     2041  //修改暱稱
 #define CID_ZONE_FANS_ADD           2042  // 粉丝增加减少
 #define CID_ZONE_FANS_ADD           2042  // 粉丝增加减少
 #define CID_NEWS_FEED_MESSAGE           2045  // 动态互动消息
 #define CID_NEWS_FEED_MESSAGE           2045  // 动态互动消息

FuSiLive/Classes/FusiVersionFeature/Others/FUSLiveStateAnimationView.h

 //
 //
 //  FUSLiveStateAnimationView.h
 //  FUSLiveStateAnimationView.h
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/12.
 //  Created by aaa on 2024/6/12.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.

FuSiLive/Classes/FusiVersionFeature/Others/FUSLiveStateAnimationView.m

 //
 //
 //  FUSLiveStateAnimationView.m
 //  FUSLiveStateAnimationView.m
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/12.
 //  Created by aaa on 2024/6/12.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.h

 //
 //
 //  FUSResponsibilityConfirmAlertView.h
 //  FUSResponsibilityConfirmAlertView.h
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/13.
 //  Created by aaa on 2024/6/13.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m

 //
 //
 //  FUSResponsibilityConfirmAlertView.m
 //  FUSResponsibilityConfirmAlertView.m
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/13.
 //  Created by aaa on 2024/6/13.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.h

 //
 //
 //  FUSShowBroadcastGuideAlertView.h
 //  FUSShowBroadcastGuideAlertView.h
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/12.
 //  Created by aaa on 2024/6/12.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m

 //
 //
 //  FUSShowBroadcastGuideAlertView.m
 //  FUSShowBroadcastGuideAlertView.m
-//  FireflyShow
+//  FuSiLive
 //
 //
 //  Created by aaa on 2024/6/12.
 //  Created by aaa on 2024/6/12.
 //  Copyright © 2024 压寨团队. All rights reserved.
 //  Copyright © 2024 压寨团队. All rights reserved.