Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 57d02e5

Browse filesBrowse files
wanghenghengwanghengheng
committed
fix
1 parent ba84b0d commit 57d02e5
Copy full SHA for 57d02e5

File tree

Expand file treeCollapse file tree

10 files changed

+29
-20
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

10 files changed

+29
-20
lines changed
Open diff view settings
Collapse file

‎Coding_iOS.xcodeproj/project.pbxproj‎

Copy file name to clipboardExpand all lines: Coding_iOS.xcodeproj/project.pbxproj
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,6 @@
11841184
927AFF511BFF6DAD00AAE593 /* shop_exchange_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF491BFF6DAD00AAE593 /* shop_exchange_icon@3x.png */; };
11851185
927AFF521BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4A1BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png */; };
11861186
927AFF531BFF6DAD00AAE593 /* shop_nar_history_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4B1BFF6DAD00AAE593 /* shop_nar_history_icon@3x.png */; };
1187-
927AFF541BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4C1BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png */; };
1188-
927AFF551BFF6DAD00AAE593 /* shop_unexchange_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4D1BFF6DAD00AAE593 /* shop_unexchange_icon@3x.png */; };
11891187
927AFF581BFF755200AAE593 /* ExchangeGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF571BFF755200AAE593 /* ExchangeGoodsViewController.m */; };
11901188
927AFF5B1BFF772A00AAE593 /* ShopOrderTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF5A1BFF772A00AAE593 /* ShopOrderTextFieldCell.m */; };
11911189
B14689B41EE100B200B01371 /* vip_3_30@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B14689A41EE100B200B01371 /* vip_3_30@2x.png */; };
@@ -3154,8 +3152,6 @@
31543152
927AFF491BFF6DAD00AAE593 /* shop_exchange_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop_exchange_icon@3x.png"; sourceTree = "<group>"; };
31553153
927AFF4A1BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop_nar_history_icon@2x.png"; sourceTree = "<group>"; };
31563154
927AFF4B1BFF6DAD00AAE593 /* shop_nar_history_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop_nar_history_icon@3x.png"; sourceTree = "<group>"; };
3157-
927AFF4C1BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop_unexchange_icon@2x.png"; sourceTree = "<group>"; };
3158-
927AFF4D1BFF6DAD00AAE593 /* shop_unexchange_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop_unexchange_icon@3x.png"; sourceTree = "<group>"; };
31593155
927AFF561BFF755200AAE593 /* ExchangeGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExchangeGoodsViewController.h; sourceTree = "<group>"; };
31603156
927AFF571BFF755200AAE593 /* ExchangeGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExchangeGoodsViewController.m; sourceTree = "<group>"; };
31613157
927AFF591BFF772A00AAE593 /* ShopOrderTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopOrderTextFieldCell.h; sourceTree = "<group>"; };
@@ -6466,8 +6462,6 @@
64666462
927AFF491BFF6DAD00AAE593 /* shop_exchange_icon@3x.png */,
64676463
927AFF4A1BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png */,
64686464
927AFF4B1BFF6DAD00AAE593 /* shop_nar_history_icon@3x.png */,
6469-
927AFF4C1BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png */,
6470-
927AFF4D1BFF6DAD00AAE593 /* shop_unexchange_icon@3x.png */,
64716465
);
64726466
path = shop;
64736467
sourceTree = "<group>";
@@ -7070,7 +7064,6 @@
70707064
4E0849851A918A7F00BD27F6 /* coding_emoji_43@2x.png in Resources */,
70717065
4E5D130E1C0ECB3400985AEB /* tweet_btn_liked@3x.png in Resources */,
70727066
4E96E7DE1A1B537E0037C098 /* icon_file_music@2x.png in Resources */,
7073-
927AFF541BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png in Resources */,
70747067
8EA6D1A119E240C40076D59C /* tipIcon_UserFollow@2x.png in Resources */,
70757068
4EAAD0581E542B2D008AA957 /* icon_code_git_link@3x.png in Resources */,
70767069
4E2F6A6D1C43CA4B00A25502 /* member_type_100@3x.png in Resources */,
@@ -7358,7 +7351,6 @@
73587351
4E2BF3D51B96CDF800A5A0A8 /* share_btn_wxsession@2x.png in Resources */,
73597352
4E3DB53D1BFDD0F40062BA52 /* task_activity_icon_MergeRequestBean@2x.png in Resources */,
73607353
4E96E7E31A1B537E0037C098 /* icon_file_txt@2x.png in Resources */,
7361-
927AFF551BFF6DAD00AAE593 /* shop_unexchange_icon@3x.png in Resources */,
73627354
B1C871381EADF155003DACF0 /* project_item_member@3x.png in Resources */,
73637355
8EA6D19419E240C40076D59C /* timeline_line_unread@2x.png in Resources */,
73647356
4E94C4F11B4B75DB00EB668A /* tip_2FA@2x.png in Resources */,
Collapse file

‎Coding_iOS/Coding_iOS-Info.plist‎

Copy file name to clipboardExpand all lines: Coding_iOS/Coding_iOS-Info.plist
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
<string>我们需要您的同意才能使用麦克风</string>
9090
<key>NSPhotoLibraryUsageDescription</key>
9191
<string>我们需要您的同意才能读取您的照片</string>
92+
<key>NSPhotoLibraryAddUsageDescription</key>
93+
<string>我们需要您的同意才能存储图片</string>
9294
<key>UIAppFonts</key>
9395
<array>
9496
<string>FontAwesome.ttf</string>
Collapse file

‎Coding_iOS/Images.xcassets/AppIcon.appiconset/Coding.png‎

Copy file name to clipboard
293 KB
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Images.xcassets/AppIcon.appiconset/Contents.json‎

Copy file name to clipboardExpand all lines: Coding_iOS/Images.xcassets/AppIcon.appiconset/Contents.json
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@
138138
"idiom" : "ipad",
139139
"size" : "83.5x83.5",
140140
"scale" : "2x"
141+
},
142+
{
143+
"size" : "1024x1024",
144+
"idiom" : "ios-marketing",
145+
"filename" : "Coding.png",
146+
"scale" : "1x"
141147
}
142148
],
143149
"info" : {
Collapse file

‎Coding_iOS/Images.xcassets/AppIconTemp.appiconset/Contents.json‎

Copy file name to clipboardExpand all lines: Coding_iOS/Images.xcassets/AppIconTemp.appiconset/Contents.json
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@
126126
"idiom" : "ipad",
127127
"size" : "83.5x83.5",
128128
"scale" : "2x"
129+
},
130+
{
131+
"idiom" : "ios-marketing",
132+
"size" : "1024x1024",
133+
"scale" : "1x"
129134
}
130135
],
131136
"info" : {
Collapse file

‎Coding_iOS/Images/shop/shop_exchange_icon@2x.png‎

Copy file name to clipboard
-768 Bytes
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Images/shop/shop_exchange_icon@3x.png‎

Copy file name to clipboard
-1.87 KB
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Images/shop/shop_unexchange_icon@2x.png‎

Copy file name to clipboard
-1.79 KB
Binary file not shown.
Collapse file

‎Coding_iOS/Images/shop/shop_unexchange_icon@3x.png‎

Copy file name to clipboard
-2.74 KB
Binary file not shown.
Collapse file

‎Coding_iOS/Views/CCell/ShopGoodsCCell.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Views/CCell/ShopGoodsCCell.m
+16-12Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ - (instancetype)initWithFrame:(CGRect)frame
2020
self.clipsToBounds = YES;
2121
self.backgroundColor = [UIColor whiteColor];
2222
[self setUpContentView];
23-
24-
_exchangeIconView.hidden = YES;
2523
}
2624
return self;
2725
}
@@ -53,10 +51,14 @@ - (void)setUpContentView{
5351
[superView addSubview:_codingCoinView];
5452

5553
_exchangeIconView = [UIImageView new];
54+
_exchangeIconView.contentMode = UIViewContentModeScaleAspectFill;
55+
_exchangeIconView.clipsToBounds = YES;
5656
_exchangeIconView.backgroundColor = [UIColor clearColor];
57+
_exchangeIconView.image = [UIImage imageNamed:@"shop_exchange_icon"];
58+
5759
[superView addSubview:_exchangeIconView];
5860

59-
_priceLabel = [UILabel labelWithFont:[UIFont systemFontOfSize:18] textColor:kColorDark3];
61+
_priceLabel = [UILabel labelWithFont:[UIFont systemFontOfSize:18] textColor:kColorBrandOrange];
6062
[superView addSubview:_priceLabel];
6163

6264
_countLabel = [UILabel labelWithFont:[UIFont systemFontOfSize:12] textColor:kColorDark7];
@@ -83,7 +85,7 @@ - (void)setUpContentView{
8385

8486
[_exchangeIconView mas_makeConstraints:^(MASConstraintMaker *make) {
8587
make.right.equalTo(superView).offset(-kPaddingLeftWidth);
86-
make.bottom.equalTo(superView).offset(-kPaddingLeftWidth);
88+
make.centerY.equalTo(_countLabel);
8789
}];
8890

8991
[_priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -120,14 +122,16 @@ - (void)configViewWithModel:(ShopGoods *)model
120122

121123
- (void)showExchangeIcon:(BOOL)_isCanExchangeIcon
122124
{
123-
if (_isCanExchangeIcon) {
124-
UIImage *image = [UIImage imageNamed:@"shop_exchange_icon"];
125-
_exchangeIconView.image = image;
126-
}else
127-
{
128-
UIImage *image = [UIImage imageNamed:@"shop_unexchange_icon"];
129-
_exchangeIconView.image =image;
130-
}
125+
_exchangeIconView.hidden = !_isCanExchangeIcon;
126+
127+
// if (_isCanExchangeIcon) {
128+
// UIImage *image = [UIImage imageNamed:@"shop_exchange_icon"];
129+
// _exchangeIconView.image = image;
130+
// }else
131+
// {
132+
// UIImage *image = [UIImage imageNamed:@"shop_unexchange_icon"];
133+
// _exchangeIconView.image =image;
134+
// }
131135
}
132136

133137

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.