Skip to content

pidan / FuSiLive

Go to a project
Commit fcdb6659 by pierce
Options

fixed bugs

parent 4e0df803
Inline Side-by-side
Showing with 33 additions and 1273 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Http/FUSHttpHelper.m
...@@ -1620,14 +1620,6 @@ NSString *decimalNumberWithDouble(double conversionValue){ ...@@ -1620,14 +1620,6 @@ NSString *decimalNumberWithDouble(double conversionValue){
return params; return params;
} }
// 判断是否为[https://accounts.ishuaji.cn]域名的请求，该域名不添加固定参数
// if (![urlStr containsString:@"ishuaji.cn"] &&
// ![urlStr containsString:@"yazhai.com"] &&
// ![urlStr containsString:@"test.api"] &&
// ![urlStr containsString:@":8080"]) {
// return params;
// }
// 初始化参数可变字典，并添加必传参数 // 初始化参数可变字典，并添加必传参数
NSMutableDictionary *paramDict = [NSMutableDictionary dictionary]; NSMutableDictionary *paramDict = [NSMutableDictionary dictionary];
[paramDict setValue: OPERATING_SYSTEM forKey:@"os"]; [paramDict setValue: OPERATING_SYSTEM forKey:@"os"];
......
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/Contents.json deleted 100644 → 0
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_0.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "live_bullet_global_left_anim_0@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_0_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_0@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_1.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_10.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_10@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_10_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_10@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_11.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_11@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_11_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_11@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_12.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_12@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_12_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_12@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_13.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_13@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_13_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_13@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_14.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_14@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_14_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_14@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_15.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_15@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_15_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_15@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_16.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_16@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_16_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_16@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_17.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_17@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_17_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_17@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_18.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_18@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_18_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_18@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_19.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_19@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_19_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_19@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_1_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_2.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_20.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_20@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_20_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_20@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_21.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_21@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_21_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_21@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_22.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_22@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_22_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_22@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_2_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_3.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_3_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_4.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_4@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_4_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_4@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_5.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_5@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_5_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_5@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_6.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_6@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_6_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_6@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_7.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_7@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_7_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_7@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_8.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_8@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_8_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_8@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_9.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_9@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/Bullet/GlobalLeftAnim/live_bullet_global_left_anim_9_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_bullet_global_left_anim_9@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/FirstRecharge/2_live_chat_bullets_btn_disable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/Live/FirstRecharge/3_live_chat_bullets_btn_disable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/1_live_chat_bullets_btn_disable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/1_live_chat_bullets_btn_enable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/2_live_chat_bullets_btn_enable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/3_live_chat_bullets_btn_enable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/4_live_chat_bullets_btn_disable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/jacket/4_live_chat_bullets_btn_enable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/language_id/5_live_chat_bullets_btn_disable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-未选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Assets.xcassets/language_id/5_live_chat_bullets_btn_enable.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "弹幕icon-选中@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m
...@@ -527,7 +527,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -527,7 +527,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(i * viewWidth, 0, viewWidth, viewHeight)]; UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(i * viewWidth, 0, viewWidth, viewHeight)];
[_bottomBgView addSubview:bgView]; [_bottomBgView addSubview:bgView];
UILabel *label = label = [[UILabel alloc] initWithFrame:CGRectMake(0, bgView.centerY - 10, bgView.width, 20)]; UILabel *label = label = [[UILabel alloc] initWithFrame:CGRectMake(0, bgView.centerY - 10, bgView.width, 30)];
label.textColor = UIColor.fus_textColorRich; label.textColor = UIColor.fus_textColorRich;
label.textAlignment = NSTextAlignmentCenter; label.textAlignment = NSTextAlignmentCenter;
label.font = [UIFont fus_custom1ItalicFont:26]; label.font = [UIFont fus_custom1ItalicFont:26];
...@@ -1162,7 +1162,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -1162,7 +1162,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
- (void)fus_setCreditInfoWithCurrentModel { - (void)fus_setCreditInfoWithCurrentModel {
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { if (FUSConfig.sharedInstanced.devConfigs.appStatus || self.currentModel.isHide.boolValue) {
self.creditView.hidden = YES; self.creditView.hidden = YES;
return; return;
} }
......
FuSiLive/Classes/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
...@@ -843,7 +843,7 @@ ...@@ -843,7 +843,7 @@
NSMutableAttributedString *attr = [NSMutableAttributedString fus_createAttributedLabelStringForString:[NSString stringWithFormat:@"%@", model.nickname] withTextColor:textColor font:FUS_LIVE_FONT(fontSize) needShadow:YES maxWidth:200]; NSMutableAttributedString *attr = [NSMutableAttributedString fus_createAttributedLabelStringForString:[NSString stringWithFormat:@"%@", model.nickname] withTextColor:textColor font:FUS_LIVE_FONT(fontSize) needShadow:YES maxWidth:200];
if (model.lev) { if (model.lev && model.isHide.boolValue == false) {
UIButton *levBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *levBtn = [UIButton buttonWithType:UIButtonTypeCustom];
levBtn.frame = CGRectMake(0, 0, 14, 14); levBtn.frame = CGRectMake(0, 0, 14, 14);
levBtn.titleLabel.font = [UIFont fus_themeFont:12]; levBtn.titleLabel.font = [UIFont fus_themeFont:12];
...@@ -860,9 +860,9 @@ ...@@ -860,9 +860,9 @@
levBtn.width = 20; levBtn.width = 20;
} }
NSAttributedString *levAttr = [NSAttributedString attachmentStringWithContent:levBtn contentMode:UIViewContentModeScaleAspectFit attachmentSize:levBtn.size alignToFont:[UIFont fus_themeFont:self.fontSize] alignment:YYTextVerticalAlignmentCenter]; NSAttributedString *levAttr = [NSAttributedString attachmentStringWithContent:levBtn contentMode:UIViewContentModeScaleAspectFit attachmentSize:levBtn.size alignToFont:[UIFont fus_themeFont:self.fontSize] alignment:YYTextVerticalAlignmentCenter];
[attr insertString:@" " atIndex:0]; NSMutableAttributedString *spaceAttr = [[NSMutableAttributedString alloc] initWithString:@" " attributes:@{NSFontAttributeName: [UIFont fus_themeFont:self.fontSize / 2.0f]}];
[attr insertAttributedString:spaceAttr atIndex:0];
[attr insertAttributedString:levAttr atIndex:0]; [attr insertAttributedString:levAttr atIndex:0];
[attr appendString:@" "];
} }
// 容错 // 容错
...@@ -874,7 +874,7 @@ ...@@ -874,7 +874,7 @@
// 产品要求去除客户端系统消息消息不带等级的这个过滤 v5.5.0 added by pidan。 // 产品要求去除客户端系统消息消息不带等级的这个过滤 v5.5.0 added by pidan。
// model.msgType.integerValue != 1 // model.msgType.integerValue != 1
if ([model.privilege[@"richPower"] integerValue] == 1 if ([model.privilege[@"richPower"] integerValue] == 1
|| model.isHide.boolValue) { && model.isHide.boolValue == false) {
if (model.level.integerValue > 0 || model.isHide.boolValue) { if (model.level.integerValue > 0 || model.isHide.boolValue) {
hasShowVipIcon = YES; hasShowVipIcon = YES;
...@@ -884,9 +884,7 @@ ...@@ -884,9 +884,7 @@
CGFloat imageW = levelImageHeight / levelImage.size.height * levelImage.size.width; CGFloat imageW = levelImageHeight / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW,imageH) alignToFont:FUS_LIVE_FONT(fontSize) alignment:YYTextVerticalAlignmentCenter]; NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW,imageH) alignToFont:FUS_LIVE_FONT(fontSize) alignment:YYTextVerticalAlignmentCenter];
// 让VIP图标图标往下偏移 // 让VIP图标图标往下偏移
[attr appendString:@" "];
[attr appendAttributedString:levelAttr]; [attr appendAttributedString:levelAttr];
[attr appendString:@" "];
} }
// 有等级 进行添加 // 有等级 进行添加
// FUSLevelDataModel *levelModel = [self.levelDict objectForKey:model.level]; // FUSLevelDataModel *levelModel = [self.levelDict objectForKey:model.level];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputTextView.m
...@@ -258,8 +258,8 @@ ...@@ -258,8 +258,8 @@
_bulletsBtn.frame = CGRectMake(0, 5, BULLETS_BTN_WIDTH, _inputViewContent.height - 10); _bulletsBtn.frame = CGRectMake(0, 5, BULLETS_BTN_WIDTH, _inputViewContent.height - 10);
// _bulletsBtn.backgroundColor = [UIColor yellowColor]; // _bulletsBtn.backgroundColor = [UIColor yellowColor];
[_bulletsBtn addTarget:self action:@selector(onClickBulletsBtn:) forControlEvents:UIControlEventTouchUpInside]; [_bulletsBtn addTarget:self action:@selector(onClickBulletsBtn:) forControlEvents:UIControlEventTouchUpInside];
[_bulletsBtn setImage:[[FUSLocalizationHelper fus_languageImage:@"live_chat_bullets_btn_enable"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateSelected]; [_bulletsBtn setImage:[[UIImage imageNamed:@"live_chat_bullets_btn_enable"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateSelected];
[_bulletsBtn setImage:[[FUSLocalizationHelper fus_languageImage:@"live_chat_bullets_btn_disable"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateNormal]; [_bulletsBtn setImage:[[UIImage imageNamed:@"live_chat_bullets_btn_disable"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateNormal];
[_inputViewContent addSubview:_bulletsBtn]; [_inputViewContent addSubview:_bulletsBtn];
// 设置为不是弹幕 // 设置为不是弹幕
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSBulletsView/FUSBulletMessageGlobalView.m
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
#import "FUSLiveChatInputView.h" #import "FUSLiveChatInputView.h"
#define FUSBMGVFaceLength 40 #define FUSBMGVFaceLength 40
#define FUSBMGVLeftAnimLen 125
#define FUSBMGVRightAnimLen 75 #define FUSBMGVRightAnimLen 75
#define FUSBMGVSpaceBetweenLeftAnimAndFace (-25) #define FUSBMGVFaceLeft 40
#define FUSBMGVSpaceBetweenFaceAndContent 4 #define FUSBMGVSpaceBetweenFaceAndContent 4
@interface FUSBulletMessageGlobalView() @interface FUSBulletMessageGlobalView()
...@@ -24,14 +23,11 @@ ...@@ -24,14 +23,11 @@
// 背景图片 // 背景图片
@property (nonatomic, strong) UIImageView *bgImageView; @property (nonatomic, strong) UIImageView *bgImageView;
// 左边背景动画图片
@property (nonatomic, strong) UIImageView *leftAnimImageView;
// 右边背景动画图片 // 右边背景动画图片
@property (nonatomic, strong) UIImageView *rightAnimImageView; @property (nonatomic, strong) UIImageView *rightAnimImageView;
// 用户头像 // 用户头像
@property (nonatomic, strong) FUSRichIconView *faceImageView; @property (nonatomic, strong) UIImageView *faceImageView;
// 昵称文案 // 昵称文案
@property (nonatomic, strong) YYLabel *nickNameLabel; @property (nonatomic, strong) YYLabel *nickNameLabel;
...@@ -73,11 +69,12 @@ ...@@ -73,11 +69,12 @@
- (void)initial { - (void)initial {
self.bgImageView = [[UIImageView alloc] initWithFrame:self.bounds]; self.bgImageView = [[UIImageView alloc] initWithFrame:self.bounds];
_bgImageView.contentMode = UIViewContentModeScaleToFill; _bgImageView.contentMode = UIViewContentModeScaleToFill;
self.leftAnimImageView = [[UIImageView alloc] initWithFrame:CGRectMake(-8, 0, FUSBMGVLeftAnimLen, FUSBMGVLeftAnimLen)];
self.rightAnimImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, FUSBMGVRightAnimLen, FUSBMGVRightAnimLen)]; self.rightAnimImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, FUSBMGVRightAnimLen, FUSBMGVRightAnimLen)];
self.faceImageView = [[FUSRichIconView alloc] initWithFrame:CGRectMake(0, 0, FUSBMGVFaceLength, FUSBMGVFaceLength)]; self.faceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, FUSBMGVFaceLength, FUSBMGVFaceLength)];
self.faceImageView.contentMode = UIViewContentModeScaleAspectFill; self.faceImageView.contentMode = UIViewContentModeScaleAspectFill;
self.faceImageView.layer.cornerRadius = FUSBMGVFaceLength / 2.0f;
self.faceImageView.layer.masksToBounds = YES;
self.nickNameLabel = [[YYLabel alloc] init]; self.nickNameLabel = [[YYLabel alloc] init];
self.contentLabel = [[YYLabel alloc] init]; self.contentLabel = [[YYLabel alloc] init];
self.jumpBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.jumpBtn = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -91,7 +88,6 @@ ...@@ -91,7 +88,6 @@
[self addSubview:self.faceImageView]; [self addSubview:self.faceImageView];
[self addSubview:self.nickNameLabel]; [self addSubview:self.nickNameLabel];
[self addSubview:self.contentLabel]; [self addSubview:self.contentLabel];
[self addSubview:self.leftAnimImageView];
[self addSubview:self.rightAnimImageView]; [self addSubview:self.rightAnimImageView];
[self addSubview:self.jumpBtn]; [self addSubview:self.jumpBtn];
...@@ -102,14 +98,9 @@ ...@@ -102,14 +98,9 @@
[super fus_setupWithModel:model]; [super fus_setupWithModel:model];
_bgImageView.image = [UIImage imageNamed:[FUSRTL RTLImageName:@"live_bullet_global_bg"]]; _bgImageView.image = [UIImage imageNamed:[FUSRTL RTLImageName:@"live_bullet_global_bg"]];
if (model.isHide.integerValue) { [self.faceImageView setWebImageWithSubURLString:model.face];
[self.faceImageView fus_setupIconWithFacePath:model.face level:0];
} else {
NSInteger level = [model.privilege[@"richPower"] integerValue] == 1 ? model.realLevel.integerValue : 0;
[self.faceImageView fus_setupLiveIconWithFacePath:model.face level:level];
}
_faceImageView.x = FUSBMGVLeftAnimLen + FUSBMGVSpaceBetweenLeftAnimAndFace - 3; _faceImageView.x = FUSBMGVFaceLeft;
if (FUSRTL.isRTL) { if (FUSRTL.isRTL) {
[_nickNameLabel setTextAlignment:NSTextAlignmentRight]; [_nickNameLabel setTextAlignment:NSTextAlignmentRight];
...@@ -133,8 +124,6 @@ ...@@ -133,8 +124,6 @@
self.bgImageView.width = self.width - self.bgImageView.x; self.bgImageView.width = self.width - self.bgImageView.x;
self.bgImageView.height = self.height; self.bgImageView.height = self.height;
self.bgImageView.centerY = self.height / 2.0f; self.bgImageView.centerY = self.height / 2.0f;
self.leftAnimImageView.x = -8;
self.leftAnimImageView.centerY = self.bgImageView.centerY;
self.faceImageView.centerY = self.bgImageView.centerY; self.faceImageView.centerY = self.bgImageView.centerY;
_nickNameLabel.y = _faceImageView.y + 2; _nickNameLabel.y = _faceImageView.y + 2;
...@@ -151,10 +140,6 @@ ...@@ -151,10 +140,6 @@
} }
} }
_leftAnimImageView.animationImages = [leftAnimArr copy];
_leftAnimImageView.animationDuration = 22.0f / 9.0f;
[_leftAnimImageView startAnimating];
_rightAnimImageView.animationImages = [self.rightAnimImages copy]; _rightAnimImageView.animationImages = [self.rightAnimImages copy];
_rightAnimImageView.animationDuration = 22.0f / 9.0f; _rightAnimImageView.animationDuration = 22.0f / 9.0f;
[_rightAnimImageView startAnimating]; [_rightAnimImageView startAnimating];
...@@ -218,7 +203,7 @@ ...@@ -218,7 +203,7 @@
} }
+ (CGFloat)fus_bulletWidthWithModel:(FUSBulletModel *)model { + (CGFloat)fus_bulletWidthWithModel:(FUSBulletModel *)model {
return FUSBMGVLeftAnimLen + FUSBMGVSpaceBetweenLeftAnimAndFace + FUSBMGVFaceLength + FUSBMGVSpaceBetweenFaceAndContent + MAX(CGRectGetWidth(model.contentAttrRect), CGRectGetWidth(model.nickAttrRect)) + FUSBMGVRightAnimLen; return FUSBMGVFaceLeft + FUSBMGVFaceLength + FUSBMGVSpaceBetweenFaceAndContent + MAX(CGRectGetWidth(model.contentAttrRect), CGRectGetWidth(model.nickAttrRect)) + FUSBMGVRightAnimLen;
} }
- (UIView *)fus_hitTestViewWithPoint:(CGPoint)point { - (UIView *)fus_hitTestViewWithPoint:(CGPoint)point {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/LiveUserListView/FUSLiveHeaderUserListView.m
...@@ -58,7 +58,7 @@ typedef enum : NSUInteger { ...@@ -58,7 +58,7 @@ typedef enum : NSUInteger {
_userCollectionView.frame = self.bounds; _userCollectionView.frame = self.bounds;
CGFloat width = self.height * 0.6; CGFloat width = self.height * 0.6;
if (self.userItemSize.width != width) { if (self.userItemSize.width != width) {
_userItemSize = CGSizeMake(floor(width), self.height); _userItemSize = CGSizeMake(ceil(width), self.height);
_flowLayout.itemSize = _userItemSize; _flowLayout.itemSize = _userItemSize;
[_userCollectionView reloadData]; [_userCollectionView reloadData];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m
...@@ -397,13 +397,13 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -397,13 +397,13 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
} }
[self fus_switchRole:AgoraClientRoleBroadcaster]; [self fus_switchRole:AgoraClientRoleBroadcaster];
[_agoraEngine muteLocalAudioStream:NO];
if ([FUSLiveHelper shareInstance].liveRoomType != FUSRoomTypeLinkMic) { if ([FUSLiveHelper shareInstance].liveRoomType != FUSRoomTypeLinkMic) {
[_agoraEngine enableLocalVideo:YES]; [_agoraEngine enableLocalVideo:YES];
}else{ }else{
[_agoraEngine enableLocalVideo:NO]; [_agoraEngine enableLocalVideo:NO];
} }
[_agoraEngine muteLocalAudioStream:NO];
[self switchLocalMic:YES]; [self switchLocalMic:YES];
[self updateToSpeakerPlay]; [self updateToSpeakerPlay];
} }
...@@ -426,7 +426,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -426,7 +426,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
open = NO; open = NO;
} }
[_agoraEngine muteLocalAudioStream:!open]; // [_agoraEngine muteLocalAudioStream:!open];
//TODO: ludy:对应bugYBCH-28179 連麥的時候，開麥閉麥會断一下。 7580版本因为测试时间有限，先不改，下版本直接打开下面的注释，把上面的代码注释，修改测试 //TODO: ludy:对应bugYBCH-28179 連麥的時候，開麥閉麥會断一下。 7580版本因为测试时间有限，先不改，下版本直接打开下面的注释，把上面的代码注释，修改测试
// [_agoraEngine enableLocalAudio:open]; // [_agoraEngine enableLocalAudio:open];
...@@ -492,10 +492,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -492,10 +492,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[self switchLocalMic:YES]; [self switchLocalMic:YES];
[_agoraEngine enableLocalVideo:YES]; [_agoraEngine enableLocalVideo:YES];
_agoraEngine.delegate = self; _agoraEngine.delegate = self;
// [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionConfigureSession];
// [_agoraEngine disableExternalAudioSource];
// 这个scenario只能是AgoraAudioScenarioGameStreaming，设置为别的会有回音
[_agoraEngine setAudioProfile:AgoraAudioProfileDefault]; [_agoraEngine setAudioProfile:AgoraAudioProfileDefault];
[_agoraEngine setAudioScenario:AgoraAudioScenarioChatRoom]; [_agoraEngine setAudioScenario:AgoraAudioScenarioChatRoom];
/// 开启硬编码 /// 开启硬编码
...@@ -945,7 +942,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -945,7 +942,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine didJoinChannel:(NSString * _Nonnull)channel withUid:(NSUInteger)uid elapsed:(NSInteger) elapsed - (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine didJoinChannel:(NSString * _Nonnull)channel withUid:(NSUInteger)uid elapsed:(NSInteger) elapsed
{ {
FUSLogVerbose(@"%s",__func__); FUSLogVerbose(@"%s",__func__);
[engine enableAudio]; [self switchLocalMic:YES];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m
...@@ -610,8 +610,7 @@ ...@@ -610,8 +610,7 @@
[self fus_setUserInfos:@[]]; [self fus_setUserInfos:@[]];
[_itemView fus_dismissView]; [_itemView fus_dismissView];
_selfCloseMic = NO; self.selfCloseMic = NO;
[FUSLiveHelper shareInstance].selfCloseMic = NO;
[[NSNotificationCenter defaultCenter] removeObserver:self];; [[NSNotificationCenter defaultCenter] removeObserver:self];;
} }
...@@ -720,6 +719,7 @@ ...@@ -720,6 +719,7 @@
// 改变自己的麦位状态 // 改变自己的麦位状态
- (void)fus_switchMicStatus:(BOOL)onMic{ - (void)fus_switchMicStatus:(BOOL)onMic{
self.selfCloseMic = !onMic;
if (onMic) { if (onMic) {
[FUSDialogView fus_showDialog:[NSString fus_localString:@"已开麦"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"已开麦"]];
...@@ -729,9 +729,6 @@ ...@@ -729,9 +729,6 @@
[FUSDialogView fus_showDialog:[NSString fus_localString:@"已关麦"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"已关麦"]];
[_linkMicAgoraHelper switchLocalMic:NO]; [_linkMicAgoraHelper switchLocalMic:NO];
} }
_selfCloseMic = !onMic;
[FUSLiveHelper shareInstance].selfCloseMic = _selfCloseMic;
} }
- (void)fus_switchMicStatus:(BOOL)onMic uid:(NSString *)uid{ - (void)fus_switchMicStatus:(BOOL)onMic uid:(NSString *)uid{
...@@ -788,9 +785,9 @@ ...@@ -788,9 +785,9 @@
[FUSLiveHelper shareInstance].roomInfoModel.micMode = micMode; [FUSLiveHelper shareInstance].roomInfoModel.micMode = micMode;
if (!micMode) { if (!micMode) {
__weak typeof(self) weakSelf = self;
[self.linkMicAgoraHelper fus_stopLinkMicroStreamingWithChannelId:_channelId.integerValue completionHandler:^{ [self.linkMicAgoraHelper fus_stopLinkMicroStreamingWithChannelId:_channelId.integerValue completionHandler:^{
_selfCloseMic = NO; weakSelf.selfCloseMic = NO;
[FUSLiveHelper shareInstance].selfCloseMic = NO;
}]; }];
} }
} }
...@@ -1126,7 +1123,7 @@ ...@@ -1126,7 +1123,7 @@
} }
// 不管主播那边怎么做，都无法改变用户的自己闭麦状态 // 不管主播那边怎么做，都无法改变用户的自己闭麦状态
// _selfCloseMic = NO; // self.selfCloseMic = NO;
}else{ }else{
// 确保用户在闭麦失败时，其他用户也听不到他的声音 // 确保用户在闭麦失败时，其他用户也听不到他的声音
...@@ -1149,8 +1146,7 @@ ...@@ -1149,8 +1146,7 @@
NSString *uid = [dict[@"micId"] description]; NSString *uid = [dict[@"micId"] description];
NSString *operateNickname = dict[@"operateNickname"]; NSString *operateNickname = dict[@"operateNickname"];
if ([[FUSCacheDataShare shareStore].userDetailInfo.uid isEqualToString:uid]) { if ([[FUSCacheDataShare shareStore].userDetailInfo.uid isEqualToString:uid]) {
_selfCloseMic = NO; self.selfCloseMic = NO;
[FUSLiveHelper shareInstance].selfCloseMic = _selfCloseMic;
if (_linkMicAgoraHelper) { if (_linkMicAgoraHelper) {
[self.linkMicAgoraHelper fus_closeMicro]; [self.linkMicAgoraHelper fus_closeMicro];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/Other/FUSPKHelper.m
...@@ -584,9 +584,11 @@ NSString * const kStreamPKPlayViewLiveStateNotification = @"kStreamPKPlayViewLiv ...@@ -584,9 +584,11 @@ NSString * const kStreamPKPlayViewLiveStateNotification = @"kStreamPKPlayViewLiv
_matchId = model.matchid; _matchId = model.matchid;
_channelId = model.channelid; _channelId = model.channelid;
NSString *content = nil; NSString *content = nil;
if (model.type.integerValue == 2) { if (model.type.integerValue >= 2 && model.type.integerValue <= 5) {
_pkType = FUSPKTypeHotAnchor; _pkType = model.type.integerValue;
content = [NSString stringWithFormat:[NSString fus_localString:@" %@ 邀请你进行PK"],model.nickname]; content = [NSString stringWithFormat:[NSString fus_localString:@" %@ 邀请你进行PK"],model.nickname];
} else {
_pkType = FUSPKTypeHotAnchor;
} }
FUSLogInfo(@"-------> 接收到被邀请pk pkid == %@",_pkId); FUSLogInfo(@"-------> 接收到被邀请pk pkid == %@",_pkId);
// [liveVC.liveFunctionView fus_dismissPKStyleViewAnimated:YES]; // [liveVC.liveFunctionView fus_dismissPKStyleViewAnimated:YES];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKMainView/FUSPKMainView.m
...@@ -1155,18 +1155,14 @@ NSInteger const kPKMainViewAdditionHeight = 51; ...@@ -1155,18 +1155,14 @@ NSInteger const kPKMainViewAdditionHeight = 51;
_onceAgainBtn.centerX = self.width / 2; _onceAgainBtn.centerX = self.width / 2;
_onceAgainBtn.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; _onceAgainBtn.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
[_onceAgainBtn addTarget:self action:@selector(clickOnceAgainBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [_onceAgainBtn addTarget:self action:@selector(clickOnceAgainBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_onceAgainBtn.titleLabel.font = [UIFont fus_themeMediumFont:14]; _onceAgainBtn.titleLabel.font = [UIFont fus_themeMediumFont:12];
[_onceAgainBtn setTitle:[NSString fus_localString:@"再来一次"] forState:UIControlStateNormal]; [_onceAgainBtn setTitle:[NSString fus_localString:@"再来一次"] forState:UIControlStateNormal];
[_onceAgainBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [_onceAgainBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_onceAgainBtn sizeToFit]; [_onceAgainBtn sizeToFit];
_onceAgainBtn.height = 26; _onceAgainBtn.height = 26;
_onceAgainBtn.layer.cornerRadius = 10.5; _onceAgainBtn.layer.cornerRadius = 13;
_onceAgainBtn.layer.masksToBounds = YES; _onceAgainBtn.layer.masksToBounds = YES;
if (_onceAgainBtn.width > 61) {
_onceAgainBtn.width = _onceAgainBtn.width + 30; _onceAgainBtn.width = _onceAgainBtn.width + 30;
}else{
_onceAgainBtn.width = 61;
}
_onceAgainBtn.centerX = self.width / 2; _onceAgainBtn.centerX = self.width / 2;
} }
return _onceAgainBtn; return _onceAgainBtn;
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSStreamPushView.m
...@@ -170,10 +170,8 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi ...@@ -170,10 +170,8 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
// [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionAll]; // [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionAll];
[_agoraEngine setParameters:@"{\"che.audio.keep.audiosession\":true}"]; [_agoraEngine setParameters:@"{\"che.audio.keep.audiosession\":true}"];
// [_agoraEngine disableExternalAudioSource];
// 这个scenario只能是AgoraAudioScenarioGameStreaming，设置为别的会有回音
[_agoraEngine setAudioProfile:AgoraAudioProfileMusicHighQuality]; [_agoraEngine setAudioProfile:AgoraAudioProfileMusicHighQuality];
[_agoraEngine setAudioScenario:AgoraAudioScenarioGameStreaming];; [_agoraEngine setAudioScenario:AgoraAudioScenarioChatRoom];;
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
_captureHelper.videoFrameCallBackHandler = ^(CVPixelBufferRef buffer, CMTime pts, int rotation) { _captureHelper.videoFrameCallBackHandler = ^(CVPixelBufferRef buffer, CMTime pts, int rotation) {
AgoraVideoFrame *videoFrame = [[AgoraVideoFrame alloc] init]; AgoraVideoFrame *videoFrame = [[AgoraVideoFrame alloc] init];
......
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