moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

主题色优化

Browse Source
This commit is contained in:
liyuhua
2024-06-04 18:04:08 +08:00
parent b24a8483c5
commit a8dcf96800
19 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
YuMi.xcodeproj/project.pbxproj
View File

@@ -268,7 +268,6 @@
236B2E5A2AA18E13003967A8 /* XPMineGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */; };
236B2E5D2AA19169003967A8 /* HomeLittleGameRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */; };
236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */; };
237700CD2BC697A100D661F1 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */; };
237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */; };
237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */; };
237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */; };
@@ -297,6 +296,7 @@
237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */; };
237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */; };
237FD35D2C0F187B00B5335C /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */; };
238A90072BA9729200828123 /* PIUniversalBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90062BA9729200828123 /* PIUniversalBannerView.m */; };
238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90092BA9756600828123 /* PIUniversalBannerModel.m */; };
238B37A32AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 238B37242AC55A2C00BFC9D5 /* XPTreasureFailyPresenter.m */; };
@@ -2080,7 +2080,6 @@
236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeLittleGameRoomModel.m; sourceTree = "<group>"; };
236BA4962BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINoblePrivilegeEmptyCell.h; sourceTree = "<group>"; };
236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINoblePrivilegeEmptyCell.m; sourceTree = "<group>"; };
237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = "<group>"; };
237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = "<group>"; };
@@ -2130,6 +2129,7 @@
237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomTrumpetView.m; sourceTree = "<group>"; };
237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomTrumpet.m"; sourceTree = "<group>"; };
237B94BB2A984DA7007853E3 /* Api+RoomTrumpet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+RoomTrumpet.h"; sourceTree = "<group>"; };
237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
238A90052BA9729200828123 /* PIUniversalBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerView.h; sourceTree = "<group>"; };
238A90062BA9729200828123 /* PIUniversalBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUniversalBannerView.m; sourceTree = "<group>"; };
238A90082BA9756600828123 /* PIUniversalBannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerModel.h; sourceTree = "<group>"; };
@@ -4857,8 +4857,8 @@
E81C27AF26EF39B00031E639 /* AppDelegate */,
189DD53826DE255600AB55B1 /* Assets.xcassets */,
2368ECD52BC38FDA00EDF4C9 /* Launch Screen.storyboard */,
237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */,
237700CE2BC697D400D661F1 /* pi_login_new_logo.png */,
237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */,
2396FCE32B22BE5D0014021D /* pi_area_info.json */,
189DD53D26DE255600AB55B1 /* Info.plist */,
2368ECD72BC38FED00EDF4C9 /* PrivacyInfo.xcprivacy */,
@@ -11049,7 +11049,6 @@
E80EC86228ACD84000D133C5 /* emoji_22@2x.png in Resources */,
E80EC82528ACD84000D133C5 /* emoji_61@2x.png in Resources */,
E80EC81528ACD84000D133C5 /* emoji_145@2x.png in Resources */,
237700CD2BC697A100D661F1 /* pi_app_logo_new_bg.png in Resources */,
E80EC85428ACD84000D133C5 /* emoji_165@2x.png in Resources */,
E80EC88728ACD84000D133C5 /* emoji_29@2x.png in Resources */,
E80EC83728ACD84000D133C5 /* emoji_112@2x.png in Resources */,
@@ -11191,6 +11190,7 @@
E80EC8A328ACD84100D133C5 /* emoji_52@2x.png in Resources */,
E80EC84E28ACD84000D133C5 /* emoji_132@2x.png in Resources */,
23CEFC562AFB8FC100576D89 /* pay_off.png in Resources */,
237FD35D2C0F187B00B5335C /* pi_app_logo_new_bg.png in Resources */,
E80EC82928ACD84000D133C5 /* emoji_28@2x.png in Resources */,
E80EC82028ACD84000D133C5 /* emoji_38@2x.png in Resources */,
E80EC8A628ACD84100D133C5 /* emoji_23@2x.png in Resources */,

4
YuMi/Assets.xcassets/chat/message_main_bg.imageset/Contents.json → YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json vendored
View File

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

BIN
YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

BIN
YuMi/Assets.xcassets/chat/message_main_bg.imageset/message_main_bg@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
YuMi/Assets.xcassets/chat/message_main_bg.imageset/message_main_bg@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
YuMi/Assets.xcassets/jm/mine_head_bg.imageset/mine_head_bg@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
YuMi/Assets.xcassets/jm/mine_head_bg.imageset/mine_head_bg@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 55 KiB

BIN
YuMi/Assets.xcassets/low/newhome/home_top_bg.imageset/home_top_bg@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
YuMi/Assets.xcassets/low/newhome/home_top_bg.imageset/home_top_bg@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 103 KiB

4
YuMi/Assets.xcassets/jm/mine_head_bg.imageset/Contents.json → YuMi/Assets.xcassets/main/ms_tabbar_vc_main_bg.imageset/Contents.json vendored
View File

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

BIN
YuMi/Assets.xcassets/main/ms_tabbar_vc_main_bg.imageset/ms_tabbar_vc_main_bg@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
YuMi/Assets.xcassets/main/ms_tabbar_vc_main_bg.imageset/ms_tabbar_vc_main_bg@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

4
YuMi/Base.lproj/Launch Screen.storyboard
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" 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="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>

4
YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
View File

@@ -185,7 +185,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(91));
make.height.mas_equalTo(kGetScaleWidth(111));
}];
[self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_offset(kGetScaleWidth(162));
@@ -731,7 +731,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
- (UIImageView *)bgImageView{
if(!_bgImageView){
_bgImageView = [[UIImageView alloc]init];
_bgImageView.image = kImage(@"pi_app_logo_new_bg");
_bgImageView.image = kImage(@"pi_app_login_new_bg");
_bgImageView.contentMode = 2;
}
return _bgImageView;

4
YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m
View File

@@ -96,7 +96,7 @@
- (void)initSubViewConstraints {
[self.headBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.top.trailing.equalTo(self.view);
make.height.mas_equalTo(196);
make.height.mas_equalTo(kGetScaleWidth(223));
}];
[self.scrollingView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kStatusBarHeight);
@@ -242,7 +242,7 @@
-(UIImageView *)headBgImageView{
if (!_headBgImageView){
_headBgImageView = [UIImageView new];
_headBgImageView.image = [UIImage imageNamed:@"message_main_bg"];
_headBgImageView.image = [UIImage imageNamed:@"ms_tabbar_vc_main_bg"];
}
return _headBgImageView;
}

3
YuMi/Modules/YMMine/View/XPMineViewController.m
View File

@@ -198,6 +198,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
- (void)initSubViewConstraints {
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.top.mas_equalTo(0);
make.height.mas_equalTo(kGetScaleWidth(223));
}];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -786,7 +787,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
- (UIView *)bgImageView {
if (!_bgImageView) {
_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_head_bg"]];
_bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ms_tabbar_vc_main_bg"]];
_bgImageView.contentMode = UIViewContentModeScaleAspectFill;
}
return _bgImageView;

2
YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
View File

@@ -233,7 +233,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
- (void)initSubViewConstraints {
[self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.top.mas_equalTo(self.view);
make.height.mas_equalTo(170 + kSafeAreaTopHeight);
make.height.mas_equalTo(kGetScaleWidth(223));
}];
[self.navView mas_makeConstraints:^(MASConstraintMaker *make) {

12
YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m
View File

@@ -92,9 +92,7 @@
return YES;
}
-(void)appDidBecomeActive{
if(self.headView.roomGameModel.data.roundStatus == 0 && self.headView.roomGameModel.data.matchStatus == 1){
[self.presenter getRoomGameDetailWithRoomType:@"0"];
}
[self.presenter getRoomGameDetailWithRoomType:@"0"];
}
///网络监听
-(void)networkReachability{
@@ -142,6 +140,7 @@
[self.presenter exitNIMRoom:self.roomId];
[self.roomGameView handleSelfInExitEvent];
[self.roomGameView destroyMG];
[self.roomGameView removeFromSuperview];
self.roomGameView = nil;
[self.headView setDataInNull];
}
@@ -155,6 +154,10 @@
self.coinModel = model;
}
-(void)getRoomGameDetailsSuccessWithModel:(MSRoomGameModel *)model{
if(model == nil && self.isShowResults == NO){
[self quitGameActionWtihIsColse:YES];
return;
}
self.headView.roomGameModel = model;
self.headView.userInfo = self.userinfo;
self.roomId = model.roomId;
@@ -169,8 +172,10 @@
[self.roomGameView onRoomEntered];
}
}else{
[self.roomGameView handleSelfInExitEvent];
[self.roomGameView destroyMG];
[self.roomGameView removeFromSuperview];
self.roomGameView = nil;
[self.headView setDataInNull];
@@ -316,6 +321,7 @@
[self.presenter exitNIMRoom:self.roomId];
[self.roomGameView handleSelfInExitEvent];
[self.roomGameView destroyMG];
[self.roomGameView removeFromSuperview];
self.roomGameView = nil;
[self.headView setDataInNull];