Skip to content

pidan / FuSiLive

Go to a project
Commit 8b5e0347 by pidan
Options

修改Fusi相关的图片改成FusiYa相关的图片

parent 8753d14b
Inline Side-by-side
Showing with 42 additions and 97 deletions
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/tabbar/fus_tabbar_item_home_select.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_home_select@2x.png",
"filename" : "logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_home_select@3x.png",
"filename" : "logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/tabbar/fus_tabbar_item_home_unselect.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_home_unselect@2x.png",
"filename" : "logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_home_unselect@3x.png",
"filename" : "logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/tabbar/fus_tabbar_item_home_white.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_home_white@2x.png",
"filename" : "logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_home_white@3x.png",
"filename" : "logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/com_no_data_empty.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_empty_view.png",
"filename" : "icon_default_gift.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/common_empty_default_300_300.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "common_empty_default_300_300@2x.png",
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/fus_common_navi_title_logo.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "fus_common_navi_title_logo@2x.png",
"filename" : "ic_setting_logo.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_navi_title_logo@3x.png",
"filename" : "ic_setting_logo 1.png",
"idiom" : "universal",
"scale" : "3x"
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/home_list_default_cover.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "square_holder4_500.png",
"filename" : "square_holder2_640.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/icon_boy_default.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "square_holder4_500.png",
"filename" : "square_holder2_640.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/icon_head_default.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "square_holder2_1125.png",
"filename" : "square_holder2_640.png",
"idiom" : "universal",
"scale" : "2x"
},
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/Refresh/FUSRefreshHeader.m
......@@ -54,11 +54,11 @@
// }
for (NSInteger i = 0; i < 9; i++) {
[pullDownArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",i + 7]]];
[pullDownArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",i + 7]]];
}
for (NSInteger i = 0; i <= 39; i++) {
[releaseArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",i]]];
[releaseArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",i]]];
}
for (NSInteger i = 0; i < 14; i++) {
......@@ -68,7 +68,7 @@
self.mj_h = 80;
// _loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"pull_down00"]];
_loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"fusi_loading_animate_black_7"]];
_loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"fusi_loading_animate_7"]];
_loadingImageView.contentMode = UIViewContentModeScaleAspectFill;
_freshBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width,300)];
......@@ -171,12 +171,12 @@
// fusi_loading_animate_
// fusi_loading_animate_black_
// fusi_loading_animate_
if (pullingPercent - lastPullingPercent > 0) {
_loadingImageView.image = [UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",(NSInteger)floor(7 + 9*pullingPercent)]];
_loadingImageView.image = [UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",(NSInteger)floor(7 + 9*pullingPercent)]];
if (pullingPercent >= 1) {
_loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_black_7"];
_loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_7"];
}
}
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m
......@@ -119,7 +119,7 @@
/// 弹窗背景图
+ (UIImage *)fus_alertBg {
return [self fus_ImageNamed:@"common_alert_bg_img"];
return [self fus_ImageNamed:@""];
}
/// 大萤火图片
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 008FEC462C296CB700B1AF13 /* FZCustom01.ttf */; };
00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */; };
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */; };
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */; };
BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE05F46B2C203D0C006A8993 /* Assets.xcassets */; };
BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743D12C3529E70061A55F /* InfoPlist.strings */; };
BEC996202BFCD19700EBD348 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC9961F2BFCD19700EBD348 /* main.m */; };
......@@ -45,7 +45,7 @@
/* Begin PBXFileReference section */
008FEC462C296CB700B1AF13 /* FZCustom01.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FZCustom01.ttf; sourceTree = "<group>"; };
00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image_1.png; sourceTree = "<group>"; };
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image_2.png; sourceTree = "<group>"; };
00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; };
6DFACA8A2DF329F3E7F7B2FF /* Pods-FuSiLive.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.debug.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig"; sourceTree = "<group>"; };
AD8AA4E093E761AA637769AD /* Pods-FuSiLive.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.release.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.release.xcconfig"; sourceTree = "<group>"; };
......@@ -146,7 +146,7 @@
BEDC668B2C09DAE700505F76 /* Resources */ = {
isa = PBXGroup;
children = (
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */,
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */,
BEDC65D32C09DAE700505F76 /* Font */,
BEDC66102C09DAE700505F76 /* LocalizationString */,
);
......@@ -243,7 +243,7 @@
buildActionMask = 2147483647;
files = (
008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */,
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_1.png in Resources */,
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_2.png in Resources */,
BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */,
BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */,
BEDC6F8C2C09DAE900505F76 /* GoogleService-Info.plist in Resources */,
......
FuSiLive/Launch Screen.storyboard
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -22,7 +22,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_1.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_2.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<rect key="frame" x="10" y="219" width="373" height="278"/>
<constraints>
<constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/>
......@@ -47,6 +47,6 @@
</scene>
</scenes>
<resources>
<image name="fus_startSplash_logo_image_1.png" width="1263" height="941"/>
<image name="fus_startSplash_logo_image_2.png" width="1298" height="857"/>
</resources>
</document>
Modules/FUSChatCenterModule/FUSChatCenterModule/FUSChatCenterBundle.bundle/FUSChatCenterAssets.xcassets/IMMessage/chat_cell_gift_placeholder_img.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_empty_view.png",
"filename" : "vip_power_placeholder.png",
"idiom" : "universal",
"scale" : "2x"
},
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/home/fus_home_broadcastAlert_logo_icon.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@2x.png",
"filename" : "push_small.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/icon_logo.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@2x.png",
"filename" : "push_small.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Anchor_List_Placeholder.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "灰色logo@2x.png",
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "灰色logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Record_Placeholder.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "灰色logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "灰色logo@3x.png",
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Video_Connect_faiure.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "灰色logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "灰色logo@3x.png",
"filename" : "icon_default_gift.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/WarningView/FUSWarningView.m
......@@ -109,11 +109,11 @@
// _warningView.layer.borderColor = [[UIColor whiteColor] colorWithAlphaComponent:1].CGColor;
// _warningView.layer.borderWidth = 2;
_warningView.clipsToBounds = YES;
_warningView.backgroundColor = [UIColor clearColor];
_warningView.backgroundColor = [UIColor fus_appBGColor];
_warningImageView = [[UIImageView alloc] init];
_warningImageView.image = [UIImage fus_alertBg];
[_warningView addSubview:_warningImageView];
// _warningImageView = [[UIImageView alloc] init];
//// _warningImageView.image = [UIImage fus_alertBg];
// [_warningView addSubview:_warningImageView];
CGFloat bgViewHeight = WARNING_VIEW_HEIGHT(_isLiver);
CGFloat bgViewWeight = 0;
......
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/DailyCheckIn/checkIn_placeholder.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "icon_empty_view.png",
"filename" : "vip_power_placeholder.png",
"idiom" : "universal",
"scale" : "2x"
},
......
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/NewsFeed/newsfeed_publish_nav_title.imageset/Contents.json
......@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
"filename" : "logo字体-标题栏用@2x.png",
"filename" : "ic_setting_logo.png",
"idiom" : "universal",
"scale" : "2x"
},
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteFunctionStepOneContentView.swift
......@@ -192,7 +192,7 @@ class FUSInviteFunctionStepOneContentView: FUSInviteFunctionStepContentBaseView
let loadingView = UIImageView(frame: CGRectMake(0, 0, 50, 50))
loadingView.contentMode = .scaleAspectFit
loadingView.animationImages = UIImage.fus_animationImages("fusi_loading_animate_black_", mainBundle: false, needCache: true)
loadingView.animationImages = UIImage.fus_animationImages("fusi_loading_animate_", mainBundle: false, needCache: true)
loadingView.animationDuration = 1.5
loadingView.startAnimating()
qrCodeImageView.addSubview(loadingView)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteFunctionStepThreeContentView.swift
......@@ -166,7 +166,7 @@ class FFInviteFunctionStepThreeEmptyView: FUSBaseView {
override func makeUI() {
emptyImageView.contentMode = .scaleAspectFit
emptyImageView.animationImages = UIImage.fus_animationImages("fusi_loading_animate_black_", mainBundle: false, needCache: true)
emptyImageView.animationImages = UIImage.fus_animationImages("fusi_loading_animate_", mainBundle: false, needCache: true)
emptyImageView.animationDuration = 1.5
emptyImageView.startAnimating()
self.addSubview(emptyImageView)
......
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
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