Skip to content

pidan / FuSiLive

Go to a project
Commit fb44b850 by ludi
Options

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

parents 3c3aa6b4 13fd372c
Inline Side-by-side
Showing with 48 additions and 774 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down00.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00000.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down01.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00001.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down02.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00002.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down03.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00003.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down04.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00004.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down05.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00005.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/pull_down/pull_down06.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "下拉部分_00006.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_1.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_01@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_10.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_010@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_11.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_011@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_12.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_012@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_13.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_013@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_14.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_014@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_15.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_015@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_16.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_016@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_17.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_017@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_18.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_018@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_19.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_019@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_2.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_02@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_20.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_020@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_21.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_021@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_22.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_022@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_23.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_023@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_24.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_024@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_3.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_03@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_4.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_04@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_5.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_05@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_6.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_06@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_7.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_07@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_8.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_08@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/Loading/release/release_refresh_9.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "release_refresh_09@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/com_no_data_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_alert_bg_img.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "vchat_alert_bg_img@2x.png",
"idiom" : "universal",
"resizing" : {
"cap-insets" : {
"bottom" : 117,
"left" : 109,
"right" : 106,
"top" : 118
},
"center" : {
"height" : 2,
"mode" : "stretch",
"width" : 26
},
"mode" : "9-part"
},
"scale" : "2x"
},
{
"filename" : "vchat_alert_bg_img@3x.png",
"idiom" : "universal",
"resizing" : {
"cap-insets" : {
"bottom" : 160,
"left" : 128,
"right" : 127,
"top" : 138
},
"center" : {
"height" : 5,
"mode" : "stretch",
"width" : 1
},
"mode" : "9-part"
},
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/home_list_default_cover.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "icon_baofang_cover_boy@2x.png",
"filename" : "square_holder4_500.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_baofang_cover_boy@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/icon_boy_default.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_boy_default@2x.png",
"filename" : "square_holder4_500.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/live_default_head_bg.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "直播间-头像占位图@2x.png",
"filename" : "square_holder4_500.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "直播间-头像占位图@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/AlertView/FUSAlertView.m
......@@ -119,6 +119,9 @@ static FUSAlertView *sharedAlertView = nil;
if([NSArray isNull:titlesArray]){
self.cancelBtn.backgroundColor = UIColor.fus_appMainColor;
self.cancelBtn.titleLabel.font = [UIFont fus_themeMediumFont:15];
[self.cancelBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.confirmBtnArr removeAllObjects];
return;
}
......@@ -134,7 +137,7 @@ static FUSAlertView *sharedAlertView = nil;
// if (i < self.confirmBtnArr.count) {
// btn = self.confirmBtnArr[i];
// }else{
btn = [UIButton buttonWithType:UIButtonTypeSystem];
btn = [UIButton buttonWithType:UIButtonTypeCustom];
btn.titleLabel.font = [UIFont fus_themeMediumFont:15];
// }
......@@ -261,7 +264,10 @@ static FUSAlertView *sharedAlertView = nil;
}else{
self.cancelBtn.frame = CGRectMake(btnX, nextY, btnW, 0);
}
btnWholeH = BTN_HEIGHT * self.confirmBtnArr.count + itemSpace * (self.confirmBtnArr.count - 1) + self.cancelBtn.height;
btnWholeH = self.cancelBtn.height;
if (self.confirmBtnArr.count > 0) {
btnWholeH += (BTN_HEIGHT * self.confirmBtnArr.count + itemSpace * (self.confirmBtnArr.count - 1));
}
}
self.bgView.width = alertViewW;
......
FuSiLive/Assets.xcassets/BaoFang/Country/flag_default_img.imageset/Contents.json
......@@ -9,13 +9,13 @@
"scale" : "2x"
},
{
"filename" : "icon_common_place_holder_firefly.png",
"idiom" : "universal",
"filename" : "flag_default_img@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/BaoFang/Country/hoy_default_img.imageset/Contents.json
......@@ -9,13 +9,13 @@
"scale" : "2x"
},
{
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"filename" : "hoy_default_img@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/BaoFang/baofang_film_room_icon_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/Common/com_icon_hot_no_data_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/Common/common_icon_video_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/Common/icon_boy_default.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "頭像-默认图-方@2x.png",
"filename" : "square_holder3_372.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "頭像-默认图-方@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Common/icon_default_gift.imageset/Contents.json
......@@ -5,8 +5,8 @@
"scale" : "1x"
},
{
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"filename" : "111.png",
"scale" : "2x"
},
{
......@@ -15,7 +15,7 @@
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_empty_fireCount.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_empty_photos.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_empty_send_jewel.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_empty_videos.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/Live/live_default_head_bg.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "直播间-头像占位图@2x.png",
"filename" : "square_holder3_372.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "直播间-头像占位图@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Live/live_game_catalogue_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "默认占位图@2x.png",
"filename" : "icon_empty_view.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/SingleChat/single_chat_default_msg_img.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "消息占位图2@2x.png",
"filename" : "square_holder3_372.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "消息占位图2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Zone/VIP/vip_center_card_bg_default_icon.imageset/Contents.json
......@@ -5,18 +5,17 @@
"scale" : "1x"
},
{
"filename" : "vip_power_placeholder.png",
"idiom" : "universal",
"filename" : "vip_center_card_bg_default_icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "vip_center_card_bg_default_icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/jacket/ZhaiXin_Official_Default.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "首页-小列表-加载默认图@2x.png",
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"scale" : "2x"
},
......
FuSiLive/Assets.xcassets/jacket/icon_baofang_default.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "首页封面-加载图@2x.png",
"filename" : "square_holder4_500.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "首页封面-加载图@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/jacket/icon_baofang_default_mini.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "首页封面-加载图@2x.png",
"filename" : "square_holder4_500.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "首页封面-加载图@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/jacket/icon_head_default.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "頭像-加载-方@2x.png",
"filename" : "square_holder2_1125.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "頭像-加载-方@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Classes/NewLive/Main/View/LoadingView/FUSLiveLoadingView.m
......@@ -28,7 +28,7 @@
// 正在进入包房
- (void)fus_showLiveEntering {
_loadingImageView.animationImages = [UIImage fus_animationImages:@"release_refresh_" mainBundle:NO needCache:YES];
_loadingImageView.animationImages = [UIImage fus_animationImages:@"fusi_loading_animate_" mainBundle:NO needCache:YES];
_loadingImageView.animationDuration = 1.5;
[_loadingImageView startAnimating];
// _loadingLabel.text = FUSLocalizationHelper.localString(@"Loading...");
......@@ -39,7 +39,7 @@
// 正在加载
- (void)fus_showLiveStreamLoading {
_loadingImageView.animationImages = [UIImage fus_animationImages:@"release_refresh_" mainBundle:NO needCache:YES];
_loadingImageView.animationImages = [UIImage fus_animationImages:@"fusi_loading_animate_" mainBundle:NO needCache:YES];
_loadingImageView.animationDuration = 1.5;
[_loadingImageView startAnimating];
// _loadingLabel.text = FUSLocalizationHelper.localString(@"努力加载中...");
......
FuSiLive/Classes/NewLive/Main/View/Push/FUSResourceDownloadingView.m
......@@ -77,7 +77,7 @@
- (UIImageView *)loadingImageView {
if (!_loadingImageView) {
_loadingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
_loadingImageView.animationImages = [UIImage fus_animationImages:@"release_refresh_" mainBundle:NO needCache:YES];
_loadingImageView.animationImages = [UIImage fus_animationImages:@"fusi_loading_animate_" mainBundle:NO needCache:YES];
_loadingImageView.animationDuration = 1.5;
[_loadingImageView startAnimating];
}
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSByteStreamVideoPlayView.m
......@@ -130,7 +130,7 @@
self.loadingView.center = CGPointMake(self.width/2.0, self.height/2.0 - 30);
self.loadingView.contentMode = UIViewContentModeScaleAspectFit;
NSArray *imags = [UIImage fus_animationImages:@"release_refresh_" mainBundle:NO needCache:YES];
NSArray *imags = [UIImage fus_animationImages:@"fusi_loading_animate_" mainBundle:NO needCache:YES];
self.loadingView.image = imags.lastObject;
self.loadingView.animationImages = imags;
self.loadingView.animationDuration = 1;
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
......@@ -59,7 +59,7 @@
FUSImageMessageView *tipVeiw = [[FUSImageMessageView alloc] init];
tipVeiw.messageFont = [UIFont fus_themeFont:16];
tipVeiw.msgLb.shadowOffset = CGSizeMake(0, 0);
[tipVeiw fus_setIcon:[UIImage animatedImageWithImages:[UIImage fus_animationImages:@"release_refresh_" mainBundle:NO needCache:YES] duration:1.5] title:FUSLocalizationHelper.localString(@"连接中...")];
[tipVeiw fus_setIcon:[UIImage animatedImageWithImages:[UIImage fus_animationImages:@"fusi_loading_animate_" mainBundle:NO needCache:YES] duration:1.5] title:FUSLocalizationHelper.localString(@"连接中...")];
tipVeiw.icon.size = CGSizeMake(60, 60);
tipVeiw.imageEdgeInset = UIEdgeInsetsMake(-5, 10, 0, 0);
tipVeiw.x = 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